Fixed tests

dapperlabs · May 12, 2023 · bbc49b8 · bbc49b8
1 parent 1063a51
commit bbc49b8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/consensus/hotstuff/model/errors.go b/consensus/hotstuff/model/errors.go
@@ -185,6 +185,10 @@ func (e InvalidProposalError) Error() string {
  )
 }
 
+func (e InvalidProposalError) Unwrap() error {
+ return e.Err
+}
+
 // IsInvalidProposalError returns whether an error is InvalidProposalError
 func IsInvalidProposalError(err error) bool {
  var e InvalidProposalError

diff --git a/engine/collection/compliance/core_test.go b/engine/collection/compliance/core_test.go
@@ -288,7 +288,7 @@ func (cs *CoreSuite) TestOnBlockProposal_FailsHotStuffValidation() {
  cs.validator.On("ValidateProposal", hotstuffProposal).Return(sentinelError)
  cs.proposalViolationNotifier.On("OnInvalidBlockDetected", sentinelError).Return().Once()
  // we should notify VoteAggregator about the invalid block
- cs.voteAggregator.On("InvalidProposal", hotstuffProposal).Return(nil)
+ cs.voteAggregator.On("InvalidBlock", hotstuffProposal).Return(nil)
 
  // the expected error should be handled within the Core
  err := cs.core.OnBlockProposal(originID, proposal)
@@ -361,7 +361,7 @@ func (cs *CoreSuite) TestOnBlockProposal_FailsProtocolStateValidation() {
  cs.state.On("Final").Return(func() clusterint.Snapshot { return cs.snapshot })
  cs.state.On("Extend", mock.Anything).Return(state.NewInvalidExtensionError(""))
  // we should notify VoteAggregator about the invalid block
- cs.voteAggregator.On("InvalidProposal", hotstuffProposal).Return(nil)
+ cs.voteAggregator.On("InvalidBlock", hotstuffProposal).Return(nil)
 
  // the expected error should be handled within the Core
  err := cs.core.OnBlockProposal(originID, proposal)

diff --git a/engine/consensus/compliance/core_test.go b/engine/consensus/compliance/core_test.go
@@ -371,7 +371,7 @@ func (cs *CoreSuite) TestOnBlockProposal_FailsHotStuffValidation() {
  cs.validator.On("ValidateProposal", hotstuffProposal).Return(sentinelError)
  cs.proposalViolationNotifier.On("OnInvalidBlockDetected", sentinelError).Return().Once()
  // we should notify VoteAggregator about the invalid block
- cs.voteAggregator.On("InvalidProposal", hotstuffProposal).Return(nil)
+ cs.voteAggregator.On("InvalidBlock", hotstuffProposal).Return(nil)
 
  // the expected error should be handled within the Core
  err := cs.core.OnBlockProposal(originID, proposal)
@@ -443,7 +443,7 @@ func (cs *CoreSuite) TestOnBlockProposal_FailsProtocolStateValidation() {
  cs.state.On("Final").Return(func() protint.Snapshot { return cs.snapshot })
  cs.state.On("Extend", mock.Anything, mock.Anything).Return(state.NewInvalidExtensionError(""))
  // we should notify VoteAggregator about the invalid block
- cs.voteAggregator.On("InvalidProposal", hotstuffProposal).Return(nil)
+ cs.voteAggregator.On("InvalidBlock", hotstuffProposal).Return(nil)
 
  // the expected error should be handled within the Core
  err := cs.core.OnBlockProposal(originID, proposal)