refactor: cleanup

Author: AlexD10S

Cargo.lock

@@ -24,16 +24,13 @@ ink_revive_types = { workspace = true, default-features = true }
 cargo_metadata = { workspace = true }
 contract-build = { workspace = true }
 funty = { workspace = true }
-impl-serde = { workspace = true }
 jsonrpsee = { workspace = true, features = ["ws-client"] }
 serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 scale = { workspace = true }
 subxt = { workspace = true }
-subxt-metadata = { workspace = true, optional = true }
 subxt-signer = { workspace = true, features = ["subxt", "sr25519", "unstable-eth"] }
 thiserror = { workspace = true }
 which = { workspace = true }
@@ -48,25 +45,19 @@ sp-weights = { workspace = true }
 regex = "1.11.2"
 itertools = "0.14.0"
 
-sp-io = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
-sp-runtime-interface = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_target_static_assertions"] }
-
 [dev-dependencies]
 # Required for the doctest of `MessageBuilder::call`
 scale-info = { workspace = true, features = ["derive"] }
 
 [features]
 default = [ "std" ]
 std = [
-	"impl-serde/std",
 	"scale-info/std",
 	"scale/std",
 	"serde/std",
 	"sp-core/std",
 	"sp-keyring/std",
 	"sp-runtime/std",
-    "sp-io/std",
-    "sp-runtime-interface/std",
 	"sp-weights/std",
 	"ink_e2e_macro/std",
 	"ink_revive_types/std",

crates/e2e/Cargo.toml

@@ -23,7 +23,6 @@ darling = { workspace = true }
 ink_ir = { workspace = true, default-features = true }
 derive_more = { workspace = true, features = ["from"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
-serde_json = { workspace = true }
 syn = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }

crates/e2e/macro/Cargo.toml

@@ -32,9 +32,7 @@ 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 = [

crates/sandbox/Cargo.toml

@@ -61,6 +61,15 @@ use ink_e2e::{
     keypair_to_account,
     log_error,
     salt,
+    subxt::{
+        self,
+        dynamic::Value,
+        tx::Payload,
+    },
+    subxt_signer::sr25519::{
+        Keypair,
+        dev,
+    },
 };
 use ink_env::{
     Environment,
@@ -90,22 +99,6 @@ use std::{
     marker::PhantomData,
     path::PathBuf,
 };
-pub use subxt::{
-    self,
-    backend::rpc::RpcClient,
-};
-use subxt::{
-    dynamic::Value,
-    tx::Payload,
-};
-pub use subxt_signer::{
-    self,
-    sr25519::{
-        self,
-        Keypair,
-        dev::*,
-    },
-};
 
 type BalanceOf<R> = <R as pallet_balances::Config>::Balance;
 type ContractsBalanceOf<R> =
@@ -143,14 +136,14 @@ where
         const TOKENS: u128 = 1_000_000_000_000_000;
 
         let accounts = [
-            subxt_signer::sr25519::dev::alice(),
-            subxt_signer::sr25519::dev::bob(),
-            subxt_signer::sr25519::dev::charlie(),
-            subxt_signer::sr25519::dev::dave(),
-            subxt_signer::sr25519::dev::eve(),
-            subxt_signer::sr25519::dev::ferdie(),
-            subxt_signer::sr25519::dev::one(),
-            subxt_signer::sr25519::dev::two(),
+            dev::alice(),
+            dev::bob(),
+            dev::charlie(),
+            dev::dave(),
+            dev::eve(),
+            dev::ferdie(),
+            dev::one(),
+            dev::two(),
         ]
         .map(|kp| kp.public_key().0)
         .map(From::from);