From 5fcb1f0dce4962b0b6253078daa2ef01691b8de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= <piomiko41@gmail.com>
Date: Fri, 25 Aug 2023 17:46:28 +0200
Subject: [PATCH 1/3] Add new method to trait and implementation for sandbox

---
 drink/src/chain_api.rs | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/drink/src/chain_api.rs b/drink/src/chain_api.rs
index bf8829e..1a5c057 100644
--- a/drink/src/chain_api.rs
+++ b/drink/src/chain_api.rs
@@ -1,11 +1,16 @@
 //! Basic chain API.
 
+use frame_support::dispatch::Dispatchable;
+use frame_support::sp_runtime::DispatchResultWithInfo;
 use frame_support::{sp_runtime::AccountId32, traits::tokens::currency::Currency};
 
 use crate::{DrinkResult, Error, Runtime, Sandbox};
 
+/// The runtime call type for a particular runtime.
+pub type RuntimeCall<R> = <R as frame_system::Config>::RuntimeCall;
+
 /// Interface for basic chain operations.
-pub trait ChainApi {
+pub trait ChainApi<R: Runtime> {
     /// Return the current height of the chain.
     fn current_height(&mut self) -> u64;
 
@@ -46,9 +51,20 @@ pub trait ChainApi {
     ///
     /// * `action` - The action to run.
     fn dry_run<T>(&mut self, action: impl FnOnce(&mut Self) -> T) -> T;
+
+    /// Execute a runtime call (dispatchable).
+    ///
+    /// # Arguments
+    ///
+    /// * `call` - The runtime call to execute.
+    fn runtime_call(
+        &mut self,
+        call: RuntimeCall<R>,
+        origin: <RuntimeCall<R> as Dispatchable>::RuntimeOrigin,
+    ) -> DispatchResultWithInfo<<RuntimeCall<R> as Dispatchable>::PostInfo>;
 }
 
-impl<R: Runtime> ChainApi for Sandbox<R> {
+impl<R: Runtime> ChainApi<R> for Sandbox<R> {
     fn current_height(&mut self) -> u64 {
         self.externalities
             .execute_with(|| frame_system::Pallet::<R>::block_number())
@@ -90,6 +106,14 @@ impl<R: Runtime> ChainApi for Sandbox<R> {
 
         result
     }
+
+    fn runtime_call(
+        &mut self,
+        call: RuntimeCall<R>,
+        origin: <RuntimeCall<R> as Dispatchable>::RuntimeOrigin,
+    ) -> DispatchResultWithInfo<<RuntimeCall<R> as Dispatchable>::PostInfo> {
+        self.externalities.execute_with(|| call.dispatch(origin))
+    }
 }
 
 #[cfg(test)]

From 63217450f66d3db3044ec734533b57b6bd6461ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= <piomiko41@gmail.com>
Date: Fri, 25 Aug 2023 18:11:47 +0200
Subject: [PATCH 2/3] Add test

---
 drink/src/chain_api.rs | 25 +++++++++++++++++++++++--
 drink/src/session.rs   |  2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/drink/src/chain_api.rs b/drink/src/chain_api.rs
index 1a5c057..7c40376 100644
--- a/drink/src/chain_api.rs
+++ b/drink/src/chain_api.rs
@@ -118,8 +118,8 @@ impl<R: Runtime> ChainApi<R> for Sandbox<R> {
 
 #[cfg(test)]
 mod tests {
-    use crate::chain_api::ChainApi;
-    use crate::{runtime::MinimalRuntime, Sandbox, DEFAULT_ACTOR};
+    use crate::chain_api::{ChainApi, RuntimeCall};
+    use crate::{runtime::MinimalRuntime, AccountId32, Sandbox, DEFAULT_ACTOR};
 
     #[test]
     fn dry_run_works() {
@@ -133,4 +133,25 @@ mod tests {
 
         assert_eq!(sandbox.balance(&DEFAULT_ACTOR), initial_balance);
     }
+
+    #[test]
+    fn runtime_call_works() {
+        let mut sandbox = Sandbox::<MinimalRuntime>::new().expect("Failed to create sandbox");
+
+        const RECIPIENT: AccountId32 = AccountId32::new([2u8; 32]);
+        assert_ne!(DEFAULT_ACTOR, RECIPIENT);
+        let initial_balance = sandbox.balance(&RECIPIENT);
+
+        let call = RuntimeCall::<MinimalRuntime>::Balances(
+            pallet_balances::Call::<MinimalRuntime>::transfer {
+                dest: RECIPIENT,
+                value: 100,
+            },
+        );
+        let result = sandbox.runtime_call(call, Some(DEFAULT_ACTOR).into());
+        assert!(result.is_ok());
+
+        let expected_balance = initial_balance + 100;
+        assert_eq!(sandbox.balance(&RECIPIENT), expected_balance);
+    }
 }
diff --git a/drink/src/session.rs b/drink/src/session.rs
index 76dca03..203a4c6 100644
--- a/drink/src/session.rs
+++ b/drink/src/session.rs
@@ -164,7 +164,7 @@ impl<R: Runtime> Session<R> {
     }
 
     /// Returns a reference for basic chain API.
-    pub fn chain_api(&mut self) -> &mut impl ChainApi {
+    pub fn chain_api(&mut self) -> &mut impl ChainApi<R> {
         &mut self.sandbox
     }
 

From bca2fa20abacd17dfc0b93070e5c29ab9b84e2db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= <piomiko41@gmail.com>
Date: Mon, 28 Aug 2023 12:36:35 +0200
Subject: [PATCH 3/3] Missing arg doc

---
 drink/src/chain_api.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drink/src/chain_api.rs b/drink/src/chain_api.rs
index 7c40376..3452f6c 100644
--- a/drink/src/chain_api.rs
+++ b/drink/src/chain_api.rs
@@ -57,6 +57,7 @@ pub trait ChainApi<R: Runtime> {
     /// # Arguments
     ///
     /// * `call` - The runtime call to execute.
+    /// * `origin` - The origin of the call.
     fn runtime_call(
         &mut self,
         call: RuntimeCall<R>,