Small code enhancements (#1841)

NethermindEth · Apr 29, 2024 · 72dfa3a · 72dfa3a
1 parent a85cae7
commit 72dfa3a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 23 deletions.
diff --git a/adapters/core2p2p/block.go b/adapters/core2p2p/block.go
@@ -38,7 +38,7 @@ func AdaptHeader(header *core.Header, commitments *core.BlockCommitments) *spec.
 		Receipts:         nil, // not defined yet
 		StateDiffs:       nil, // not defined yet
 		State: &spec.Patricia{
-			Height: 251, // fixed
+			Height: core.ContractStorageTrieHeight,
 			Root:   AdaptHash(header.GlobalStateRoot),
 		},
 		Transactions: &spec.Merkle{

diff --git a/adapters/p2p2core/transaction.go b/adapters/p2p2core/transaction.go
@@ -35,7 +35,7 @@ func AdaptTransaction(t *spec.Transaction, network *utils.Network) core.Transact
 			SenderAddress:        AdaptAddress(tx.Sender),
 			MaxFee:               AdaptFelt(tx.MaxFee),
 			TransactionSignature: adaptAccountSignature(tx.Signature),
-			Version:              txVerion(0),
+			Version:              txVersion(0),
 			CompiledClassHash:    nil,
 		}
 		declareTx.TransactionHash = hash(declareTx)
@@ -49,7 +49,7 @@ func AdaptTransaction(t *spec.Transaction, network *utils.Network) core.Transact
 			MaxFee:               AdaptFelt(tx.MaxFee),
 			TransactionSignature: adaptAccountSignature(tx.Signature),
 			Nonce:                AdaptFelt(tx.Nonce),
-			Version:              txVerion(1),
+			Version:              txVersion(1),
 			CompiledClassHash:    nil,
 		}
 		declareTx.TransactionHash = hash(declareTx)
@@ -63,7 +63,7 @@ func AdaptTransaction(t *spec.Transaction, network *utils.Network) core.Transact
 			MaxFee:               AdaptFelt(tx.MaxFee),
 			TransactionSignature: adaptAccountSignature(tx.Signature),
 			Nonce:                AdaptFelt(tx.Nonce),
-			Version:              txVerion(2),
+			Version:              txVersion(2),
 			CompiledClassHash:    AdaptFelt(tx.CompiledClassHash),
 		}
 		declareTx.TransactionHash = hash(declareTx)
@@ -88,7 +88,7 @@ func AdaptTransaction(t *spec.Transaction, network *utils.Network) core.Transact
 			MaxFee:               AdaptFelt(tx.MaxFee),
 			TransactionSignature: adaptAccountSignature(tx.Signature),
 			Nonce:                AdaptFelt(tx.Nonce),
-			Version:              txVerion(3),
+			Version:              txVersion(3),
 			CompiledClassHash:    AdaptFelt(tx.CompiledClassHash),
 			Tip:                  AdaptFelt(tx.Tip).Uint64(),
 			ResourceBounds: map[core.Resource]core.ResourceBounds{
@@ -114,7 +114,7 @@ func AdaptTransaction(t *spec.Transaction, network *utils.Network) core.Transact
 			ContractAddressSalt: addressSalt,
 			ClassHash:           classHash,
 			ConstructorCallData: callData,
-			Version:             txVerion(0),
+			Version:             txVersion(0),
 		}
 		deployTx.TransactionHash = hash(deployTx)
 
@@ -131,7 +131,7 @@ func AdaptTransaction(t *spec.Transaction, network *utils.Network) core.Transact
 				ContractAddress:     core.ContractAddress(&felt.Zero, classHash, addressSalt, callData),
 				ClassHash:           classHash,
 				ConstructorCallData: callData,
-				Version:             txVerion(1),
+				Version:             txVersion(1),
 			},
 			MaxFee:               AdaptFelt(tx.MaxFee),
 			TransactionSignature: adaptAccountSignature(tx.Signature),
@@ -162,7 +162,7 @@ func AdaptTransaction(t *spec.Transaction, network *utils.Network) core.Transact
 				ContractAddress:     core.ContractAddress(&felt.Zero, classHash, addressSalt, callData),
 				ClassHash:           classHash,
 				ConstructorCallData: callData,
-				Version:             txVerion(3),
+				Version:             txVersion(3),
 			},
 			MaxFee:               AdaptFelt(tx.MaxFee),
 			TransactionSignature: adaptAccountSignature(tx.Signature),
@@ -188,7 +188,7 @@ func AdaptTransaction(t *spec.Transaction, network *utils.Network) core.Transact
 			TransactionSignature: adaptAccountSignature(tx.Signature),
 			MaxFee:               AdaptFelt(tx.MaxFee),
 			ContractAddress:      AdaptAddress(tx.Address),
-			Version:              txVerion(0),
+			Version:              txVersion(0),
 			EntryPointSelector:   AdaptFelt(tx.EntryPointSelector),
 		}
 		invTx.TransactionHash = hash(invTx)
@@ -203,7 +203,7 @@ func AdaptTransaction(t *spec.Transaction, network *utils.Network) core.Transact
 			CallData:             utils.Map(tx.Calldata, AdaptFelt),
 			TransactionSignature: adaptAccountSignature(tx.Signature),
 			MaxFee:               AdaptFelt(tx.MaxFee),
