fixes after review

multiversx · Jun 6, 2023 · b7e62c6 · b7e62c6
1 parent d4463c3
commit b7e62c6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/genesis/parsing/accountsParser_test.go b/genesis/parsing/accountsParser_test.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/core/pubkeyConverter"
 	coreData "github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/data/outport"
@@ -515,10 +516,12 @@ func TestAccountsParser_getShardIDs(t *testing.T) {
 }
 
 func TestAccountsParser_createMintTransaction(t *testing.T) {
-	ap := parsing.NewTestAccountsParser(createMockHexPubkeyConverter())
+	pkConv, _ := pubkeyConverter.NewBech32PubkeyConverter(32, "erd")
+	expectedAddr, _ := pkConv.Decode("erd17rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rcqqkhty3")
+	ap := parsing.NewTestAccountsParser(pkConv)
 	balance := int64(1)
 	ibs := []*data.InitialAccount{
-		createSimpleInitialAccount("0001", balance),
+		createSimpleInitialAccount("erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx", balance),
 	}
 
 	ap.SetEntireSupply(big.NewInt(int64(len(ibs)) * balance))
@@ -533,7 +536,7 @@ func TestAccountsParser_createMintTransaction(t *testing.T) {
 	assert.Equal(t, uint64(0), tx.GetNonce())
 	assert.Equal(t, ia[0].AddressBytes(), tx.GetRcvAddr())
 	assert.Equal(t, ia[0].GetSupply(), tx.GetValue())
-	assert.Equal(t, []byte("erd17rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rcqqkhty3"), tx.GetSndAddr())
+	assert.Equal(t, expectedAddr, tx.GetSndAddr())
 	assert.Equal(t, []byte(common.GenesisTxSignatureString), tx.GetSignature())
 	assert.Equal(t, uint64(0), tx.GetGasLimit())
 	assert.Equal(t, uint64(0), tx.GetGasPrice())
@@ -751,7 +754,8 @@ func TestAccountsParser_GenerateInitialTransactionsVerifyTxsHashes(t *testing.T)
 func TestAccountsParser_GenesisMintingAddress(t *testing.T) {
 	t.Parallel()
 
-	ap := parsing.NewTestAccountsParser(createMockHexPubkeyConverter())
+	pkConv, _ := pubkeyConverter.NewBech32PubkeyConverter(32, "erd")
+	ap := parsing.NewTestAccountsParser(pkConv)
 	addr := ap.GenesisMintingAddress()
-	assert.Equal(t, hex.EncodeToString([]byte("erd17rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rcqqkhty3")), addr)
+	assert.Equal(t, "erd17rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rcqqkhty3", addr)
 }
diff --git a/genesis/parsing/export_test.go b/genesis/parsing/export_test.go
@@ -53,10 +53,11 @@ func (ap *accountsParser) CreateMintTransaction(ia genesis.InitialAccountHandler
 }
 
 func NewTestAccountsParser(pubkeyConverter core.PubkeyConverter) *accountsParser {
+	addrBytes, _ := pubkeyConverter.Decode("erd17rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rcqqkhty3")
 	return &accountsParser{
 		pubkeyConverter:    pubkeyConverter,
 		initialAccounts:    make([]*data.InitialAccount, 0),
-		minterAddressBytes: []byte("erd17rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rcqqkhty3"),
+		minterAddressBytes: addrBytes,
 		keyGenerator:       &mock.KeyGeneratorStub{},
 		hasher:             &hashingMocks.HasherMock{},
 		marshalizer:        &mock.MarshalizerMock{},

diff --git a/genesis/process/genesisBlockCreator_test.go b/genesis/process/genesisBlockCreator_test.go
@@ -396,16 +396,6 @@ func TestNewGenesisBlockCreator(t *testing.T) {
 		require.True(t, errors.Is(err, process.ErrNilGasSchedule))
 		require.Nil(t, gbc)
 	})
-	t.Run("nil GasSchedule should error", func(t *testing.T) {
-		t.Parallel()
-
-		arg := createMockArgument(t, "testdata/genesisTest1.json", &mock.InitialNodesHandlerStub{}, big.NewInt(22000))
-		arg.GasSchedule = nil
-
-		gbc, err := NewGenesisBlockCreator(arg)
-		require.True(t, errors.Is(err, process.ErrNilGasSchedule))
-		require.Nil(t, gbc)
-	})
 	t.Run("nil SmartContractParser should error", func(t *testing.T) {
 		t.Parallel()