diff --git a/Cargo.lock b/Cargo.lock index 41652b6..eb9600b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1565,9 +1565,9 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "30.0.2" +version = "30.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4662a809f559aea6234bd90940fa29df583a3c8124a3cf923f66a0d21126b7" +checksum = "fd94af68373e179c32c360b3c280497a9cf0f45a4f47f0ee6539a6c6c9cf2343" dependencies = [ "Inflector", "cfg-expr", diff --git a/drink/src/lib.rs b/drink/src/lib.rs index 1ebfab8..0d66ecf 100644 --- a/drink/src/lib.rs +++ b/drink/src/lib.rs @@ -14,9 +14,9 @@ pub use drink_test_macro::{contract_bundle_provider, test}; pub use errors::Error; pub use frame_support; pub use ink_sandbox::{ - self, api as sandbox_api, create_sandbox, create_sandbox_with_runtime, pallet_balances, - pallet_contracts, pallet_timestamp, sp_externalities, AccountId32, DispatchError, Sandbox, - Ss58Codec, Weight, + self, api as sandbox_api, create_sandbox, create_sandbox_with_runtime, impl_sandbox, + pallet_balances, pallet_contracts, pallet_timestamp, sp_externalities, AccountId32, + DispatchError, Sandbox, Ss58Codec, Weight, }; #[cfg(feature = "session")] pub use session::mock::{mock_message, ContractMock, MessageMock, MockedCallResult, Selector}; diff --git a/ink-sandbox/src/macros.rs b/ink-sandbox/src/macros.rs index 14db449..aeb00bb 100644 --- a/ink-sandbox/src/macros.rs +++ b/ink-sandbox/src/macros.rs @@ -65,7 +65,7 @@ impl< #[macro_export] macro_rules! impl_sandbox { - ($sandbox:ident, $runtime:ident, $block_builder:ident) => { + ($sandbox:ident, $runtime:ident, $block_builder:ident, $default_account:ident) => { impl $crate::Sandbox for $sandbox { type Runtime = $runtime; @@ -104,7 +104,7 @@ macro_rules! impl_sandbox { } fn default_actor() -> $crate::AccountIdFor { - DEFAULT_ACCOUNT + $default_account } fn get_metadata() -> $crate::RuntimeMetadataPrefixed { @@ -144,7 +144,7 @@ macro_rules! create_sandbox { } } - $crate::impl_sandbox!($sandbox, $runtime, BlockBuilder); + $crate::impl_sandbox!($sandbox, $runtime, BlockBuilder, DEFAULT_ACCOUNT); }; }