Skip to content

Commit

Permalink
*fix for travis
Browse files Browse the repository at this point in the history
  • Loading branch information
ovcharovvladimir committed Dec 24, 2018
1 parent 31ee0af commit dde17ac
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 16 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ bazel-*
# Coverage outputs
coverage.txt
profile.out

beacon-chain/beacon-chain
8 changes: 4 additions & 4 deletions beacon-chain/blockchain/core.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"sync"
"time"

"github.com/ovcharovvladimir/Prysm/beacon-chain/params"
"github.com/ovcharovvladimir/Prysm/beacon-chain/powchain"
"github.com/ovcharovvladimir/Prysm/beacon-chain/types"
"github.com/ovcharovvladimir/Prysm/beacon-chain/utils"
"github.com/ovcharovvladimir/essentiaHybrid/common"
"github.com/ovcharovvladimir/essentiaHybrid/essdb"
"github.com/ovcharovvladimir/essentiaHybrid/rlp"
"github.com/ovcharovvladimir/Prysm/sness/params"
"github.com/ovcharovvladimir/Prysm/sness/powchain"
"github.com/ovcharovvladimir/Prysm/sness/types"
"github.com/ovcharovvladimir/Prysm/sness/utils"
"github.com/sirupsen/logrus"
)

Expand Down
6 changes: 3 additions & 3 deletions beacon-chain/blockchain/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package blockchain
import (
"context"

"github.com/ovcharovvladimir/Prysm/sness/database"
"github.com/ovcharovvladimir/Prysm/sness/powchain"
"github.com/ovcharovvladimir/Prysm/sness/types"
"github.com/ovcharovvladimir/Prysm/beacon-chain/database"
"github.com/ovcharovvladimir/Prysm/beacon-chain/powchain"
"github.com/ovcharovvladimir/Prysm/beacon-chain/types"
"github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions beacon-chain/blockchain/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"os"
"testing"

"github.com/ovcharovvladimir/Prysm/beacon-chain/powchain"
"github.com/ovcharovvladimir/Prysm/beacon-chan/database"
"github.com/ovcharovvladimir/essentiaHybrid/common"
"github.com/ovcharovvladimir/Prysm/sness/database"
"github.com/ovcharovvladimir/Prysm/sness/powchain"
logTest "github.com/sirupsen/logrus/hooks/test"
)

Expand Down
10 changes: 5 additions & 5 deletions beacon-chain/node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import (
"sync"
"syscall"

"github.com/ovcharovvladimir/essentiaHybrid/common"
"github.com/ovcharovvladimir/Prysm/sness/blockchain"
"github.com/ovcharovvladimir/Prysm/sness/database"
"github.com/ovcharovvladimir/Prysm/sness/powchain"
"github.com/ovcharovvladimir/Prysm/sness/utils"
"github.com/ovcharovvladimir/Prysm/beacon-chain/blockchain"
"github.com/ovcharovvladimir/Prysm/beacon-chain/database"
"github.com/ovcharovvladimir/Prysm/beacon-chain/powchain"
"github.com/ovcharovvladimir/Prysm/beacon-chain/utils"
"github.com/ovcharovvladimir/Prysm/shared"
"github.com/ovcharovvladimir/Prysm/shared/cmd"
"github.com/ovcharovvladimir/Prysm/shared/debug"
"github.com/ovcharovvladimir/essentiaHybrid/common"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)
Expand Down
2 changes: 1 addition & 1 deletion beacon-chain/powchain/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"math/big"
"strings"

"github.com/ethereum/go-ethereum"
"github.com/ovcharovvladimir/essentiaHybrid"
"github.com/ovcharovvladimir/essentiaHybrid/common"
gethTypes "github.com/ovcharovvladimir/essentiaHybrid/core/types"
"github.com/ovcharovvladimir/essentiaHybrid/essclient"
Expand Down
2 changes: 1 addition & 1 deletion beacon-chain/utils/shuffle.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package utils
import (
"errors"

"github.com/ovcharovvladimir/Prysm/beacon-chain/params"
"github.com/ovcharovvladimir/essentiaHybrid/common"
"github.com/ovcharovvladimir/Prysm/sness/params"
"golang.org/x/crypto/blake2s"
)

Expand Down
15 changes: 15 additions & 0 deletions sness/utils/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,19 @@ var (
Name: "shardid",
Usage: `use the --shardid to determine which shard to start p2p server, listen for incoming transactions and perform proposer/observer duties`,
}

VrcContractFlag = cli.StringFlag{
Name: "vrcaddr",
Usage: "use --vrcaddr to set vrc contract address",
}

PubKeyFlag = cli.StringFlag{
Name: "pkey",
Usage: "use --pkey to set voter publik key",
}

Web3ProviderFlag = cli.StringFlag{
Name: "rpc",
Usage: "use --rpc to set we3 rpc address",
}
)

0 comments on commit dde17ac

Please sign in to comment.