Use SingleSegmentResponse from blockifier (#3663)

Related #3658

commit-id:9aa72e2d

---

**Stack**:
- #3672
- #3664
- #3663 ⬅


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*

Author: ddoktorski

crates/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/execution/cheated_syscalls.rs

@@ -7,15 +7,12 @@ use blockifier::execution::syscalls::hint_processor::{
 };
 use blockifier::execution::syscalls::syscall_base::SyscallResult;
 use blockifier::execution::syscalls::vm_syscall_utils::{
-    CallContractRequest, DeployRequest, DeployResponse, EmptyRequest, GetBlockHashRequest,
-    GetBlockHashResponse, GetExecutionInfoResponse, LibraryCallRequest, StorageReadRequest,
-    StorageReadResponse, StorageWriteRequest, StorageWriteResponse, SyscallResponse,
-    SyscallSelector, WriteResponseResult,
+    CallContractRequest, CallContractResponse, DeployRequest, DeployResponse, EmptyRequest,
+    GetBlockHashRequest, GetBlockHashResponse, GetExecutionInfoResponse, LibraryCallRequest,
+    LibraryCallResponse, StorageReadRequest, StorageReadResponse, StorageWriteRequest,
+    StorageWriteResponse, SyscallSelector,
 };
 use blockifier::execution::{call_info::CallInfo, entry_point::ConstructorContext};
-use blockifier::execution::{
-    execution_utils::ReadOnlySegment, syscalls::hint_processor::write_segment,
-};
 use blockifier::state::errors::StateError;
 use blockifier::{
     execution::entry_point::{
@@ -27,7 +24,6 @@ use blockifier::{
     execution::execution_utils::update_remaining_gas,
     execution::syscalls::hint_processor::create_retdata_segment,
 };
-use cairo_vm::types::relocatable::Relocatable;
 use cairo_vm::vm::vm_core::VirtualMachine;
 use conversions::string::TryFromHexStr;
 use runtime::starknet::constants::TEST_ADDRESS;
@@ -156,7 +152,7 @@ pub fn library_call_syscall(
     syscall_handler: &mut SyscallHintProcessor<'_>,
     cheatnet_state: &mut CheatnetState,
     remaining_gas: &mut u64,
-) -> SyscallResult<SingleSegmentResponse> {
+) -> SyscallResult<LibraryCallResponse> {
     let call_to_external = true;
     let retdata_segment = execute_library_call(
         syscall_handler,
@@ -177,7 +173,7 @@ pub fn library_call_syscall(
         ),
     })?;
 
-    Ok(SingleSegmentResponse {
+    Ok(LibraryCallResponse {
         segment: retdata_segment,
     })
 }
@@ -190,7 +186,7 @@ pub fn call_contract_syscall(
     syscall_handler: &mut SyscallHintProcessor<'_>,
     cheatnet_state: &mut CheatnetState,
     remaining_gas: &mut u64,
-) -> SyscallResult<SingleSegmentResponse> {
+) -> SyscallResult<CallContractResponse> {
     let storage_address = request.contract_address;
     let class_hash = syscall_handler
         .base
@@ -222,7 +218,7 @@ pub fn call_contract_syscall(
     })?;
 
     // region: Modified blockifier code
-    Ok(SingleSegmentResponse {
+    Ok(CallContractResponse {
         segment: retdata_segment,
     })
     // endregion
@@ -331,17 +327,3 @@ fn maybe_modify_storage_address(
 
     Ok(())
 }
-
-#[derive(Debug)]
-// crates/blockifier/src/execution/syscalls/mod.rs:127 (SingleSegmentResponse)
-// It is created here because fields in the original structure are private
-// so we cannot create it in call_contract_syscall
-pub struct SingleSegmentResponse {
-    pub segment: ReadOnlySegment,
-}
-// crates/blockifier/src/execution/syscalls/mod.rs:131 (SyscallResponse for SingleSegmentResponse)
-impl SyscallResponse for SingleSegmentResponse {
-    fn write(self, vm: &mut VirtualMachine, ptr: &mut Relocatable) -> WriteResponseResult {
-        write_segment(vm, ptr, self.segment)
-    }
-}

crates/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/mod.rs

@@ -5,7 +5,8 @@ use blockifier::execution::execution_utils::felt_from_ptr;
 use blockifier::execution::syscalls::hint_processor::SyscallHintProcessor;
 use blockifier::execution::syscalls::syscall_executor::SyscallExecutor;
 use blockifier::execution::syscalls::vm_syscall_utils::{
-    CallContractRequest, LibraryCallRequest, RevertData, SyscallRequestWrapper, SyscallSelector,
+    CallContractRequest, LibraryCallRequest, RevertData, SingleSegmentResponse,
+    SyscallRequestWrapper, SyscallSelector,
 };
 use blockifier::execution::{
     execution_utils::ReadOnlySegment,
@@ -22,9 +23,8 @@ use crate::state::CheatnetState;
 use crate::runtime_extensions::call_to_blockifier_runtime_extension::rpc::{
     AddressOrClassHash, call_entry_point,
 };
-use crate::runtime_extensions::call_to_blockifier_runtime_extension::{
-    execution::cheated_syscalls::SingleSegmentResponse,
-    rpc::{CallFailure, CallResult},
+use crate::runtime_extensions::call_to_blockifier_runtime_extension::rpc::{
+    CallFailure, CallResult,
 };
 
 use super::cheatable_starknet_runtime_extension::CheatableStarknetRuntime;