some refactor around From Felt

Author: tcoratger

crates/ef-testing/src/evm_sequencer/evm_state/v0.rs

@@ -169,8 +169,8 @@ impl Evm for KakarotSequencer {
             .state_mut()
             .get_storage_at(starknet_address, key_high)?;
 
-        let low = U256::from_be_bytes(Into::<Felt>::into(low).to_bytes_be());
-        let high = U256::from_be_bytes(Into::<Felt>::into(high).to_bytes_be());
+        let low = U256::from_be_bytes(low.to_bytes_be());
+        let high = U256::from_be_bytes(high.to_bytes_be());
 
         Ok(high << 128 | low)
     }
@@ -182,7 +182,7 @@ impl Evm for KakarotSequencer {
         let key = get_storage_var_address(ACCOUNT_NONCE, &[]);
         let nonce = self.state_mut().get_storage_at(starknet_address, key)?;
 
-        Ok(U256::from_be_bytes(Into::<Felt>::into(nonce).to_bytes_be()))
+        Ok(U256::from_be_bytes(nonce.to_bytes_be()))
     }
 
     /// Returns the bytecode of the given address. For an EOA, the bytecode_len_ storage variable will return 0,
@@ -213,7 +213,7 @@ impl Evm for KakarotSequencer {
         }
 
         let remainder = bytecode_len % 31;
-        let key = StorageKey::from(num_chunks);
+        let key: StorageKey = StorageKey::from(num_chunks);
         let code = self.state_mut().get_storage_at(starknet_address, key)?;
         bytecode.append(&mut felt_to_bytes(&code, (32 - remainder) as usize).to_vec());
 
@@ -228,8 +228,8 @@ impl Evm for KakarotSequencer {
             .state_mut()
             .get_fee_token_balance(starknet_address, *ETH_FEE_TOKEN_ADDRESS)?;
 
-        let low = U256::from_be_bytes(Into::<Felt>::into(low).to_bytes_be());
-        let high = U256::from_be_bytes(Into::<Felt>::into(high).to_bytes_be());
+        let low = U256::from_be_bytes(low.to_bytes_be());
+        let high = U256::from_be_bytes(high.to_bytes_be());
 
         Ok(high << 128 | low)
     }

crates/ef-testing/src/evm_sequencer/evm_state/v1.rs

@@ -174,8 +174,8 @@ impl Evm for KakarotSequencer {
             .state_mut()
             .get_storage_at(starknet_address, key_high)?;
 
-        let low = U256::from_be_bytes(Into::<Felt>::into(low).to_bytes_be());
-        let high = U256::from_be_bytes(Into::<Felt>::into(high).to_bytes_be());
+        let low = U256::from_be_bytes(low.to_bytes_be());
+        let high = U256::from_be_bytes(high.to_bytes_be());
 
         Ok(high << 128 | low)
     }
@@ -193,7 +193,7 @@ impl Evm for KakarotSequencer {
             )
             .unwrap();
 
-        Ok(U256::from_be_bytes(Into::<Felt>::into(nonce).to_bytes_be()))
+        Ok(U256::from_be_bytes(nonce.to_bytes_be()))
     }
 
     /// Returns the bytecode of the given address. For an EOA, the bytecode_len_ storage variable will return 0,
@@ -256,8 +256,8 @@ impl Evm for KakarotSequencer {
             .state_mut()
             .get_fee_token_balance(starknet_address, *ETH_FEE_TOKEN_ADDRESS)?;
 
-        let low = U256::from_be_bytes(Into::<Felt>::into(low).to_bytes_be());
-        let high = U256::from_be_bytes(Into::<Felt>::into(high).to_bytes_be());
+        let low = U256::from_be_bytes(low.to_bytes_be());
+        let high = U256::from_be_bytes(high.to_bytes_be());
 
         Ok(high << 128 | low)
     }

crates/ef-testing/src/models/case.rs

@@ -259,12 +259,8 @@ impl Case for BlockchainTestCase {
         let prev_randao: U256 = sealed_header.mix_hash.into();
         let base_fee = U256::from(sealed_header.base_fee_per_gas.unwrap_or_default());
         let block_gas_limit = U256::from(sealed_header.gas_limit);
-
         let block_number = U256::from(sealed_header.number);
-        let block_number = TryInto::<u64>::try_into(block_number).unwrap_or_default();
-
         let block_timestamp = U256::from(sealed_block.timestamp);
-        let block_timestamp = TryInto::<u64>::try_into(block_timestamp).unwrap_or_default();
 
         let kakarot_environment = KakarotEnvironment::new(
             *KAKAROT_ADDRESS,
@@ -277,8 +273,8 @@ impl Case for BlockchainTestCase {
             kakarot_environment,
             coinbase_address,
             CHAIN_ID,
-            block_number,
-            block_timestamp,
+            block_number.try_into().unwrap_or_default(),
+            block_timestamp.try_into().unwrap_or_default(),
         );
 
         sequencer.setup_state(base_fee, prev_randao, block_gas_limit)?;

crates/sequencer/src/transaction.rs

@@ -43,13 +43,7 @@ impl BroadcastedTransactionWrapper {
                                 ),
                                 nonce: Nonce(invoke_v1.nonce),
                                 sender_address: invoke_v1.sender_address.try_into()?,
-                                calldata: Calldata(Arc::new(
-                                    invoke_v1
-                                        .calldata
-                                        .iter()
-                                        .map(|x| Into::<Felt>::into(*x))
-                                        .collect(),
-                                )),
+                                calldata: Calldata(Arc::new(invoke_v1.calldata.to_vec())),
                             }),
                             only_query: false,
                             tx_hash: TransactionHash(compute_transaction_hash(