refactor: sandbox_client in sandbox crate

Author: AlexD10S

Cargo.lock

@@ -15,12 +15,10 @@ categories.workspace = true
 include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"]
 
 [dependencies]
-ink_e2e_macro = { workspace = true, default-features = true }
 ink = { workspace = true, default-features = true }
 ink_env = { workspace = true, default-features = true }
 ink_primitives = { workspace = true, default-features = true }
 ink_revive_types = { workspace = true, default-features = true }
-ink_sandbox = { version = "=6.0.0-alpha.4", path = "../sandbox", optional = true }
 
 cargo_metadata = { workspace = true }
 contract-build = { workspace = true }
@@ -60,7 +58,6 @@ scale-info = { workspace = true, features = ["derive"] }
 default = [ "std" ]
 std = [
 	"impl-serde/std",
-	"ink_e2e_macro/std",
 	"scale-info/std",
 	"scale/std",
 	"serde/std",
@@ -70,14 +67,6 @@ std = [
     "sp-io/std",
     "sp-runtime-interface/std",
 	"sp-weights/std",
-	"ink_e2e_macro/std",
 	"ink_revive_types/std",
-	"ink_sandbox?/std",
 	"frame-support/std",
 ]
-
-sandbox = [
-    "dep:ink_sandbox",
-    "dep:subxt-metadata",
-    "ink_e2e_macro/sandbox",
-]

crates/e2e/Cargo.toml

@@ -31,9 +31,8 @@ tracing = { workspace = true }
 
 [dev-dependencies]
 ink = { path = "../../ink" }
-ink_e2e = { path = "../", features = ["sandbox"] }
+ink_e2e = { path = "../" }
 temp-env = "0.3.6"
 
 [features]
-std = ["derive_more/std"]
-sandbox = []
+std = ["derive_more/std"]

crates/e2e/macro/Cargo.toml

@@ -78,7 +78,6 @@ impl InkE2ETest {
             Backend::Node(node_config) => {
                 build_full_client(&environment, exec_build_contracts, node_config)
             }
-            #[cfg(any(test, feature = "sandbox"))]
             Backend::RuntimeOnly(runtime) => {
                 build_runtime_client(exec_build_contracts, runtime.into())
             }
@@ -170,7 +169,6 @@ fn build_full_client(
     }
 }
 
-#[cfg(any(test, feature = "sandbox"))]
 fn build_runtime_client(contracts: TokenStream2, runtime: syn::Path) -> TokenStream2 {
     quote! {
         let contracts = #contracts;

crates/e2e/macro/src/codegen.rs

@@ -24,7 +24,6 @@ pub enum Backend {
     ///
     /// This runs a runtime emulator within `TestExternalities`
     /// the same process as the test.
-    #[cfg(any(test, feature = "sandbox"))]
     RuntimeOnly(RuntimeOnly),
 }
 
@@ -64,7 +63,6 @@ impl Node {
 }
 
 /// The runtime emulator that should be used within `TestExternalities`
-#[cfg(any(test, feature = "sandbox"))]
 #[derive(Clone, Eq, PartialEq, Debug, darling::FromMeta)]
 pub enum RuntimeOnly {
     #[darling(word)]
@@ -73,7 +71,6 @@ pub enum RuntimeOnly {
     Sandbox(syn::Path),
 }
 
-#[cfg(any(test, feature = "sandbox"))]
 impl From<RuntimeOnly> for syn::Path {
     fn from(value: RuntimeOnly) -> Self {
         match value {

crates/e2e/macro/src/config.rs

@@ -70,29 +70,3 @@ where
         <Self as fmt::Debug>::fmt(self, f)
     }
 }
-
-/// Dummy error type for sandbox_client
-#[derive(Debug, thiserror::Error)]
-pub struct SandboxErr {
-    msg: String,
-}
-
-impl SandboxErr {
-    /// Create a new `SandboxErr` with the given message.
-    #[allow(dead_code)]
-    pub fn new(msg: String) -> Self {
-        Self { msg }
-    }
-}
-
-impl From<String> for SandboxErr {
-    fn from(msg: String) -> Self {
-        Self { msg }
-    }
-}
-
-impl fmt::Display for SandboxErr {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "SandboxErr: {}", self.msg)
-    }
-}

crates/e2e/src/error.rs

@@ -28,8 +28,6 @@ mod contract_results;
 mod error;
 pub mod events;
 mod node_proc;
-#[cfg(feature = "sandbox")]
-mod sandbox_client;
 mod subxt_client;
 mod xts;
 
@@ -44,25 +42,30 @@ pub use backend_calls::{
     CallBuilder,
     InstantiateBuilder,
 };
-pub use client_utils::ContractsRegistry;
+pub use builders::{
+    CreateBuilderPartial,
+    constructor_exec_input,
+};
+pub use client_utils::{
+    ContractsRegistry,
+    code_hash,
+    salt,
+};
 pub use contract_results::{
+    BareInstantiationResult,
     CallDryRunResult,
     CallResult,
+    ContractExecResultFor,
+    ContractResult,
     InstantiateDryRunResult,
     InstantiationResult,
     UploadResult,
 };
-pub use ink_e2e_macro::test;
 pub use ink_revive_types::evm::CallTrace;
 pub use node_proc::{
     TestNodeProcess,
     TestNodeProcessBuilder,
 };
-#[cfg(feature = "sandbox")]
-pub use sandbox_client::{
-    Client as SandboxClient,
-    preset,
-};
 pub use sp_keyring::Sr25519Keyring;
 pub use subxt::{
     self,
@@ -85,9 +88,6 @@ pub use tokio;
 pub use tracing;
 pub use tracing_subscriber;
 
-#[cfg(feature = "sandbox")]
-pub use ink_sandbox::DefaultSandbox;
-
 use ink::codegen::ContractCallBuilder;
 use ink_env::{
     ContractEnv,

crates/e2e/src/lib.rs

@@ -24,9 +24,17 @@ sp-runtime = { workspace = true }
 sp-io = { workspace = true }
 ink_primitives = { workspace = true }
 ink_revive_types = { workspace = true }
+ink_env = { workspace = true, default-features = true }
+ink_e2e = { path = "../e2e" }
+ink_e2e_macro = { workspace = true, default-features = true }
 
+jsonrpsee = { workspace = true, features = ["ws-client"] }
+thiserror = { workspace = true }
 paste = { workspace = true }
 scale-info = { workspace = true }
+subxt = { workspace = true }
+subxt-metadata = { workspace = true }
+subxt-signer = { workspace = true, features = ["subxt", "sr25519", "unstable-eth"] }
 
 [features]
 default = [
@@ -46,5 +54,6 @@ std = [
 	"scale-info/std",
 	"sp-core/std",
 	"sp-externalities/std",
-	"sp-io/std"
+	"sp-io/std",
+	"ink_e2e_macro/std",
 ]