diff --git a/Makefile b/Makefile index 804060f87..b57855810 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,7 @@ cli: ## Build cli binary @go build $(BUILD_FLAGS) -v -o $(CLI) $(SRC_CLI) build:cli ## Build the binary file + @echo $(GOARCH) @go build $(BUILD_FLAGS) -v -o $(APP) $(SRC) @cp cmd/chain33/chain33.toml build/ @cp cmd/chain33/bityuan.toml build/ diff --git a/blockchain/blockfinalize.go b/blockchain/blockfinalize.go index ee327968b..7093d62ee 100644 --- a/blockchain/blockfinalize.go +++ b/blockchain/blockfinalize.go @@ -29,10 +29,10 @@ func (f *finalizer) Init(chain *BlockChain) { chainlog.Error("newFinalizer", "decode err", err) panic(err) } - chainlog.Debug("newFinalizer", "height", f.choice.Height, "hash", hex.EncodeToString(f.choice.Hash)) - } else { + chainlog.Info("newFinalizer", "height", f.choice.Height, "hash", hex.EncodeToString(f.choice.Hash)) + } else if chain.client.GetConfig().GetModuleConfig().Consensus.Finalizer != "" { f.choice.Height = chain.cfg.BlockFinalizeEnableHeight - chainlog.Debug("newFinalizer", "enableHeight", f.choice.Height, "gapHeight", chain.cfg.BlockFinalizeGapHeight) + chainlog.Info("newFinalizer", "enableHeight", f.choice.Height, "gapHeight", chain.cfg.BlockFinalizeGapHeight) go f.waitFinalizeStartBlock(f.choice.Height) } } @@ -72,7 +72,7 @@ func (f *finalizer) waitFinalizeStartBlock(beginHeight int64) { detail, err := f.chain.GetBlock(beginHeight) if err != nil { - chainlog.Error("setFinalizedStartHeight", "height", beginHeight, "get block err", err) + chainlog.Error("waitFinalizeStartBlock", "height", beginHeight, "waitHeight", waitHeight, "get block err", err) panic(err) } _ = f.setFinalizedBlock(detail.GetBlock().Height, detail.GetBlock().Hash(f.chain.client.GetConfig())) diff --git a/system/consensus/snowman/validator_test.go b/system/consensus/snowman/validator_test.go index 1498ece86..4ee7114b4 100644 --- a/system/consensus/snowman/validator_test.go +++ b/system/consensus/snowman/validator_test.go @@ -78,9 +78,9 @@ func Test_getConnectedPeers(t *testing.T) { require.Equal(t, utils.ErrValidatorSample, err) _, err = v.Sample(0) require.Equal(t, utils.ErrValidatorSample, err) - peer1 := *peer + peer1 := types.Clone(peer).(*types.Peer) peer1.Name = "peer1" - list.Peers = []*types.Peer{peer,&peer1, self} + list.Peers = []*types.Peer{peer, peer1, self} ids, err := v.Sample(2) require.Nil(t, err) require.Equal(t, 2, len(ids)) diff --git a/system/p2p/dht/protocol/peer/peerinfo_test.go b/system/p2p/dht/protocol/peer/peerinfo_test.go index 6c52b7830..866dc9865 100644 --- a/system/p2p/dht/protocol/peer/peerinfo_test.go +++ b/system/p2p/dht/protocol/peer/peerinfo_test.go @@ -20,10 +20,10 @@ import ( p2pty "github.com/33cn/chain33/system/p2p/dht/types" "github.com/33cn/chain33/types" "github.com/libp2p/go-libp2p" + dht "github.com/libp2p/go-libp2p-kad-dht" "github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/metrics" "github.com/libp2p/go-libp2p/core/peer" - dht "github.com/libp2p/go-libp2p-kad-dht" "github.com/multiformats/go-multiaddr" "github.com/stretchr/testify/require" ) @@ -133,6 +133,8 @@ func testBlockReq(q queue.Queue) { switch msg.Ty { case types.EventGetLastHeader: msg.Reply(queue.NewMessage(0, "p2p", types.EventGetLastHeader, &types.Header{})) + case types.EventSnowmanLastChoice: + msg.Reply(queue.NewMessage(0, "p2p", 0, &types.SnowChoice{})) } } }()