From dde17ac2ba3745f9f9c50c8e5646b30383f55f7b Mon Sep 17 00:00:00 2001 From: ovcharovvladimir Date: Mon, 24 Dec 2018 11:24:07 -0500 Subject: [PATCH] *fix for travis --- .gitignore | 2 ++ beacon-chain/blockchain/core.go | 8 ++++---- beacon-chain/blockchain/service.go | 6 +++--- beacon-chain/blockchain/service_test.go | 4 ++-- beacon-chain/node/node.go | 10 +++++----- beacon-chain/powchain/service.go | 2 +- beacon-chain/utils/shuffle.go | 2 +- sness/utils/flags.go | 15 +++++++++++++++ 8 files changed, 33 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 5093239..269d707 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ bazel-* # Coverage outputs coverage.txt profile.out + +beacon-chain/beacon-chain diff --git a/beacon-chain/blockchain/core.go b/beacon-chain/blockchain/core.go index b2b73fa..73cc8a0 100644 --- a/beacon-chain/blockchain/core.go +++ b/beacon-chain/blockchain/core.go @@ -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" ) diff --git a/beacon-chain/blockchain/service.go b/beacon-chain/blockchain/service.go index 687f8b6..53efea4 100644 --- a/beacon-chain/blockchain/service.go +++ b/beacon-chain/blockchain/service.go @@ -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" ) diff --git a/beacon-chain/blockchain/service_test.go b/beacon-chain/blockchain/service_test.go index 6c4223b..43a4f2a 100644 --- a/beacon-chain/blockchain/service_test.go +++ b/beacon-chain/blockchain/service_test.go @@ -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" ) diff --git a/beacon-chain/node/node.go b/beacon-chain/node/node.go index 33d51c1..72aafdb 100644 --- a/beacon-chain/node/node.go +++ b/beacon-chain/node/node.go @@ -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" ) diff --git a/beacon-chain/powchain/service.go b/beacon-chain/powchain/service.go index 8407dae..3ed46f6 100644 --- a/beacon-chain/powchain/service.go +++ b/beacon-chain/powchain/service.go @@ -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" diff --git a/beacon-chain/utils/shuffle.go b/beacon-chain/utils/shuffle.go index b21f9aa..2136aac 100644 --- a/beacon-chain/utils/shuffle.go +++ b/beacon-chain/utils/shuffle.go @@ -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" ) diff --git a/sness/utils/flags.go b/sness/utils/flags.go index 3d4d09c..fbdb3b0 100644 --- a/sness/utils/flags.go +++ b/sness/utils/flags.go @@ -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", + } )