Test signed commit

Author: pityjllk

core/src/engine/inspector.rs

@@ -1,4 +1,6 @@
-use crate::{Deadline, Nonce, events::DefuseEvent};
+use std::{cell::RefCell, rc::Rc};
+
+use crate::{Deadline, EventSink, Nonce, accounts::{AccountEvent, NonceEvent}, events::DefuseEvent, intents::IntentEvent};
 use impl_tools::autoimpl;
 use near_sdk::{AccountIdRef, CryptoHash};
 
@@ -10,3 +12,47 @@ pub trait Inspector {
 
     fn on_intent_executed(&mut self, signer_id: &AccountIdRef, hash: CryptoHash, nonce: Nonce);
 }
+
+pub struct InspectorImpl {
+    pub intents_executed: Vec<IntentEvent<AccountEvent<'static, NonceEvent>>>,
+    event_sink: Rc<RefCell<EventSink>>,
+    pub min_deadline: Deadline,
+}
+
+impl InspectorImpl {
+    pub fn new(event_sink: Rc<RefCell<EventSink>>) -> Self {
+        Self {
+            intents_executed: Vec::new(),
+            min_deadline: Deadline::MAX,
+            event_sink,
+        }
+    }
+
+    pub fn get_events(&self) -> Vec<DefuseEvent<'static>> {
+        self.event_sink.borrow().recorded_events().into_iter().cloned().collect()
+    }
+}
+
+impl Inspector for InspectorImpl {
+    #[inline]
+    fn on_deadline(&mut self, deadline: Deadline) {
+        self.min_deadline = self.min_deadline.min(deadline);
+    }
+
+    fn on_event(&mut self, event: DefuseEvent<'_>) {
+        self.event_sink.borrow_mut().consume_event(event.into_static());
+    }
+
+    #[inline]
+    fn on_intent_executed(
+        &mut self,
+        signer_id: &AccountIdRef,
+        intent_hash: CryptoHash,
+        nonce: Nonce,
+    ) {
+        self.intents_executed.push(IntentEvent::new(
+            AccountEvent::new(signer_id.to_owned(), NonceEvent::new(nonce)),
+            intent_hash,
+        ));
+    }
+}

defuse/src/contract/intents/execute.rs

@@ -1,22 +1,19 @@
 mod auth_call;
-mod execute;
 mod relayer;
-mod simulate;
 mod state;
 
 use std::rc::Rc;
 
 use defuse_core::{
     DefuseError,
-    engine::{Engine, ExecuteIntentsResult, StateView},
+    engine::{Engine, ExecuteIntentsResult, InspectorImpl, StateView},
     events::DefuseEvent,
     payload::multi::MultiPayload,
 };
 use defuse_near_utils::UnwrapOrPanic;
 use defuse_nep245::MtEvent;
 use near_plugins::{Pausable, pause};
 use near_sdk::{FunctionError, near};
-use simulate::{GeneralInspector};
 
 use crate::intents::{Intents, SimulationOutput, StateOutput};
 
@@ -28,7 +25,7 @@ impl Intents for Contract {
     #[inline]
     fn execute_intents(&mut self, signed: Vec<MultiPayload>) {
         let sink = Rc::clone(&self.event_sink);
-        let mut inspector = GeneralInspector::new(sink);
+        let mut inspector = InspectorImpl::new(sink);
         let ExecuteIntentsResult {
             transfers,
             ..
@@ -48,7 +45,7 @@ impl Intents for Contract {
     #[inline]
     fn simulate_intents(&self, signed: Vec<MultiPayload>) -> SimulationOutput {
         let sink = Rc::clone(&self.event_sink);
-        let mut inspector = GeneralInspector::new(sink);
+        let mut inspector = InspectorImpl::new(sink);
         let engine = Engine::new(self.cached(), &mut inspector);
         let result = engine.execute_signed_intents(signed);
 

defuse/src/contract/intents/mod.rs

@@ -2,6 +2,7 @@ use super::TokenId;
 use derive_more::derive::From;
 use near_sdk::{AccountIdRef, json_types::U128, near, serde::Deserialize};
 use std::borrow::Cow;
+use near_sdk::env::log_str;
 
 #[must_use = "make sure to `.emit()` this event"]
 #[near(event_json(standard = "nep245"))]