Remove CreateStaticHandlers from VM interface (#2589)

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
ava-labs · Jan 17, 2024 · fdaee4a · fdaee4a
1 parent 68986d3
commit fdaee4a
Show file tree

Hide file tree

Showing 28 changed files with 733 additions and 2,154 deletions.
diff --git a/api/admin/service.go b/api/admin/service.go
@@ -334,7 +334,7 @@ func (a *Admin) LoadVMs(r *http.Request, _ *struct{}, reply *LoadVMsReply) error
 	defer a.lock.Unlock()
 
 	ctx := r.Context()
-	loadedVMs, failedVMs, err := a.VMRegistry.ReloadWithReadLock(ctx)
+	loadedVMs, failedVMs, err := a.VMRegistry.Reload(ctx)
 	if err != nil {
 		return err
 	}

diff --git a/api/admin/service_test.go b/api/admin/service_test.go
@@ -64,7 +64,7 @@ func TestLoadVMsSuccess(t *testing.T) {
 		id2: alias2[1:],
 	}
 
-	resources.mockVMRegistry.EXPECT().ReloadWithReadLock(gomock.Any()).Times(1).Return(newVMs, failedVMs, nil)
+	resources.mockVMRegistry.EXPECT().Reload(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)
 
@@ -81,7 +81,7 @@ func TestLoadVMsReloadFails(t *testing.T) {
 	resources := initLoadVMsTest(t)
 
 	// Reload fails
-	resources.mockVMRegistry.EXPECT().ReloadWithReadLock(gomock.Any()).Times(1).Return(nil, nil, errTest)
+	resources.mockVMRegistry.EXPECT().Reload(gomock.Any()).Times(1).Return(nil, nil, errTest)
 
 	reply := LoadVMsReply{}
 	err := resources.admin.LoadVMs(&http.Request{}, nil, &reply)
@@ -103,7 +103,7 @@ func TestLoadVMsGetAliasesFails(t *testing.T) {
 	// every vm is at least aliased to itself.
 	alias1 := []string{id1.String(), "vm1-alias-1", "vm1-alias-2"}
 
-	resources.mockVMRegistry.EXPECT().ReloadWithReadLock(gomock.Any()).Times(1).Return(newVMs, failedVMs, nil)
+	resources.mockVMRegistry.EXPECT().Reload(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)
 

diff --git a/node/node.go b/node/node.go
@@ -1172,13 +1172,6 @@ func (n *Node) initVMs() error {
 		vdrs = validators.NewManager()
 	}
 
-	vmRegisterer := registry.NewVMRegisterer(registry.VMRegistererConfig{
-		APIServer:    n.APIServer,
-		Log:          n.Log,
-		VMFactoryLog: n.VMFactoryLog,
-		VMManager:    n.VMManager,
-	})
-
 	durangoTime := version.GetDurangoTime(n.Config.NetworkID)
 	if err := txs.InitCodec(durangoTime); err != nil {
 		return err
@@ -1192,7 +1185,7 @@ func (n *Node) initVMs() error {
 
 	// Register the VMs that Avalanche supports
 	err := utils.Err(
-		vmRegisterer.Register(context.TODO(), constants.PlatformVMID, &platformvm.Factory{
+		n.VMManager.RegisterFactory(context.TODO(), constants.PlatformVMID, &platformvm.Factory{
 			Config: platformconfig.Config{
 				Chains:                        n.chainManager,
 				Validators:                    vdrs,
@@ -1225,14 +1218,14 @@ func (n *Node) initVMs() error {
 				UseCurrentHeight:              n.Config.UseCurrentHeight,
 			},
 		}),
-		vmRegisterer.Register(context.TODO(), constants.AVMID, &avm.Factory{
+		n.VMManager.RegisterFactory(context.TODO(), constants.AVMID, &avm.Factory{
 			Config: avmconfig.Config{
 				TxFee:            n.Config.TxFee,
 				CreateAssetTxFee: n.Config.CreateAssetTxFee,
 				DurangoTime:      durangoTime,
 			},
 		}),
-		vmRegisterer.Register(context.TODO(), constants.EVMID, &coreth.Factory{}),
+		n.VMManager.RegisterFactory(context.TODO(), constants.EVMID, &coreth.Factory{}),
 		n.VMManager.RegisterFactory(context.TODO(), secp256k1fx.ID, &secp256k1fx.Factory{}),
 		n.VMManager.RegisterFactory(context.TODO(), nftfx.ID, &nftfx.Factory{}),
 		n.VMManager.RegisterFactory(context.TODO(), propertyfx.ID, &propertyfx.Factory{}),
@@ -1253,7 +1246,7 @@ func (n *Node) initVMs() error {
 			CPUTracker:      n.resourceManager,
 			RuntimeTracker:  n.runtimeManager,
 		}),
-		VMRegisterer: vmRegisterer,
+		VMManager: n.VMManager,
 	})
 
 	// register any vms that need to be installed as plugins from disk