-			Version:              txVerion(1),
+			Version:              txVersion(1),
 			EntryPointSelector:   nil,
 		}
 		invTx.TransactionHash = hash(invTx)
@@ -227,7 +227,7 @@ func AdaptTransaction(t *spec.Transaction, network *utils.Network) core.Transact
 			CallData:             utils.Map(tx.Calldata, AdaptFelt),
 			TransactionSignature: adaptAccountSignature(tx.Signature),
 			MaxFee:               AdaptFelt(tx.MaxFee),
-			Version:              txVerion(3),
+			Version:              txVersion(3),
 			Nonce:                AdaptFelt(tx.Nonce),
 			SenderAddress:        AdaptAddress(tx.Sender),
 			EntryPointSelector:   nil,
@@ -250,7 +250,7 @@ func AdaptTransaction(t *spec.Transaction, network *utils.Network) core.Transact
 			EntryPointSelector: AdaptFelt(tx.EntryPointSelector),
 			Nonce:              AdaptFelt(tx.Nonce),
 			CallData:           utils.Map(tx.Calldata, AdaptFelt),
-			Version:            txVerion(0),
+			Version:            txVersion(0),
 		}
 		l1Tx.TransactionHash = hash(l1Tx)
 
@@ -271,6 +271,6 @@ func adaptAccountSignature(s *spec.AccountSignature) []*felt.Felt {
 	return utils.Map(s.Parts, AdaptFelt)
 }
 
-func txVerion(v uint64) *core.TransactionVersion {
+func txVersion(v uint64) *core.TransactionVersion {
 	return new(core.TransactionVersion).SetUint64(v)
 }
diff --git a/core/contract.go b/core/contract.go
@@ -9,7 +9,8 @@ import (
 	"github.com/NethermindEth/juno/db"
 )
 
-const contractStorageTrieHeight = 251
+// contract storage has fixed height at 251
+const ContractStorageTrieHeight = 251
 
 var (
 	ErrContractNotDeployed     = errors.New("contract not deployed")
@@ -204,5 +205,5 @@ func (c *ContractUpdater) Replace(classHash *felt.Felt) error {
 func storage(addr *felt.Felt, txn db.Transaction) (*trie.Trie, error) {
 	addrBytes := addr.Marshal()
 	trieTxn := trie.NewStorage(txn, db.ContractStorage.Key(addrBytes))
-	return trie.NewTriePedersen(trieTxn, contractStorageTrieHeight)
+	return trie.NewTriePedersen(trieTxn, ContractStorageTrieHeight)
 }
diff --git a/starknetdata/feeder/feeder_test.go b/starknetdata/feeder/feeder_test.go
@@ -23,10 +23,11 @@ func TestBlockByNumber(t *testing.T) {
 	ctx := context.Background()
 
 	for _, number := range numbers {
-		t.Run("mainnet block number "+strconv.FormatUint(number, 10), func(t *testing.T) {
-			response, err := client.Block(ctx, strconv.FormatUint(number, 10))
+		numberStr := strconv.FormatUint(number, 10)
+		t.Run("mainnet block number "+numberStr, func(t *testing.T) {
+			response, err := client.Block(ctx, numberStr)
 			require.NoError(t, err)
-			sig, err := client.Signature(ctx, strconv.FormatUint(number, 10))
+			sig, err := client.Signature(ctx, numberStr)
 			require.NoError(t, err)
 			block, err := adapter.BlockByNumber(ctx, number)
 			require.NoError(t, err)
@@ -61,8 +62,9 @@ func TestStateUpdate(t *testing.T) {
 	ctx := context.Background()
 
 	for _, number := range numbers {
-		t.Run("number "+strconv.FormatUint(number, 10), func(t *testing.T) {
-			response, err := client.StateUpdate(ctx, strconv.FormatUint(number, 10))
+		numberStr := strconv.FormatUint(number, 10)
+		t.Run("number "+numberStr, func(t *testing.T) {
+			response, err := client.StateUpdate(ctx, numberStr)
 			require.NoError(t, err)
 			feederUpdate, err := adapter.StateUpdate(ctx, number)
 			require.NoError(t, err)
@@ -227,10 +229,11 @@ func TestStateUpdateWithBlock(t *testing.T) {
 	ctx := context.Background()
 
 	for _, number := range numbers {
-		t.Run("integration block number "+strconv.FormatUint(number, 10), func(t *testing.T) {
-			response, err := client.StateUpdateWithBlock(ctx, strconv.FormatUint(number, 10))
+		numberStr := strconv.FormatUint(number, 10)
+		t.Run("integration block number "+numberStr, func(t *testing.T) {
+			response, err := client.StateUpdateWithBlock(ctx, numberStr)
 			require.NoError(t, err)
-			sig, err := client.Signature(ctx, strconv.FormatUint(number, 10))
+			sig, err := client.Signature(ctx, numberStr)
 			require.NoError(t, err)
 			stateUpdate, block, err := adapter.StateUpdateWithBlock(ctx, number)
 			require.NoError(t, err)