Fixup merge

inkdevhub · Mar 6, 2024 · eee00ad · eee00ad
1 parent 83d2d43
commit eee00ad
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 62 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/drink/src/lib.rs b/drink/src/lib.rs
@@ -21,7 +21,10 @@ use frame_system::EventRecord;
 #[cfg(feature = "session")]
 pub use session::mock::{mock_message, ContractMock, MessageMock, MockedCallResult, Selector};
 /// Export pallets that are used in the minimal runtime.
-pub use {frame_support, frame_system, pallet_balances, pallet_contracts, pallet_timestamp};
+pub use {
+    frame_support, frame_system, pallet_balances, pallet_contracts, pallet_timestamp, paste,
+    sp_externalities::Extension, sp_io::TestExternalities,
+};
 
 pub use crate::runtime::minimal::{self, MinimalSandbox};
 

diff --git a/drink/src/runtime/minimal.rs b/drink/src/runtime/minimal.rs
@@ -68,7 +68,7 @@ impl<
 /// Macro creating a minimal runtime with the given name. Optionally can take a chain extension
 /// type as a second argument.
 ///
-/// The new macro will automatically implement `drink::SandboxConfig`.
+/// The new macro will automatically implement `drink::Sandbox`.
 #[macro_export]
 macro_rules! create_minimal_sandbox {
     ($name:ident) => {

diff --git a/drink/src/sandbox/sandbox_config.rs b/drink/src/sandbox/sandbox_config.rs
diff --git a/drink/src/session.rs b/drink/src/session.rs
@@ -37,8 +37,7 @@ use error::SessionError;
 
 use self::mocking_api::MockingApi;
 use crate::{
-    errors::MessageResult, minimal::MinimalSandboxRuntime, runtime::MinimalRuntime,
-    session::transcoding::TranscoderRegistry,
+    errors::MessageResult, minimal::MinimalSandboxRuntime, session::transcoding::TranscoderRegistry,
 };
 
 type BalanceOf<R> =

diff --git a/drink/src/session/mocking_api.rs b/drink/src/session/mocking_api.rs
@@ -1,8 +1,7 @@
 //! Mocking API for the sandbox.
 use super::Session;
 use crate::{
-    runtime::AccountIdFor, sandbox::prelude::*, session::mock::ContractMock, SandboxConfig,
-    DEFAULT_GAS_LIMIT,
+    runtime::AccountIdFor, sandbox::prelude::*, session::mock::ContractMock, DEFAULT_GAS_LIMIT,
 };
 
 /// Interface for basic mocking operations.

diff --git a/examples/chain-extension/Cargo.lock b/examples/chain-extension/Cargo.lock