interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

change StatusMsgData.TD back to pointer type *big.Int

This commit is contained in:
zelig 2015-04-01 12:36:49 +01:00
parent 6ffea34d8b
commit f56fc9cd9d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eth/protocol.go
View File

@ -105,7 +105,7 @@ type getBlockHashesMsgData struct {
type statusMsgData struct { type statusMsgData struct {
ProtocolVersion uint32 ProtocolVersion uint32
NetworkId uint32 NetworkId uint32
TD big.Int TD *big.Int
CurrentBlock common.Hash CurrentBlock common.Hash
GenesisBlock common.Hash GenesisBlock common.Hash
} }
@ -344,7 +344,7 @@ func (self *ethProtocol) handleStatus() error {
return self.protoError(ErrProtocolVersionMismatch, "%d (!= %d)", status.ProtocolVersion, self.protocolVersion) return self.protoError(ErrProtocolVersionMismatch, "%d (!= %d)", status.ProtocolVersion, self.protocolVersion)
} }
_, suspended := self.blockPool.AddPeer(&status.TD, status.CurrentBlock, self.id, self.requestBlockHashes, self.requestBlocks, self.protoErrorDisconnect) _, suspended := self.blockPool.AddPeer(status.TD, status.CurrentBlock, self.id, self.requestBlockHashes, self.requestBlocks, self.protoErrorDisconnect)
if suspended { if suspended {
return self.protoError(ErrSuspendedPeer, "") return self.protoError(ErrSuspendedPeer, "")
} }
@ -375,7 +375,7 @@ func (self *ethProtocol) sendStatus() error {
return p2p.Send(self.rw, StatusMsg, &statusMsgData{ return p2p.Send(self.rw, StatusMsg, &statusMsgData{
ProtocolVersion: uint32(self.protocolVersion), ProtocolVersion: uint32(self.protocolVersion),
NetworkId: uint32(self.networkId), NetworkId: uint32(self.networkId),
TD: *td, TD: td,
CurrentBlock: currentBlock, CurrentBlock: currentBlock,
GenesisBlock: genesisBlock, GenesisBlock: genesisBlock,
}) })

10
eth/protocol_test.go
View File

@ -173,7 +173,7 @@ func (self *ethProtocolTester) handshake(t *testing.T, mock bool) {
err := p2p.ExpectMsg(self, StatusMsg, &statusMsgData{ err := p2p.ExpectMsg(self, StatusMsg, &statusMsgData{
ProtocolVersion: ProtocolVersion, ProtocolVersion: ProtocolVersion,
NetworkId: NetworkId, NetworkId: NetworkId,
TD: *td, TD: td,
CurrentBlock: currentBlock, CurrentBlock: currentBlock,
GenesisBlock: genesis, GenesisBlock: genesis,
}) })
@ -181,7 +181,7 @@ func (self *ethProtocolTester) handshake(t *testing.T, mock bool) {
t.Fatalf("incorrect outgoing status: %v", err) t.Fatalf("incorrect outgoing status: %v", err)
} }
if mock { if mock {
go p2p.Send(self, StatusMsg, &statusMsgData{ProtocolVersion, NetworkId, *td, currentBlock, genesis}) go p2p.Send(self, StatusMsg, &statusMsgData{ProtocolVersion, NetworkId, td, currentBlock, genesis})
} }
} }
@ -201,15 +201,15 @@ func TestStatusMsgErrors(t *testing.T) {
wantErrorCode: ErrNoStatusMsg, wantErrorCode: ErrNoStatusMsg,
}, },
{ {
code: StatusMsg, data: statusMsgData{10, NetworkId, *td, currentBlock, genesis}, code: StatusMsg, data: statusMsgData{10, NetworkId, td, currentBlock, genesis},
wantErrorCode: ErrProtocolVersionMismatch, wantErrorCode: ErrProtocolVersionMismatch,
}, },
{ {
code: StatusMsg, data: statusMsgData{ProtocolVersion, 999, *td, currentBlock, genesis}, code: StatusMsg, data: statusMsgData{ProtocolVersion, 999, td, currentBlock, genesis},
wantErrorCode: ErrNetworkIdMismatch, wantErrorCode: ErrNetworkIdMismatch,
}, },
{ {
code: StatusMsg, data: statusMsgData{ProtocolVersion, NetworkId, *td, currentBlock, common.Hash{3}}, code: StatusMsg, data: statusMsgData{ProtocolVersion, NetworkId, td, currentBlock, common.Hash{3}},
wantErrorCode: ErrGenesisBlockMismatch, wantErrorCode: ErrGenesisBlockMismatch,
}, },
} }