Skip to content

Commit a764c30

Browse files
committed
Correction after the rebase.
1 parent c1db1af commit a764c30

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

linera-execution/src/evm/database.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ use revm_primitives::{address, Address, B256, U256};
1919
use revm_state::{AccountInfo, Bytecode, EvmState};
2020

2121
use crate::{
22-
evm::inputs::ZERO_ADDRESS,
23-
BaseRuntime, Batch, ContractRuntime, EvmExecutionError, ExecutionError, ServiceRuntime,
22+
evm::inputs::ZERO_ADDRESS, BaseRuntime, Batch, ContractRuntime, EvmExecutionError,
23+
ExecutionError, ServiceRuntime,
2424
};
2525

2626
// The runtime costs are not available in service operations.

linera-execution/src/system.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,6 @@ where
698698
recipient: Recipient,
699699
amount: Amount,
700700
) -> Result<Option<OutgoingMessage>, ExecutionError> {
701-
let source_chain_id = self.context().extra().chain_id();
702701
if source == AccountOwner::CHAIN {
703702
ensure!(
704703
authenticated_signer.is_some()

linera-service/tests/linera_net_tests.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,7 @@ async fn test_evm_end_to_end_counter(config: impl LineraNetConfig) -> Result<()>
527527
#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))]
528528
#[test_log::test(tokio::test)]
529529
async fn test_evm_end_to_end_balance_and_transfer(config: impl LineraNetConfig) -> Result<()> {
530+
use alloy_primitives::U256;
530531
use alloy_sol_types::{sol, SolCall};
531532
use linera_base::vm::EvmQuery;
532533
use linera_execution::{
@@ -612,12 +613,14 @@ async fn test_evm_end_to_end_balance_and_transfer(config: impl LineraNetConfig)
612613
let query1 = get_balanceCall { account: address1 };
613614
let query1 = EvmQuery::Query(query1.abi_encode());
614615
let result = application.run_json_query(query1.clone()).await?;
615-
assert_eq!(read_evm_u256_entry(result), balance1.into());
616+
let balance1_256: U256 = balance1.into();
617+
assert_eq!(read_evm_u256_entry(result), balance1_256);
616618

617619
let query2 = get_balanceCall { account: address2 };
618620
let query2 = EvmQuery::Query(query2.abi_encode());
619621
let result = application.run_json_query(query2.clone()).await?;
620-
assert_eq!(read_evm_u256_entry(result), balance2.into());
622+
let balance2_256: U256 = balance2.into();
623+
assert_eq!(read_evm_u256_entry(result), balance2_256);
621624

622625
// Transfering amount
623626

@@ -641,10 +644,12 @@ async fn test_evm_end_to_end_balance_and_transfer(config: impl LineraNetConfig)
641644
assert_eq!(balance_app_after, balance_app - amount);
642645

643646
let result = application.run_json_query(query1).await?;
644-
assert_eq!(read_evm_u256_entry(result), balance1_after.into());
647+
let balance1_after_256: U256 = balance1_after.into();
648+
assert_eq!(read_evm_u256_entry(result), balance1_after_256);
645649

646650
let result = application.run_json_query(query2.clone()).await?;
647-
assert_eq!(read_evm_u256_entry(result), balance2_after.into());
651+
let balance2_after_256: U256 = balance2_after.into();
652+
assert_eq!(read_evm_u256_entry(result), balance2_after_256);
648653

649654
// Winding down
650655

0 commit comments

Comments
 (0)