forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 10:50:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

review comment improvement

Browse source
This commit is contained in:
Jianrong 2021-11-20 14:35:57 +11:00
parent 98014936c3
commit 17f6e67f58
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
consensus/XDPoS/engines/engine_v2/engine.go
View file

@ -110,12 +110,12 @@ func (x *XDPoS_v2) VerifySyncInfoMessage(syncInfo utils.SyncInfo) error {
- verifyTC - verifyTC
2. Broadcast(Not part of consensus) 2. Broadcast(Not part of consensus)
*/ */
err := x.verifyQC(&syncInfo.HighestQuorumCert) err := x.verifyQC(syncInfo.HighestQuorumCert)
if err != nil { if err != nil {
log.Warn("SyncInfo message verification failed due to QC", err) log.Warn("SyncInfo message verification failed due to QC", err)
return err return err
} }
err = x.verifyTC(&syncInfo.HighestTimeoutCert) err = x.verifyTC(syncInfo.HighestTimeoutCert)
if err != nil { if err != nil {
log.Warn("SyncInfo message verification failed due to TC", err) log.Warn("SyncInfo message verification failed due to TC", err)
return err return err
@ -470,7 +470,7 @@ func (x *XDPoS_v2) getCurrentRoundMasterNodes() []common.Address {
func (x *XDPoS_v2) getSyncInfo() utils.SyncInfo { func (x *XDPoS_v2) getSyncInfo() utils.SyncInfo {
return utils.SyncInfo{ return utils.SyncInfo{
HighestQuorumCert: *x.highestQuorumCert, HighestQuorumCert: x.highestQuorumCert,
HighestTimeoutCert: *x.highestTimeoutCert, HighestTimeoutCert: x.highestTimeoutCert,
} }
} }

4
consensus/XDPoS/utils/types.go
View file

@ -85,8 +85,8 @@ type Timeout struct {
// BFT Sync Info message in XDPoS 2.0 // BFT Sync Info message in XDPoS 2.0
type SyncInfo struct { type SyncInfo struct {
HighestQuorumCert QuorumCert HighestQuorumCert *QuorumCert
HighestTimeoutCert TimeoutCert HighestTimeoutCert *TimeoutCert
} }
// Quorum Certificate struct in XDPoS 2.0 // Quorum Certificate struct in XDPoS 2.0

4
consensus/XDPoS/utils/types_test.go
View file

@ -53,8 +53,8 @@ func TestHashAndSigHash(t *testing.T) {
if timeout1.Hash() == timeout2.Hash() { if timeout1.Hash() == timeout2.Hash() {
t.Fatalf("Hash of two timeouts shouldn't equal") t.Fatalf("Hash of two timeouts shouldn't equal")
} }
syncInfo1 := SyncInfo{HighestQuorumCert: quorumCert1} syncInfo1 := SyncInfo{HighestQuorumCert: &quorumCert1}
syncInfo2 := SyncInfo{HighestQuorumCert: quorumCert2} syncInfo2 := SyncInfo{HighestQuorumCert: &quorumCert2}
if syncInfo1.Hash() == syncInfo2.Hash() { if syncInfo1.Hash() == syncInfo2.Hash() {
t.Fatalf("Hash of two sync info shouldn't equal") t.Fatalf("Hash of two sync info shouldn't equal")
} }

6
tests/consensus/v2_test.go
View file

@ -74,13 +74,12 @@ func TestTimeoutMessageHandlerSuccessfullyGenerateTCandSyncInfo(t *testing.T) {
assert.Equal(t, utils.Round(2), engineV2.GetCurrentRound()) assert.Equal(t, utils.Round(2), engineV2.GetCurrentRound())
} }
func TestThrowErrorIfTimeoutMsgRoundLessThanCurrentRound(t *testing.T) { func TestThrowErrorIfTimeoutMsgRoundNotEqualToCurrentRound(t *testing.T) {
blockchain, _, _, _ := PrepareXDCTestBlockChain(t, 11, params.TestXDPoSMockChainConfigWithV2Engine) blockchain, _, _, _ := PrepareXDCTestBlockChain(t, 11, params.TestXDPoSMockChainConfigWithV2Engine)
engineV2 := blockchain.Engine().(*XDPoS.XDPoS).EngineV2 engineV2 := blockchain.Engine().(*XDPoS.XDPoS).EngineV2
// Set round to 3 // Set round to 3
engineV2.SetNewRoundFaker(utils.Round(3), false) engineV2.SetNewRoundFaker(utils.Round(3), false)
// Create two timeout message which will not reach timeout pool threshold
timeoutMsg := &utils.Timeout{ timeoutMsg := &utils.Timeout{
Round: utils.Round(2), Round: utils.Round(2),
Signature: []byte{1}, Signature: []byte{1},
@ -141,7 +140,7 @@ func TestVoteMessageHandlerSuccessfullyGeneratedQC(t *testing.T) {
assert.Equal(t, utils.Round(2), engineV2.GetCurrentRound()) assert.Equal(t, utils.Round(2), engineV2.GetCurrentRound())
} }
func TestThrowErrorIfVoteMsgRoundLessThanCurrentRound(t *testing.T) { func TestThrowErrorIfVoteMsgRoundNotEqualToCurrentRound(t *testing.T) {
blockchain, _, _, _ := PrepareXDCTestBlockChain(t, 11, params.TestXDPoSMockChainConfigWithV2Engine) blockchain, _, _, _ := PrepareXDCTestBlockChain(t, 11, params.TestXDPoSMockChainConfigWithV2Engine)
engineV2 := blockchain.Engine().(*XDPoS.XDPoS).EngineV2 engineV2 := blockchain.Engine().(*XDPoS.XDPoS).EngineV2
@ -153,7 +152,6 @@ func TestThrowErrorIfVoteMsgRoundLessThanCurrentRound(t *testing.T) {
// Set round to 3 // Set round to 3
engineV2.SetNewRoundFaker(utils.Round(3), false) engineV2.SetNewRoundFaker(utils.Round(3), false)
// Create two timeout message which will not reach timeout pool threshold
voteMsg := &utils.Vote{ voteMsg := &utils.Vote{
ProposedBlockInfo: *blockInfo, ProposedBlockInfo: *blockInfo,
Signature: []byte{1}, Signature: []byte{1},