Use encoder/registry to initialize encoder types (NethermindEth#2359)

blockchain/blockchain.go

@@ -92,7 +92,6 @@ type Blockchain struct {
 }
 
 func New(database db.DB, network *utils.Network, pendingBlockFn func() *core.Block) *Blockchain {
-	RegisterCoreTypesToEncoder()
 	return &Blockchain{
 		database:       database,
 		network:        network,

blockchain/init_test.go

@@ -0,0 +1,5 @@
+package blockchain_test
+
+import (
+	_ "github.com/NethermindEth/juno/encoder/registry"
+)

cmd/juno/init_test.go

@@ -0,0 +1,5 @@
+package main_test
+
+import (
+	_ "github.com/NethermindEth/juno/encoder/registry"
+)

cmd/juno/juno.go

@@ -13,6 +13,7 @@ import (
 	"syscall"
 	"time"
 
+	_ "github.com/NethermindEth/juno/encoder/registry"
 	_ "github.com/NethermindEth/juno/jemalloc"
 	"github.com/NethermindEth/juno/node"
 	"github.com/NethermindEth/juno/utils"

core/init_test.go

@@ -0,0 +1,5 @@
+package core_test
+
+import (
+	_ "github.com/NethermindEth/juno/encoder/registry"
+)

core/state_test.go

@@ -4,16 +4,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"os"
-	"reflect"
 	"testing"
 
 	"github.com/NethermindEth/juno/clients/feeder"
 	"github.com/NethermindEth/juno/core"
 	"github.com/NethermindEth/juno/core/felt"
 	"github.com/NethermindEth/juno/db"
 	"github.com/NethermindEth/juno/db/pebble"
-	"github.com/NethermindEth/juno/encoder"
 	adaptfeeder "github.com/NethermindEth/juno/starknetdata/feeder"
 	"github.com/NethermindEth/juno/utils"
 	"github.com/stretchr/testify/assert"
@@ -26,27 +23,6 @@ var (
 	su1FirstDeployedAddress     = *_su1FirstDeployedAddress
 )
 
-func TestMain(m *testing.M) {
-	txTypes := []core.Transaction{
-		&core.DeclareTransaction{},
-		&core.DeployTransaction{},
-		&core.InvokeTransaction{},
-		&core.L1HandlerTransaction{},
-		&core.DeployAccountTransaction{},
-	}
-
-	for _, tx := range txTypes {
-		_ = encoder.RegisterType(reflect.TypeOf(tx))
-	}
-
-	_ = encoder.RegisterType(reflect.TypeOf(core.Cairo0Class{}))
-	_ = encoder.RegisterType(reflect.TypeOf(core.Cairo1Class{}))
-
-	code := m.Run()
-
-	os.Exit(code)
-}
-
 func TestUpdate(t *testing.T) {
 	client := feeder.NewTestClient(t, &utils.Mainnet)
 	gw := adaptfeeder.New(client)

blockchain/encoder_initializer.go → encoder/registry/registry.go

@@ -1,4 +1,4 @@
-package blockchain
+package registry
 
 import (
 	"reflect"
@@ -10,7 +10,8 @@ import (
 
 var once sync.Once
 
-func RegisterCoreTypesToEncoder() {
+//nolint:gochecknoinits
+func init() {
 	once.Do(func() {
 		types := []reflect.Type{
 			reflect.TypeOf(core.DeclareTransaction{}),

migration/init_pkg_test.go

@@ -0,0 +1,5 @@
+package migration
+
+import (
+	_ "github.com/NethermindEth/juno/encoder/registry"
+)

migration/migration.go

@@ -256,7 +256,6 @@ func relocateContractStorageRootKeys(txn db.Transaction, _ *utils.Network) error
 
 // recalculateBloomFilters updates bloom filters in block headers to match what the most recent implementation expects
 func recalculateBloomFilters(txn db.Transaction, _ *utils.Network) error {
-	blockchain.RegisterCoreTypesToEncoder()
 	for blockNumber := uint64(0); ; blockNumber++ {
 		block, err := blockchain.BlockByNumber(txn, blockNumber)
 		if err != nil {

migration/migration_pkg_test.go

@@ -268,7 +268,6 @@ func TestMigrateTrieRootKeysFromBitsetToTrieKeys(t *testing.T) {
 }
 
 func TestMigrateCairo1CompiledClass(t *testing.T) {
-	blockchain.RegisterCoreTypesToEncoder()
 	txn := db.NewMemTransaction()
 
 	key := []byte("key")

node/init_test.go

@@ -0,0 +1,5 @@
+package node_test
+
+import (
+	_ "github.com/NethermindEth/juno/encoder/registry"
+)

plugin/init_test.go

@@ -0,0 +1,5 @@
+package plugin_test
+
+import (
+	_ "github.com/NethermindEth/juno/encoder/registry"
+)

sync/init_test.go

@@ -0,0 +1,5 @@
+package sync_test
+
+import (
+	_ "github.com/NethermindEth/juno/encoder/registry"
+)

vm/init_test.go

@@ -0,0 +1,5 @@
+package vm_test
+
+import (
+	_ "github.com/NethermindEth/juno/encoder/registry"
+)

vm/vm_test.go

@@ -3,14 +3,12 @@ package vm
 import (
 	"context"
 	"os"
-	"reflect"
 	"testing"
 
 	"github.com/NethermindEth/juno/clients/feeder"
 	"github.com/NethermindEth/juno/core"
 	"github.com/NethermindEth/juno/core/felt"
 	"github.com/NethermindEth/juno/db/pebble"
-	"github.com/NethermindEth/juno/encoder"
 	adaptfeeder "github.com/NethermindEth/juno/starknetdata/feeder"
 	"github.com/NethermindEth/juno/utils"
 	"github.com/stretchr/testify/assert"
@@ -33,8 +31,6 @@ func TestV0Call(t *testing.T) {
 	simpleClass, err := gw.Class(context.Background(), classHash)
 	require.NoError(t, err)
 
-	require.NoError(t, encoder.RegisterType(reflect.TypeOf(core.Cairo0Class{})))
-
 	testState := core.NewState(txn)
 	require.NoError(t, testState.Update(0, &core.StateUpdate{
 		OldRoot: &felt.Zero,
@@ -95,8 +91,6 @@ func TestV1Call(t *testing.T) {
 	simpleClass, err := gw.Class(context.Background(), classHash)
 	require.NoError(t, err)
 
-	require.NoError(t, encoder.RegisterType(reflect.TypeOf(core.Cairo1Class{})))
-
 	testState := core.NewState(txn)
 	require.NoError(t, testState.Update(0, &core.StateUpdate{
 		OldRoot: &felt.Zero,
@@ -165,8 +159,6 @@ func TestCall_MaxSteps(t *testing.T) {
 	simpleClass, err := gw.Class(context.Background(), classHash)
 	require.NoError(t, err)
 
-	encoder.RegisterType(reflect.TypeOf(core.Cairo0Class{})) //nolint:errcheck
-
 	testState := core.NewState(txn)
 	require.NoError(t, testState.Update(0, &core.StateUpdate{
 		OldRoot: &felt.Zero,