diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-25 19:28:17 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-25 20:11:29 +0800 |
| commit | 18d1569ce50e0348bf9649a31f711ee8037304d8 (patch) | |
| tree | 10adc68d59976bd98e07504467edaef92f12e006 | |
| parent | 9d592c0445aa8bb85921225a9cdc4ca1d4df85d3 (diff) | |
| download | dexon-18d1569ce50e0348bf9649a31f711ee8037304d8.tar dexon-18d1569ce50e0348bf9649a31f711ee8037304d8.tar.gz dexon-18d1569ce50e0348bf9649a31f711ee8037304d8.tar.bz2 dexon-18d1569ce50e0348bf9649a31f711ee8037304d8.tar.lz dexon-18d1569ce50e0348bf9649a31f711ee8037304d8.tar.xz dexon-18d1569ce50e0348bf9649a31f711ee8037304d8.tar.zst dexon-18d1569ce50e0348bf9649a31f711ee8037304d8.zip | |
header check for test
| -rw-r--r-- | blockpool/blockpool.go | 6 | ||||
| -rw-r--r-- | blockpool/peers_test.go | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/blockpool/blockpool.go b/blockpool/blockpool.go index 46eac3549..d9f8e3baa 100644 --- a/blockpool/blockpool.go +++ b/blockpool/blockpool.go @@ -238,7 +238,11 @@ func (self *BlockPool) Start() { case event := <-self.tdSub.Chan(): if ev, ok := event.(core.ChainHeadEvent); ok { td := ev.Block.Td - plog.DebugDetailf("ChainHeadEvent: height: %v, td: %v, hash: %s", ev.Block.Number(), td, hex(ev.Block.Hash())) + var height *big.Int + if (ev.Block.HeaderHash == common.Hash{}) { + height = ev.Block.Header().Number + } + plog.DebugDetailf("ChainHeadEvent: height: %v, td: %v, hash: %s", height, td, hex(ev.Block.Hash())) self.setTD(td) self.peers.lock.Lock() diff --git a/blockpool/peers_test.go b/blockpool/peers_test.go index beeb0ad1d..62e059337 100644 --- a/blockpool/peers_test.go +++ b/blockpool/peers_test.go @@ -14,7 +14,7 @@ import ( // the actual tests func TestAddPeer(t *testing.T) { test.LogInit() - _, blockPool, blockPoolTester := newTestBlockPool(t) + hashPool, blockPool, blockPoolTester := newTestBlockPool(t) peer0 := blockPoolTester.newPeer("peer0", 1, 1) peer1 := blockPoolTester.newPeer("peer1", 2, 2) peer2 := blockPoolTester.newPeer("peer2", 3, 3) @@ -119,7 +119,8 @@ func TestAddPeer(t *testing.T) { } peer0.waitBlocksRequests(3) - newblock := &types.Block{Td: common.Big3} + hash := hashPool.IndexesToHashes([]int{0})[0] + newblock := &types.Block{Td: common.Big3, HeaderHash: hash} blockPool.chainEvents.Post(core.ChainHeadEvent{newblock}) time.Sleep(100 * time.Millisecond) if blockPool.peers.best != nil { |