From 4e3772fc3e8b7f28a57122787690d8035a55ae25 Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Sat, 8 Jun 2019 22:46:29 -0700 Subject: [PATCH] [genesis] fix merge error Signed-off-by: Leo Chen --- core/resharding.go | 4 ++-- test/test_before_submit.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/resharding.go b/core/resharding.go index 8e2998bf5..d8aece2ba 100644 --- a/core/resharding.go +++ b/core/resharding.go @@ -231,7 +231,7 @@ func GetInitShardState() types.ShardState { pubKey := types.BlsPublicKey{} pubKey.FromLibBLSPublicKey(priKey.GetPublicKey()) // TODO: directly read address for bls too - curNodeID := types.NodeID{genesis.GenesisAccounts[index].Address, pubKey} + curNodeID := types.NodeID{common.HexToAddress(genesis.GenesisAccounts[index].Address), pubKey} com.NodeList = append(com.NodeList, curNodeID) } @@ -243,7 +243,7 @@ func GetInitShardState() types.ShardState { pubKey := types.BlsPublicKey{} pubKey.FromLibBLSPublicKey(priKey.GetPublicKey()) // TODO: directly read address for bls too - curNodeID := types.NodeID{genesis.GenesisFNAccounts[index].Address, pubKey} + curNodeID := types.NodeID{common.HexToAddress(genesis.GenesisFNAccounts[index].Address), pubKey} com.NodeList = append(com.NodeList, curNodeID) } shardState = append(shardState, com) diff --git a/test/test_before_submit.sh b/test/test_before_submit.sh index 6b4f7bc73..def903bf9 100755 --- a/test/test_before_submit.sh +++ b/test/test_before_submit.sh @@ -3,6 +3,8 @@ DIRROOT=$(dirname $0)/.. OS=$(uname -s) +export GO111MODULE=on + pushd $DIRROOT ./scripts/travis_checker.sh