rename mock_code_balance

privacy-scaling-explorations · Jul 24, 2023 · 2228e4d · 2228e4d
1 parent 3abae63
commit 2228e4d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/eth-types/src/geth_types.rs b/eth-types/src/geth_types.rs
@@ -45,8 +45,8 @@ impl Account {
             && self.storage.is_empty()
     }
 
-    /// Generate an account that has either code or balance
-    pub fn mock_code_or_balance(code: Bytecode) -> Self {
+    /// Generate an account that is either empty or has code, balance, and non-zero nonce
+    pub fn mock_code_balance(code: Bytecode) -> Self {
         let is_empty = code.codesize() == 0;
         Self {
             address: Address::repeat_byte(0xff),

diff --git a/zkevm-circuits/src/evm_circuit/execution/callop.rs b/zkevm-circuits/src/evm_circuit/execution/callop.rs
@@ -779,7 +779,7 @@ mod test {
     }
 
     fn callee(code: bytecode::Bytecode) -> Account {
-        Account::mock_code_or_balance(code)
+        Account::mock_code_balance(code)
     }
 
     fn caller(opcode: &OpcodeId, stack: Stack, caller_is_success: bool) -> Account {

diff --git a/zkevm-circuits/src/evm_circuit/execution/error_invalid_jump.rs b/zkevm-circuits/src/evm_circuit/execution/error_invalid_jump.rs
@@ -240,7 +240,7 @@ mod test {
     }
 
     fn callee(code: Bytecode) -> Account {
-        Account::mock_code_or_balance(code)
+        Account::mock_code_balance(code)
     }
 
     // jump or jumpi error happen in internal call

diff --git a/zkevm-circuits/src/evm_circuit/execution/error_oog_call.rs b/zkevm-circuits/src/evm_circuit/execution/error_oog_call.rs
@@ -273,7 +273,7 @@ mod test {
     }
 
     fn callee(code: Bytecode) -> Account {
-        Account::mock_code_or_balance(code)
+        Account::mock_code_balance(code)
     }
 
     fn test_oog(caller: &Account, callee: &Account, is_root: bool) {

diff --git a/zkevm-circuits/src/evm_circuit/execution/error_oog_constant.rs b/zkevm-circuits/src/evm_circuit/execution/error_oog_constant.rs
@@ -238,7 +238,7 @@ mod test {
     }
 
     fn callee(code: Bytecode) -> Account {
-        Account::mock_code_or_balance(code)
+        Account::mock_code_balance(code)
     }
 
     #[test]

diff --git a/zkevm-circuits/src/evm_circuit/execution/error_oog_log.rs b/zkevm-circuits/src/evm_circuit/execution/error_oog_log.rs
@@ -279,7 +279,7 @@ mod test {
     }
 
     fn callee(code: Bytecode) -> Account {
-        Account::mock_code_or_balance(code)
+        Account::mock_code_balance(code)
     }
 
     #[test]

diff --git a/zkevm-circuits/src/evm_circuit/execution/error_stack.rs b/zkevm-circuits/src/evm_circuit/execution/error_stack.rs
@@ -211,7 +211,7 @@ mod test {
     }
 
     fn callee(code: Bytecode) -> Account {
-        Account::mock_code_or_balance(code)
+        Account::mock_code_balance(code)
     }
 
     // internal call error test

diff --git a/zkevm-circuits/src/evm_circuit/execution/error_write_protection.rs b/zkevm-circuits/src/evm_circuit/execution/error_write_protection.rs
@@ -149,7 +149,7 @@ mod test {
     use mock::TestContext;
 
     fn callee(code: Bytecode) -> Account {
-        Account::mock_code_or_balance(code)
+        Account::mock_code_balance(code)
     }
 
     #[test]