Move all deps to workspace toml (#932)

* Move all deps to workspace toml

* cargo fmt and codec 3.4, removing now unneeded 'full' feature

* add wasm-tests to workspace and fix subxt inheritng

* cargo fmt

* wasm-test thing can't be in workspace so revert that

* remove unwanted target dir from wasm-tests
This commit is contained in:
James Wilson
2023-04-26 10:31:59 +01:00
committed by GitHub
parent e583aa987e
commit 464b4432cf
18 changed files with 2276 additions and 190 deletions
+22 -22
View File
@@ -1,6 +1,6 @@
[package]
name = "integration-tests"
version = "0.28.0"
version.workspace = true
authors.workspace = true
edition.workspace = true
rust-version.workspace = true
@@ -16,24 +16,24 @@ description = "Subxt integration tests that rely on the Substrate binary"
default = ["subxt/integration-tests"]
[dev-dependencies]
assert_matches = "1.5.0"
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] }
frame-metadata = { version = "15.1.0", features = ["v14", "v15-unstable", "std"] }
futures = "0.3.27"
hex = "0.4.3"
regex = "1.8.1"
scale-info = { version = "2.5.0", features = ["bit-vec"] }
sp-core = { version = "20.0.0", default-features = false }
sp-runtime = "23.0.0"
sp-keyring = "23.0.0"
syn = "1.0.109"
subxt = { version = "0.28.0", path = "../../subxt" }
subxt-codegen = { version = "0.28.0", path = "../../codegen" }
subxt-metadata = { version = "0.28.0", path = "../../metadata" }
test-runtime = { path = "../test-runtime" }
tokio = { version = "1.27", features = ["macros", "time"] }
tracing = "0.1.34"
tracing-subscriber = "0.3.17"
wabt = "0.10.0"
which = "4.4.0"
substrate-runner = { path = "../substrate-runner" }
assert_matches = { workspace = true }
codec = { package = "parity-scale-codec", workspace = true, features = ["derive", "bit-vec"] }
frame-metadata = { workspace = true }
futures = { workspace = true }
hex = { workspace = true }
regex = { workspace = true }
scale-info = { workspace = true, features = ["bit-vec"] }
sp-core = { workspace = true }
sp-runtime = { workspace = true }
sp-keyring = { workspace = true }
syn = { workspace = true }
subxt = { workspace = true }
subxt-codegen = { workspace = true }
subxt-metadata = { workspace = true }
test-runtime = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }
wabt = { workspace = true }
which = { workspace = true }
substrate-runner = { workspace = true }
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "substrate-runner"
version = "0.28.0"
version.workspace = true
edition = "2021"
publish = false
+8 -8
View File
@@ -1,16 +1,16 @@
[package]
name = "test-runtime"
version = "0.28.0"
version.workspace = true
edition = "2021"
publish = false
[dependencies]
subxt = { path = "../../subxt" }
subxt = { workspace = true }
[build-dependencies]
substrate-runner = { path = "../substrate-runner" }
impl-serde = "0.4.0"
serde = "1.0.160"
tokio = { version = "1.27", features = ["macros", "rt-multi-thread"] }
which = "4.4.0"
jsonrpsee = { version = "0.16.0", features = ["async-client", "client-ws-transport"] }
substrate-runner = { workspace = true }
impl-serde = { workspace = true }
serde = { workspace = true }
tokio = { workspace = true }
which = { workspace = true }
jsonrpsee = { workspace = true, features = ["async-client", "client-ws-transport"] }
+7 -7
View File
@@ -1,6 +1,6 @@
[package]
name = "ui-tests"
version = "0.28.0"
version.workspace = true
edition = "2021"
publish = false
@@ -9,9 +9,9 @@ publish = false
[dependencies]
[dev-dependencies]
trybuild = "1.0.79"
scale-info = { version = "2.5.0", features = ["bit-vec"] }
frame-metadata = { version = "15.1.0", features = ["v14", "v15-unstable", "std"] }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] }
subxt = { path = "../../subxt" }
subxt-metadata = { path = "../../metadata" }
trybuild = { workspace = true }
scale-info = { workspace = true, features = ["bit-vec"] }
frame-metadata ={ workspace = true }
codec = { package = "parity-scale-codec", workspace = true, features = ["derive", "bit-vec"] }
subxt = { workspace = true }
subxt-metadata = { workspace = true }
+1
View File
@@ -0,0 +1 @@
/target
+2028
View File
File diff suppressed because it is too large Load Diff
+4 -1
View File
@@ -5,8 +5,11 @@ edition = "2021"
publish = false
[dev-dependencies]
# This crate is not a part of the workspace, sadly, because it
# requires a mutually exclusive jsonrpsee feature to be enabled on
# subxt to work. So, we can't inherit versions.
wasm-bindgen-test = "0.3.24"
tracing-wasm = "0.2.1"
console_error_panic_hook = "0.1.7"
serde_json = "1.0.57"
serde_json = "1"
subxt = { path = "../../subxt", default-features = false, features = ["jsonrpsee-web"] }
+3 -4
View File
@@ -9,10 +9,9 @@ wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
#[wasm_bindgen_test]
async fn wasm_ws_transport_works() {
let client =
subxt::client::OnlineClient::<PolkadotConfig>::from_url("ws://127.0.0.1:9944")
.await
.unwrap();
let client = subxt::client::OnlineClient::<PolkadotConfig>::from_url("ws://127.0.0.1:9944")
.await
.unwrap();
let chain = client.rpc().system_chain().await.unwrap();
assert_eq!(&chain, "Development");