Skip to content

Commit

Permalink
Update substrate crates (#709)
Browse files Browse the repository at this point in the history
* Patch all substrate deps to use my substrate branch

* default-features = false causing issus in test-runtime

* Use substrate polkadot release branch

* Use default-features for sp-runtime again :(

* Restore default-features for subxt-cli/sp-core

* Fix module error integration test

* Add Send + Sync bounds to ExtrinsicEvents::iter()

* Elide lifetime

* Revert adding Send + Sync

* Add Sync bound to Rpc::ClientError

* Remove version in subxt-metadata

* Use released crates

* Use released sp-keyring

* Fix sp-keyring deps

* Remove unnecessary sp-keyring default-features = false
  • Loading branch information
ascjones authored Nov 16, 2022
1 parent 92ace06 commit 389f20f
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ description = "Subxt example usage"
[dev-dependencies]
subxt = { path = "../subxt" }
tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] }
sp-keyring = "6.0.0"
sp-keyring = "7.0.0"
futures = "0.3.13"
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] }
hex = "0.4.3"
Expand Down
2 changes: 1 addition & 1 deletion metadata/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ description = "Command line utilities for checking metadata compatibility betwee
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] }
frame-metadata = "15.0.0"
scale-info = "2.0.0"
sp-core = { version = "6.0.0" }
sp-core = "7.0.0"

[dev-dependencies]
bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
Expand Down
4 changes: 2 additions & 2 deletions subxt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ parking_lot = "0.12.0"
subxt-macro = { version = "0.24.0", path = "../macro" }
subxt-metadata = { version = "0.24.0", path = "../metadata" }

sp-core = { version = "6.0.0", default-features = false }
sp-runtime = "6.0.0"
sp-core = { version = "7.0.0", default-features = false }
sp-runtime = "7.0.0"

frame-metadata = "15.0.0"
derivative = "2.2.0"
Expand Down
2 changes: 1 addition & 1 deletion subxt/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ pub enum RpcError {
// Dev note: We need the error to be safely sent between threads
// for `subscribe_to_block_headers_filling_in_gaps` and friends.
/// Error related to the RPC client.
ClientError(Box<dyn std::error::Error + Send + 'static>),
ClientError(Box<dyn std::error::Error + Send + Sync + 'static>),
/// The RPC subscription dropped.
SubscriptionDropped,
}
Expand Down
6 changes: 3 additions & 3 deletions testing/integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ futures = "0.3.13"
hex = "0.4.3"
regex = "1.5.0"
scale-info = { version = "2.0.0", features = ["bit-vec"] }
sp-core = { version = "6.0.0", default-features = false }
sp-keyring = "6.0.0"
sp-runtime = "6.0.0"
sp-core = { version = "7.0.0", default-features = false }
sp-keyring = "7.0.0"
sp-runtime = "7.0.0"
syn = "1.0.0"
subxt = { version = "0.24.0", path = "../../subxt" }
subxt-codegen = { version = "0.24.0", path = "../../codegen" }
Expand Down
2 changes: 1 addition & 1 deletion testing/integration-tests/src/client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ async fn dry_run_fails() {

if let Err(sp_runtime::DispatchError::Module(module_error)) = dry_run_res {
assert_eq!(module_error.index, 6);
assert_eq!(module_error.error, 2);
assert_eq!(module_error.error, [2, 0, 0, 0]);
} else {
panic!("expected a module error when dryrunning");
}
Expand Down
4 changes: 2 additions & 2 deletions testing/test-runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ edition = "2021"

[dependencies]
subxt = { path = "../../subxt" }
sp-runtime = "6.0.0"
sp-runtime = "7.0.0"
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] }

[build-dependencies]
subxt = { path = "../../subxt" }
sp-core = "6.0.0"
sp-core = { version = "7.0.0", default-features = false }
tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] }
which = "4.2.2"
jsonrpsee = { version = "0.16.0", features = ["async-client", "client-ws-transport"] }

0 comments on commit 389f20f

Please sign in to comment.