From 8bd360c9807bc8d8d7bf3077c40e3d39a2227baa Mon Sep 17 00:00:00 2001 From: axenteoctavian Date: Mon, 29 Apr 2024 10:02:41 +0300 Subject: [PATCH] fix cyclic import --- genesis/process/genesisBlockCreator_test.go | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/genesis/process/genesisBlockCreator_test.go b/genesis/process/genesisBlockCreator_test.go index 4a13b09718..0ded77cdad 100644 --- a/genesis/process/genesisBlockCreator_test.go +++ b/genesis/process/genesisBlockCreator_test.go @@ -14,8 +14,8 @@ import ( "github.com/multiversx/mx-chain-go/config" "github.com/multiversx/mx-chain-go/dataRetriever" errorsMx "github.com/multiversx/mx-chain-go/errors" - "github.com/multiversx/mx-chain-go/factory/runType" "github.com/multiversx/mx-chain-go/genesis" + genesisData "github.com/multiversx/mx-chain-go/genesis/data" "github.com/multiversx/mx-chain-go/genesis/mock" "github.com/multiversx/mx-chain-go/genesis/parsing" "github.com/multiversx/mx-chain-go/process" @@ -252,7 +252,7 @@ func createArgument( } arg.Economics = ted - initialAccounts, err := runType.ReadInitialAccounts(genesisFilename) + initialAccounts, err := readInitialAccounts(genesisFilename) require.Nil(t, err) args := genesis.AccountsParserArgs{ @@ -281,6 +281,21 @@ func createArgument( return arg } +func readInitialAccounts(filePath string) ([]genesis.InitialAccountHandler, error) { + initialAccounts := make([]*genesisData.InitialAccount, 0) + err := core.LoadJsonFile(&initialAccounts, filePath) + if err != nil { + return nil, err + } + + var accounts []genesis.InitialAccountHandler + for _, ia := range initialAccounts { + accounts = append(accounts, ia) + } + + return accounts, nil +} + func createTrieStorageManagers() map[string]common.StorageManager { storageManagerArgs := storageCommon.GetStorageManagerArgs() storageManager, _ := trie.CreateTrieStorageManager(storageManagerArgs, storageCommon.GetStorageManagerOptions())