Changelog, merge conflicts

CHANGELOG.md

@@ -7,11 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.12.0]
+## [0.12.1]
 
-### Pull requests
+### Added
 
-- https://github.com/inkdevhub/drink/pull/110
+- Support dry running contract interactions
+
+## [0.12.0]
 
 ### Changed
 
@@ -20,20 +22,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.11.1]
 
-### Pull requests
-
-- https://github.com/inkdevhub/drink/pull/104
-
 ### Added
 
 - Respect features for the contract dependencies when building contracts via drink macros
 
 ## [0.11.0]
 
-### Pull requests
-
-- https://github.com/inkdevhub/drink/pull/109
-
 ### Changed
 
 - Support `[email protected]`
@@ -43,11 +37,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.10.0]
 
-### Pull requests
-
-- https://github.com/inkdevhub/drink/pull/100
-- https://github.com/inkdevhub/drink/pull/101
-
 ### Changed
 
 - Update toolchain to `1.74.0`
@@ -56,20 +45,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.9.0]
 
-### Pull requests
-
-- https://github.com/inkdevhub/drink/pull/99
-
 ### Changed
 
 - Rework `Sandbox` API to ease working with custom runtimes
 
 ## [0.8.7]
 
-### Pull requests
-
-- https://github.com/inkdevhub/drink/pull/112
-
 ### Changed
 
 - Migrate examples back to `[email protected]`
@@ -82,33 +63,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.8.6] [YANKED]
 
-### Pull requests
-
-- https://github.com/inkdevhub/drink/pull/92
-- https://github.com/inkdevhub/drink/pull/94
-
 ### Added
 
 - Accessing events emitted by contracts
 - `#[drink::test]` creates and adds a `session: Session` argument to the test function
 
 ## [0.8.5] [YANKED]
 
-### Pull requests
-
-- https://github.com/inkdevhub/drink/pull/91
-
 ### Changed
 
 - Update `contract-*` crates from `3.x.x` to `4.0.0-rc.1`
 - Migrate examples from `[email protected]` to `[email protected]`
 
 ## [0.8.4]
 
-### Pull requests
-
-- https://github.com/inkdevhub/drink/pull/90
-
 ### Added
 
 - `NO_SALT`, `NO_ENDOWMENT` contstants added

drink/src/lib.rs

@@ -19,12 +19,14 @@ pub use frame_support::{
     weights::Weight,
 };
 use frame_system::EventRecord;
+use pallet_contracts::{ContractExecResult, ContractInstantiateResult};
 #[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 crate::runtime::minimal::{self, MinimalRuntime};
+use crate::runtime::AccountIdFor;
 
 /// Alias for `frame-system`'s `RuntimeCall` type.
 pub type RuntimeCall<Runtime> = <Runtime as frame_system::Config>::RuntimeCall;

drink/src/session.rs

@@ -23,7 +23,7 @@ use crate::{
     },
     sandbox::SandboxConfig,
     session::mock::MockRegistry,
-    Sandbox, DEFAULT_GAS_LIMIT,
+    ContractExecResultFor, ContractInstantiateResultFor, Sandbox, DEFAULT_GAS_LIMIT,
 };
 
 pub mod mock;
@@ -35,12 +35,8 @@ mod record;
 mod transcoding;
 
 pub use bundle::ContractBundle;
-use error::SessionError;
 
-use self::mocking_api::MockingApi;
-use crate::{
-    errors::MessageResult, runtime::MinimalRuntime, session::transcoding::TranscoderRegistry,
-};
+use crate::{errors::MessageResult, session::transcoding::TranscoderRegistry};
 
 type BalanceOf<R> =
     <<R as pallet_contracts::Config>::Currency as Inspect<AccountIdFor<R>>>::Balance;