Move action and auth registry to registry package (#1258)

* move {Action,Auth}Registry to registry package * gci
ava-labs · Aug 9, 2024 · 3fcfd4f · 3fcfd4f
1 parent 5fc21a1
commit 3fcfd4f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/examples/morpheusvm/controller/controller.go b/examples/morpheusvm/controller/controller.go
@@ -17,6 +17,7 @@ import (
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/genesis"
+	"github.com/ava-labs/hypersdk/examples/morpheusvm/registry"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/rpc"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/storage"
 	"github.com/ava-labs/hypersdk/extension/indexer"
@@ -37,8 +38,8 @@ func New(options ...vm.Option) (*vm.VM, error) {
 	return vm.New(
 		&factory{},
 		consts.Version,
-		consts.ActionRegistry,
-		consts.AuthRegistry,
+		registry.Action,
+		registry.Auth,
 		auth.Engines(),
 		options...,
 	)

diff --git a/examples/morpheusvm/registry/registry.go b/examples/morpheusvm/registry/registry.go
@@ -10,23 +10,27 @@ import (
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/actions"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
+)
+
+var (
+	Action *codec.TypeParser[chain.Action]
+	Auth   *codec.TypeParser[chain.Auth]
 )
 
 // Setup types
 func init() {
-	consts.ActionRegistry = codec.NewTypeParser[chain.Action]()
-	consts.AuthRegistry = codec.NewTypeParser[chain.Auth]()
+	Action = codec.NewTypeParser[chain.Action]()
+	Auth = codec.NewTypeParser[chain.Auth]()
 
 	errs := &wrappers.Errs{}
 	errs.Add(
 		// When registering new actions, ALWAYS make sure to append at the end.
-		consts.ActionRegistry.Register((&actions.Transfer{}).GetTypeID(), actions.UnmarshalTransfer),
+		Action.Register((&actions.Transfer{}).GetTypeID(), actions.UnmarshalTransfer),
 
 		// When registering new auth, ALWAYS make sure to append at the end.
-		consts.AuthRegistry.Register((&auth.ED25519{}).GetTypeID(), auth.UnmarshalED25519),
-		consts.AuthRegistry.Register((&auth.SECP256R1{}).GetTypeID(), auth.UnmarshalSECP256R1),
-		consts.AuthRegistry.Register((&auth.BLS{}).GetTypeID(), auth.UnmarshalBLS),
+		Auth.Register((&auth.ED25519{}).GetTypeID(), auth.UnmarshalED25519),
+		Auth.Register((&auth.SECP256R1{}).GetTypeID(), auth.UnmarshalSECP256R1),
+		Auth.Register((&auth.BLS{}).GetTypeID(), auth.UnmarshalBLS),
 	)
 	if errs.Errored() {
 		panic(errs.Err)

diff --git a/examples/morpheusvm/rpc/jsonrpc_client.go b/examples/morpheusvm/rpc/jsonrpc_client.go
@@ -9,11 +9,10 @@ import (
 
 	"github.com/ava-labs/avalanchego/ids"
 
-	_ "github.com/ava-labs/hypersdk/examples/morpheusvm/registry" // ensure registry populated
-
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/genesis"
+	"github.com/ava-labs/hypersdk/examples/morpheusvm/registry"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/storage"
 	"github.com/ava-labs/hypersdk/requester"
 	"github.com/ava-labs/hypersdk/rpc"
@@ -143,7 +142,7 @@ func (p *Parser) Rules(t int64) chain.Rules {
 }
 
 func (*Parser) Registry() (chain.ActionRegistry, chain.AuthRegistry) {
-	return consts.ActionRegistry, consts.AuthRegistry
+	return registry.Action, registry.Auth
 }
 
 func (*Parser) StateManager() chain.StateManager {