diff options
author | zelig <viktor.tron@gmail.com> | 2015-03-16 23:46:29 +0800 |
---|---|---|
committer | zelig <viktor.tron@gmail.com> | 2015-03-16 23:46:29 +0800 |
commit | 5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb (patch) | |
tree | d5ba6197a8c0c8e36bb92ee9fc8aad717cb2d178 /blockpool/blockpool_test.go | |
parent | 8393dab470c40678caf36ada82e312d29c4cf5c4 (diff) | |
parent | 22893b7ac925c49168c119f293ea8befc3aff5cc (diff) | |
download | go-tangerine-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.gz go-tangerine-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.zst go-tangerine-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.zip |
Merge remote-tracking branch 'upstream/develop' into frontier/js
Conflicts:
cmd/ethereum/js.go
javascript/types.go
Diffstat (limited to 'blockpool/blockpool_test.go')
-rw-r--r-- | blockpool/blockpool_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/blockpool/blockpool_test.go b/blockpool/blockpool_test.go index bca48c6ca..411779057 100644 --- a/blockpool/blockpool_test.go +++ b/blockpool/blockpool_test.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/blockpool/test" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" ) func TestPeerWithKnownBlock(t *testing.T) { @@ -69,9 +69,9 @@ func TestPeerPromotionByOptionalTdOnBlock(t *testing.T) { hashes := blockPoolTester.hashPool.IndexesToHashes([]int{2, 3}) peer1.waitBlocksRequests(3) blockPool.AddBlock(&types.Block{ - HeaderHash: ethutil.Bytes(hashes[1]), - ParentHeaderHash: ethutil.Bytes(hashes[0]), - Td: ethutil.Big3, + HeaderHash: common.Bytes(hashes[1]), + ParentHeaderHash: common.Bytes(hashes[0]), + Td: common.Big3, }, "peer1") blockPool.RemovePeer("peer2") |