Merge branch 'master' into version-bump-v1.11.5

ava-labs · Apr 29, 2024 · 8e7226b · 8e7226b
2 parents 1fdb827 + bda0e6d
commit 8e7226b
Show file tree

Hide file tree

Showing 24 changed files with 1,262 additions and 2,846 deletions.
diff --git a/scripts/mocks.mockgen.txt b/scripts/mocks.mockgen.txt
@@ -5,7 +5,7 @@ github.com/ava-labs/avalanchego/database=Batch=database/mock_batch.go
 github.com/ava-labs/avalanchego/database=Iterator=database/mock_iterator.go
 github.com/ava-labs/avalanchego/message=OutboundMessage=message/mock_message.go
 github.com/ava-labs/avalanchego/message=OutboundMsgBuilder=message/mock_outbound_message_builder.go
-github.com/ava-labs/avalanchego/snow/consensus/snowman=Block=snow/consensus/snowman/mock_block.go
+github.com/ava-labs/avalanchego/snow/consensus/snowman=Block=snow/consensus/snowman/snowmantest/mock_block.go
 github.com/ava-labs/avalanchego/snow/engine/avalanche/vertex=LinearizableVM=snow/engine/avalanche/vertex/mock_vm.go
 github.com/ava-labs/avalanchego/snow/engine/snowman/block=BuildBlockWithContextChainVM=snow/engine/snowman/block/mock_build_block_with_context_vm.go
 github.com/ava-labs/avalanchego/snow/engine/snowman/block=ChainVM=snow/engine/snowman/block/mock_chain_vm.go

diff --git a/snow/choices/test_decidable.go b/snow/choices/test_decidable.go
@@ -48,3 +48,7 @@ func (d *TestDecidable) Reject(context.Context) error {
 func (d *TestDecidable) Status() Status {
 	return d.StatusV
 }
+
+func (d *TestDecidable) SetStatus(status Status) {
+	d.StatusV = status
+}