Skip to content

Commit

Permalink
fix cyclic import
Browse files Browse the repository at this point in the history
  • Loading branch information
axenteoctavian committed Apr 29, 2024
1 parent 2b113fc commit 8bd360c
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions genesis/process/genesisBlockCreator_test.go
Expand Up @@ -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"
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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())
Expand Down

0 comments on commit 8bd360c

Please sign in to comment.