Merge branch 'dev' into options-before-verify

.github/dependabot.yml

@@ -9,3 +9,4 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    target-branch: "dev"

api/admin/service_test.go

@@ -20,26 +20,23 @@ import (
 type loadVMsTest struct {
 	admin          *Admin
 	ctrl           *gomock.Controller
-	mockLog        *logging.MockLogger
 	mockVMManager  *vms.MockManager
 	mockVMRegistry *registry.MockVMRegistry
 }
 
 func initLoadVMsTest(t *testing.T) *loadVMsTest {
 	ctrl := gomock.NewController(t)
 
-	mockLog := logging.NewMockLogger(ctrl)
 	mockVMRegistry := registry.NewMockVMRegistry(ctrl)
 	mockVMManager := vms.NewMockManager(ctrl)
 
 	return &loadVMsTest{
 		admin: &Admin{Config: Config{
-			Log:        mockLog,
+			Log:        logging.NoLog{},
 			VMRegistry: mockVMRegistry,
 			VMManager:  mockVMManager,
 		}},
 		ctrl:           ctrl,
-		mockLog:        mockLog,
 		mockVMManager:  mockVMManager,
 		mockVMRegistry: mockVMRegistry,
 	}
@@ -67,7 +64,6 @@ func TestLoadVMsSuccess(t *testing.T) {
 		id2: alias2[1:],
 	}
 
-	resources.mockLog.EXPECT().Debug(gomock.Any(), gomock.Any()).Times(1)
 	resources.mockVMRegistry.EXPECT().ReloadWithReadLock(gomock.Any()).Times(1).Return(newVMs, failedVMs, nil)
 	resources.mockVMManager.EXPECT().Aliases(id1).Times(1).Return(alias1, nil)
 	resources.mockVMManager.EXPECT().Aliases(id2).Times(1).Return(alias2, nil)
@@ -84,7 +80,6 @@ func TestLoadVMsReloadFails(t *testing.T) {
 
 	resources := initLoadVMsTest(t)
 
-	resources.mockLog.EXPECT().Debug(gomock.Any(), gomock.Any()).Times(1)
 	// Reload fails
 	resources.mockVMRegistry.EXPECT().ReloadWithReadLock(gomock.Any()).Times(1).Return(nil, nil, errTest)
 
@@ -108,7 +103,6 @@ func TestLoadVMsGetAliasesFails(t *testing.T) {
 	// every vm is at least aliased to itself.
 	alias1 := []string{id1.String(), "vm1-alias-1", "vm1-alias-2"}
 
-	resources.mockLog.EXPECT().Debug(gomock.Any(), gomock.Any()).Times(1)
 	resources.mockVMRegistry.EXPECT().ReloadWithReadLock(gomock.Any()).Times(1).Return(newVMs, failedVMs, nil)
 	resources.mockVMManager.EXPECT().Aliases(id1).Times(1).Return(alias1, nil)
 	resources.mockVMManager.EXPECT().Aliases(id2).Times(1).Return(nil, errTest)

api/info/service_test.go

@@ -21,24 +21,20 @@ var errTest = errors.New("non-nil error")
 type getVMsTest struct {
 	info          *Info
 	ctrl          *gomock.Controller
-	mockLog       *logging.MockLogger
 	mockVMManager *vms.MockManager
 }
 
 func initGetVMsTest(t *testing.T) *getVMsTest {
 	ctrl := gomock.NewController(t)
-
-	service := Info{}
-	mockLog := logging.NewMockLogger(ctrl)
 	mockVMManager := vms.NewMockManager(ctrl)
-
-	service.log = mockLog
-	service.VMManager = mockVMManager
-
 	return &getVMsTest{
-		info:          &service,
+		info: &Info{
+			Parameters: Parameters{
+				VMManager: mockVMManager,
+			},
+			log: logging.NoLog{},
+		},
 		ctrl:          ctrl,
-		mockLog:       mockLog,
 		mockVMManager: mockVMManager,
 	}
 }
@@ -62,7 +58,6 @@ func TestGetVMsSuccess(t *testing.T) {
 		id2: alias2[1:],
 	}
 
-	resources.mockLog.EXPECT().Debug(gomock.Any(), gomock.Any()).Times(1)
 	resources.mockVMManager.EXPECT().ListFactories().Times(1).Return(vmIDs, nil)
 	resources.mockVMManager.EXPECT().Aliases(id1).Times(1).Return(alias1, nil)
 	resources.mockVMManager.EXPECT().Aliases(id2).Times(1).Return(alias2, nil)
@@ -76,7 +71,6 @@ func TestGetVMsSuccess(t *testing.T) {
 func TestGetVMsVMsListFactoriesFails(t *testing.T) {
 	resources := initGetVMsTest(t)
 
-	resources.mockLog.EXPECT().Debug(gomock.Any(), gomock.Any()).Times(1)
 	resources.mockVMManager.EXPECT().ListFactories().Times(1).Return(nil, errTest)
 
 	reply := GetVMsReply{}
@@ -93,7 +87,6 @@ func TestGetVMsGetAliasesFails(t *testing.T) {
 	vmIDs := []ids.ID{id1, id2}
 	alias1 := []string{id1.String(), "vm1-alias-1", "vm1-alias-2"}
 
-	resources.mockLog.EXPECT().Debug(gomock.Any(), gomock.Any()).Times(1)
 	resources.mockVMManager.EXPECT().ListFactories().Times(1).Return(vmIDs, nil)
 	resources.mockVMManager.EXPECT().Aliases(id1).Times(1).Return(alias1, nil)
 	resources.mockVMManager.EXPECT().Aliases(id2).Times(1).Return(nil, errTest)

scripts/mocks.mockgen.txt

@@ -21,7 +21,6 @@ github.com/ava-labs/avalanchego/snow/validators=SubnetConnector=snow/validators/
 github.com/ava-labs/avalanchego/utils/crypto/keychain=Ledger=utils/crypto/keychain/mock_ledger.go
 github.com/ava-labs/avalanchego/utils/filesystem=Reader=utils/filesystem/mock_io.go
 github.com/ava-labs/avalanchego/utils/hashing=Hasher=utils/hashing/mock_hasher.go
-github.com/ava-labs/avalanchego/utils/logging=Logger=utils/logging/mock_logger.go
 github.com/ava-labs/avalanchego/utils/resource=User=utils/resource/mock_user.go
 github.com/ava-labs/avalanchego/vms/avm/block=Block=vms/avm/block/mock_block.go
 github.com/ava-labs/avalanchego/vms/avm/metrics=Metrics=vms/avm/metrics/mock_metrics.go

vms/avm/block/executor/block.go

@@ -290,6 +290,10 @@ func (b *Block) Reject(context.Context) error {
 		}
 	}
 
+	// If we added transactions to the mempool, we should be willing to build a
+	// block.
+	b.manager.mempool.RequestBuildBlock()
+
 	b.rejected = true
 	return nil
 }

vms/avm/block/executor/block_test.go

@@ -857,6 +857,7 @@ func TestBlockReject(t *testing.T) {
 
 				mempool := mempool.NewMockMempool(ctrl)
 				mempool.EXPECT().Add(validTx).Return(nil) // Only add the one that passes verification
+				mempool.EXPECT().RequestBuildBlock()
 
 				preferredID := ids.GenerateTestID()
 				mockPreferredState := state.NewMockDiff(ctrl)
@@ -916,6 +917,7 @@ func TestBlockReject(t *testing.T) {
 				mempool := mempool.NewMockMempool(ctrl)
 				mempool.EXPECT().Add(tx1).Return(nil)
 				mempool.EXPECT().Add(tx2).Return(nil)
+				mempool.EXPECT().RequestBuildBlock()
 
 				preferredID := ids.GenerateTestID()
 				mockPreferredState := state.NewMockDiff(ctrl)