Fix tests

lambdaclass · Oct 30, 2024 · c04a00f · c04a00f
1 parent 3cee7e5
commit c04a00f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/crates/vm/levm/src/utils.rs b/crates/vm/levm/src/utils.rs
@@ -1,5 +1,8 @@
 use crate::{
-    constants::TX_BASE_COST, db::{Cache, Db}, operations::Operation, vm::{Account, AccountInfo, Environment, VM}
+    constants::TX_BASE_COST,
+    db::{Cache, Db},
+    operations::Operation,
+    vm::{Account, AccountInfo, Environment, VM},
 };
 use bytes::Bytes;
 use ethereum_types::{Address, U256};

diff --git a/crates/vm/levm/src/vm.rs b/crates/vm/levm/src/vm.rs
@@ -421,12 +421,14 @@ impl VM {
 
         if self.is_create() {
             // If address is already in db, there's an error
-            let new_address_acc = self.db.get_account_info(self.call_frames.first().unwrap().to);
+            let new_address_acc = self
+                .db
+                .get_account_info(self.call_frames.first().unwrap().to);
             if !new_address_acc.is_empty() {
                 return Err(VMError::AddressAlreadyOccupied);
-            }            
+            }
         }
-        
+
         let sender_account = match self.cache.get_mut_account(self.env.origin) {
             Some(acc) => acc,
             None => return Err(VMError::AddressDoesNotMatchAnAccount),

diff --git a/crates/vm/levm/tests/tests.rs b/crates/vm/levm/tests/tests.rs
@@ -4013,10 +4013,10 @@ fn origin_op() {
         &Account::default().with_bytecode(ops_to_bytecde(&operations)),
     );
 
-    let env = Environment::default_from_address(address_that_has_the_code);
+    let mut env = Environment::default_from_address(msg_sender);
 
     let mut vm = VM::new(
-        Some(Address::from_low_u64_be(42)),
+        Some(address_that_has_the_code),
         env,
         Default::default(),
         Default::default(),
@@ -4026,7 +4026,6 @@ fn origin_op() {
         None,
     );
 
-
     let mut current_call_frame = vm.call_frames.pop().unwrap();
     vm.execute(&mut current_call_frame);
 
@@ -4082,10 +4081,10 @@ fn address_op() {
         &Account::default().with_bytecode(ops_to_bytecde(&operations)),
     );
 
-    let env = Environment::default_from_address(address_that_has_the_code);
+    let env = Environment::default_from_address(Address::from_low_u64_be(42));
 
     let mut vm = VM::new(
-        Some(Address::from_low_u64_be(42)),
+        Some(address_that_has_the_code),
         env,
         Default::default(),
         Default::default(),
@@ -4128,10 +4127,10 @@ fn selfbalance_op() {
             .with_balance(balance),
     );
 
-    let env = Environment::default_from_address(address_that_has_the_code);
+    let env = Environment::default_from_address(Address::from_low_u64_be(42));
 
     let mut vm = VM::new(
-        Some(Address::from_low_u64_be(42)),
+        Some(address_that_has_the_code),
         env,
         Default::default(),
         Default::default(),
@@ -4168,12 +4167,12 @@ fn callvalue_op() {
         &Account::default().with_bytecode(ops_to_bytecde(&operations)),
     );
 
-    let env = Environment::default_from_address(address_that_has_the_code);
+    let env = Environment::default_from_address(Address::from_low_u64_be(42));
 
     let mut vm = VM::new(
-        Some(Address::from_low_u64_be(42)),
+        Some(address_that_has_the_code),
         env,
-        Default::default(),
+        value,
         Default::default(),
         Box::new(db),
         cache,
@@ -4207,10 +4206,10 @@ fn codesize_op() {
         &Account::default().with_bytecode(ops_to_bytecde(&operations)),
     );
 
-    let env = Environment::default_from_address(address_that_has_the_code);
+    let env = Environment::default_from_address(Address::from_low_u64_be(42));
 
     let mut vm = VM::new(
-        Some(Address::from_low_u64_be(42)),
+        Some(address_that_has_the_code),
         env,
         Default::default(),
         Default::default(),
@@ -4248,10 +4247,11 @@ fn gasprice_op() {
         &Account::default().with_bytecode(ops_to_bytecde(&operations)),
     );
 
-    let env = Environment::default_from_address(address_that_has_the_code);
+    let mut env = Environment::default_from_address(Address::from_low_u64_be(42));
+    env.gas_price = U256::from_str_radix("9876", 16).unwrap();
 
     let mut vm = VM::new(
-        Some(Address::from_low_u64_be(42)),
+        Some(address_that_has_the_code),
         env,
         Default::default(),
         Default::default(),
@@ -4306,10 +4306,10 @@ fn codecopy_op() {
         &Account::default().with_bytecode(ops_to_bytecde(&operations)),
     );
 
-    let env = Environment::default_from_address(address_that_has_the_code);
+    let env = Environment::default_from_address(Address::from_low_u64_be(42));
 
     let mut vm = VM::new(
-        Some(Address::from_low_u64_be(42)),
+        Some(address_that_has_the_code),
         env,
         Default::default(),
         Default::default(),