diff options
| author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-16 21:43:30 +0800 |
|---|---|---|
| committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-16 21:43:30 +0800 |
| commit | 3068e2688d88912ec33f3d80fd0fe26c4e897dcd (patch) | |
| tree | ee32ccd17faf650f3e933e9a2d8b4ab52f0d7746 /eth/protocol_test.go | |
| parent | 1878630b591b039fadb6f88e15340d04f4af3ed1 (diff) | |
| parent | 68f6ddc5aaa7ff29d09c1519ccd38d9cf16c0f75 (diff) | |
| download | dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.gz dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.zst dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.zip | |
merge conflicts
Diffstat (limited to 'eth/protocol_test.go')
| -rw-r--r-- | eth/protocol_test.go | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/eth/protocol_test.go b/eth/protocol_test.go index 1fe6d8f6b..a91806a1c 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -14,6 +14,7 @@ import ( "github.com/ethereum/go-ethereum/ethutil" ethlogger "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/p2p" + "github.com/ethereum/go-ethereum/p2p/discover" ) var sys = ethlogger.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlogger.LogLevel(ethlogger.DebugDetailLevel)) @@ -128,26 +129,11 @@ func (self *testBlockPool) RemovePeer(peerId string) { } } -// TODO: refactor this into p2p/client_identity -type peerId struct { - pubkey []byte -} - -func (self *peerId) String() string { - return "test peer" -} - -func (self *peerId) Pubkey() (pubkey []byte) { - pubkey = self.pubkey - if len(pubkey) == 0 { - pubkey = crypto.GenerateNewKeyPair().PublicKey - self.pubkey = pubkey - } - return -} - func testPeer() *p2p.Peer { - return p2p.NewPeer(&peerId{}, []p2p.Cap{}) + var id discover.NodeID + pk := crypto.GenerateNewKeyPair().PublicKey + copy(id[:], pk) + return p2p.NewPeer(id, "test peer", []p2p.Cap{}) } type ethProtocolTester struct { |