refactor: address some PR comments

Author: shekhirin

src/rpc/relay.rs

@@ -16,7 +16,7 @@ use crate::{
         Health, IERC20, IEscrow, IntentKind, Intents, Key, KeyHash, KeyType,
         MULTICHAIN_NONCE_PREFIX, MerkleLeafInfo,
         OrchestratorContract::IntentExecuted,
-        Quotes, SignedCall, SignedCalls, Transfer, VersionedContracts,
+        Quotes, SignedCall, SignedCalls, SimulateExecuteResult, Transfer, VersionedContracts,
         rpc::{
             AddFaucetFundsParameters, AddFaucetFundsResponse, AddressOrNative, Asset7811,
             AssetFilterItem, CallKey, CallReceipt, CallStatusCode, ChainCapabilities,
@@ -528,7 +528,7 @@ impl Relay {
         let calculate_asset_deficits = false;
 
         // Simulate the intent
-        let (_asset_deficits, asset_diffs, sim_result) = orchestrator
+        let SimulateExecuteResult { asset_deficits: _, asset_diffs, gas_results } = orchestrator
             .simulate_execute(
                 mock_from,
                 self.simulator(),
@@ -546,7 +546,7 @@ impl Relay {
         );
 
         let gas_estimate = GasEstimate::from_combined_gas(
-            sim_result.gCombined.to(),
+            gas_results.gCombined.to(),
             intrinsic_gas,
             &self.inner.quote_config,
         );

src/types/orchestrator.rs

@@ -195,7 +195,7 @@ impl<P: Provider> Orchestrator<P> {
         gas_validation_offset: U256,
         sim_mode: SimMode,
         calculate_asset_deficits: bool,
-    ) -> Result<(AssetDeficits, AssetDiffs, GasResults), RelayError> {
+    ) -> Result<SimulateExecuteResult, RelayError> {
         let result = SimulatorContract::new(
             simulator,
             self.orchestrator.provider(),
@@ -245,7 +245,7 @@ impl<P: Provider> Orchestrator<P> {
             asset_diffs.remove_payer_fee(payer, intent.payment_token().into(), U256::from(1));
         }
 
-        Ok((asset_deficits, asset_diffs, result.gas))
+        Ok(SimulateExecuteResult { asset_deficits, asset_diffs, gas_results: result.gas })
     }
 
     /// Call `Orchestrator.execute` with the provided [`Intent`].
@@ -310,3 +310,14 @@ impl IntentExecuted {
         self.err != ORCHESTRATOR_NO_ERROR
     }
 }
+
+/// Result of [`Orchestrator::simulate_execute`] based on simulated execution.
+#[derive(Debug)]
+pub struct SimulateExecuteResult {
+    /// Asset deficits per account and asset.
+    pub asset_deficits: AssetDeficits,
+    /// Asset differences per account and asset.
+    pub asset_diffs: AssetDiffs,
+    /// Gas usage.
+    pub gas_results: GasResults,
+}

src/types/simulation_assets.rs

@@ -98,9 +98,9 @@ pub struct FiatValue {
     pub value: f64,
 }
 
-/// Asset deficits per account based on simulated execution logs.
+/// Asset deficits per account based on simulated execution traces.
 #[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
-pub struct AssetDeficits(pub Vec<(Address, Vec<AssetDeficit>)>);
+pub struct AssetDeficits(pub HashMap<Address, Vec<AssetDeficit>>);
 
 impl AssetDeficits {
     /// Creates a new builder for asset deficits.