Fix call_data to calldata

crates/evm/src/context.cairo

@@ -18,7 +18,7 @@ struct CallContext {
     /// The bytecode to execute.
     bytecode: Span<u8>,
     /// The call data.
-    call_data: Span<u8>,
+    calldata: Span<u8>,
     /// Amount of native token to transfer.
     value: u256,
 }
@@ -32,16 +32,16 @@ struct CallContext {
 // instead we should use the methods defined in the trait. 
 // This is not enforced until there are `pub` and `priv` visibility on struct fields.
 trait CallContextTrait {
-    fn new(bytecode: Span<u8>, call_data: Span<u8>, value: u256) -> CallContext;
+    fn new(bytecode: Span<u8>, calldata: Span<u8>, value: u256) -> CallContext;
     fn bytecode(self: @CallContext) -> Span<u8>;
-    fn call_data(self: @CallContext) -> Span<u8>;
+    fn calldata(self: @CallContext) -> Span<u8>;
     fn value(self: @CallContext) -> u256;
 }
 
 impl CallContextImpl of CallContextTrait {
     #[inline(always)]
-    fn new(bytecode: Span<u8>, call_data: Span<u8>, value: u256) -> CallContext {
-        CallContext { bytecode, call_data, value, }
+    fn new(bytecode: Span<u8>, calldata: Span<u8>, value: u256) -> CallContext {
+        CallContext { bytecode, calldata, value, }
     }
 
     #[inline(always)]
@@ -50,8 +50,8 @@ impl CallContextImpl of CallContextTrait {
     }
 
     #[inline(always)]
-    fn call_data(self: @CallContext) -> Span<u8> {
-        *self.call_data
+    fn calldata(self: @CallContext) -> Span<u8> {
+        *self.calldata
     }
 
     #[inline(always)]

crates/evm/src/instructions/environmental_information.cairo

@@ -58,7 +58,7 @@ impl EnvironmentInformationImpl of EnvironmentInformationTrait {
     /// Get the size of return data.
     /// # Specification: https://www.evm.codes/#36?fork=shanghai
     fn exec_calldatasize(ref self: ExecutionContext) -> Result<(), EVMError> {
-        let result: u256 = self.call_context().call_data().len().into();
+        let result: u256 = self.call_context().calldata().len().into();
         self.stack.push(result)
     }
 

crates/evm/src/tests/test_execution_context.cairo

@@ -29,16 +29,16 @@ fn no_op() {}
 fn test_call_context_new() {
     // When
     let bytecode: Span<u8> = array![1, 2, 3].span();
-    let call_data: Span<u8> = array![4, 5, 6].span();
+    let calldata: Span<u8> = array![4, 5, 6].span();
     let value: u256 = callvalue();
 
-    let call_ctx = CallContextTrait::new(bytecode, call_data, value);
+    let call_ctx = CallContextTrait::new(bytecode, calldata, value);
     // TODO remove once no longer required (see https://github.com/starkware-libs/cairo/issues/3863)
     no_op();
 
     // Then
     assert(call_ctx.bytecode() == bytecode, 'wrong bytecode');
-    assert(call_ctx.call_data() == call_data, 'wrong call_data');
+    assert(call_ctx.calldata() == calldata, 'wrong calldata');
     assert(call_ctx.value() == callvalue(), 'wrong value');
 }
 

crates/evm/src/tests/test_instructions/test_environment_information.cairo

@@ -67,14 +67,14 @@ fn test_gasprice() {
 fn test_calldata_size() {
     // Given
     let mut ctx = setup_execution_context();
-    let call_data: Span<u8> = ctx.call_context().call_data();
+    let calldata: Span<u8> = ctx.call_context().calldata();
 
     // When
     ctx.exec_calldatasize();
 
     // Then
     assert(ctx.stack.len() == 1, 'stack should have one element');
-    assert(ctx.stack.peek().unwrap() == call_data.len().into(), 'stack top is not calldatasize');
+    assert(ctx.stack.peek().unwrap() == calldata.len().into(), 'stack top is not calldatasize');
 }
 
 #[test]

crates/evm/src/tests/test_utils.cairo

@@ -22,10 +22,10 @@ fn callvalue() -> u256 {
 
 fn setup_call_context() -> CallContext {
     let bytecode: Span<u8> = array![1, 2, 3].span();
-    let call_data: Span<u8> = array![4, 5, 6].span();
+    let calldata: Span<u8> = array![4, 5, 6].span();
     let value: u256 = callvalue();
 
-    CallContextTrait::new(bytecode, call_data, value)
+    CallContextTrait::new(bytecode, calldata, value)
 }
 
 fn setup_execution_context() -> ExecutionContext {
@@ -43,10 +43,10 @@ fn setup_execution_context() -> ExecutionContext {
 }
 
 fn setup_call_context_with_bytecode(bytecode: Span<u8>) -> CallContext {
-    let call_data: Span<u8> = array![4, 5, 6].span();
+    let calldata: Span<u8> = array![4, 5, 6].span();
     let value: u256 = 100;
 
-    CallContextTrait::new(bytecode, call_data, value)
+    CallContextTrait::new(bytecode, calldata, value)
 }
 
 fn setup_execution_context_with_bytecode(bytecode: Span<u8>) -> ExecutionContext {
@@ -65,7 +65,7 @@ fn setup_execution_context_with_bytecode(bytecode: Span<u8>) -> ExecutionContext
 
 impl CallContextPartialEq of PartialEq<CallContext> {
     fn eq(lhs: @CallContext, rhs: @CallContext) -> bool {
-        lhs.bytecode() == rhs.bytecode() && lhs.call_data == rhs.call_data && lhs.value == rhs.value
+        lhs.bytecode() == rhs.bytecode() && lhs.calldata == rhs.calldata && lhs.value == rhs.value
     }
     fn ne(lhs: @CallContext, rhs: @CallContext) -> bool {
         !(lhs == rhs)

docs/general/model/execution_context.md

@@ -33,7 +33,7 @@ classDiagram
 
     class CallContext{
         bytecode: Span~u8~,
-        call_data: Span~u8~,
+        calldata: Span~u8~,
         value: u256,
     }
     ExecutionContext *-- CallContext