Skip to content

Commit f9e47f1

Browse files
AlexD10SAlexD10S
committed
fix: clean up dependencies
1 parent 4ce9a14 commit f9e47f1

File tree

10 files changed

+22
-25
lines changed

10 files changed

+22
-25
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/sandbox/Cargo.toml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ pallet-balances = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "
1818
pallet-revive = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
1919
pallet-timestamp = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
2020
scale = { workspace = true }
21-
sp-core = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
21+
sp-core = { workspace = true, default-features = false }
2222
sp-externalities = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
23-
sp-runtime = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
24-
sp-io = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
25-
sp-runtime-cratesio = { package = "sp-runtime", version = "43.0.0", default-features = false }
23+
sp-runtime = { version = "43.0.0", default-features = false }
24+
sp-io = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
2625

2726
ink_primitives = { workspace = true }
2827
ink_revive_types = { workspace = true }

‎crates/sandbox/src/client.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ use sp_core::{
9595
sr25519::Pair,
9696
};
9797
use sp_runtime::traits::Bounded;
98-
use sp_runtime_cratesio as sp_runtime_v43;
9998
use std::{
10099
marker::PhantomData,
101100
path::PathBuf,
@@ -349,7 +348,7 @@ where
349348
data,
350349
salt(),
351350
caller_to_origin::<S>(caller),
352-
sp_runtime::Weight::from_parts(
351+
pallet_revive::Weight::from_parts(
353352
gas_limit.ref_time(),
354353
gas_limit.proof_size(),
355354
),
@@ -459,7 +458,7 @@ where
459458
storage_deposit: to_revive_storage_deposit(dry_run_result.storage_deposit),
460459
result: dry_run_result
461460
.result
462-
.map_err(|_e| sp_runtime_v43::DispatchError::Other("SandboxError"))
461+
.map_err(|_e| sp_runtime::DispatchError::Other("SandboxError"))
463462
.map(|res| {
464463
InstantiateReturnValue {
465464
result: ExecReturnValue {
@@ -567,7 +566,7 @@ where
567566
value,
568567
input_data,
569568
caller_to_origin::<S>(signer),
570-
sp_runtime::Weight::from_parts(
569+
pallet_revive::Weight::from_parts(
571570
gas_limit.ref_time(),
572571
gas_limit.proof_size(),
573572
),
@@ -660,7 +659,7 @@ where
660659
storage_deposit: to_revive_storage_deposit(result.storage_deposit),
661660
result: result
662661
.result
663-
.map_err(|_e| sp_runtime_v43::DispatchError::Other("SandboxError"))
662+
.map_err(|_e| sp_runtime::DispatchError::Other("SandboxError"))
664663
.map(|res| {
665664
ExecReturnValue {
666665
flags: res.flags,

‎integration-tests/internal/e2e-runtime-only-backend/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ edition = "2024"
66
publish = false
77

88
[dependencies]
9-
ink = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4", default-features = false }
9+
ink = { path = "../../../crates/ink", default-features = false }
1010

1111
[dev-dependencies]
12-
ink_e2e = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4" }
12+
ink_e2e = { path = "../../../crates/e2e" }
1313
ink_sandbox = { path = "../../../crates/sandbox" }
1414

1515
[lib]

‎integration-tests/public/contract-transfer/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ edition = "2024"
66
publish = false
77

88
[dependencies]
9-
ink = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4", default-features = false }
9+
ink = { path = "../../../crates/ink", default-features = false }
1010

1111
[dev-dependencies]
12-
ink_e2e = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4" }
12+
ink_e2e = { path = "../../../crates/e2e"}
1313
ink_sandbox = { path = "../../../crates/sandbox" }
1414

1515
[lib]

‎integration-tests/public/contract-xcm/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ edition = "2024"
66
publish = false
77

88
[dependencies]
9-
ink = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4", default-features = false, features = ["unstable-hostfn"] }
9+
ink = { path = "../../../crates/ink", default-features = false, features = ["unstable-hostfn"] }
1010
frame-support = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
1111
pallet-balances = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
1212

1313
[dev-dependencies]
14-
ink_e2e = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4" }
14+
ink_e2e = { path = "../../../crates/e2e" }
1515
ink_sandbox = { path = "../../../crates/sandbox" }
1616

1717
[lib]

‎integration-tests/public/fuzz-testing/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ edition = "2024"
66
publish = false
77

88
[dependencies]
9-
ink = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4", default-features = false }
9+
ink = { path = "../../../crates/ink", default-features = false }
1010

1111
[dev-dependencies]
12-
ink_e2e = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4"}
12+
ink_e2e = { path = "../../../crates/e2e" }
1313
ink_sandbox = { path = "../../../crates/sandbox" }
1414

1515
# for fuzz testing

‎integration-tests/public/runtime-call-contract/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ frame-support = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a7
1515
frame-system = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
1616
pallet-balances = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
1717
pallet-revive = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
18-
sp-runtime = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
18+
sp-runtime = { version = "43.0.0", default-features = false }
1919

2020
# todo
2121
codec = { package = "parity-scale-codec", version = "3.7.4", default-features = false }
@@ -33,7 +33,7 @@ ink = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4", default-
3333
flipper-traits = { path = "traits", default-features = false }
3434

3535
[dev-dependencies]
36-
ink_e2e = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4" }
36+
ink_e2e = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4"}
3737
ink_sandbox = { path = "../../../crates/sandbox" }
3838
sandbox-runtime = { path = "sandbox-runtime", default-features = false }
3939
scale-value = "0.18.0"

‎integration-tests/solidity-abi/sol-cross-contract/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ edition = "2024"
66
publish = false
77

88
[dependencies]
9-
ink = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4", default-features = false }
9+
ink = { path = "../../../crates/ink", default-features = false }
1010
sha3 = { version = "0.10", default-features = false }
1111

1212
[dev-dependencies]
13-
ink_e2e = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4" }
13+
ink_e2e = { path = "../../../crates/e2e" }
1414
ink_sandbox = { path = "../../../crates/sandbox" }
1515
ink_revive_types = { path = "../../../crates/revive-types" }
1616
sha3 = { version = "0.10" }

‎integration-tests/solidity-abi/sol-encoding/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ edition = "2024"
66
publish = false
77

88
[dependencies]
9-
ink = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4", default-features = false }
9+
ink = { path = "../../../crates/ink", default-features = false }
1010

1111
[dev-dependencies]
12-
ink_e2e = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4" }
12+
ink_e2e = { path = "../../../crates/e2e" }
1313
ink_sandbox = { path = "../../../crates/sandbox" }
1414
ink_revive_types = { path = "../../../crates/revive-types" }
1515
sha3 = { version = "0.10" }

0 commit comments

Comments
 (0)