Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update substrate crates #709

Merged
merged 17 commits into from
Nov 16, 2022
Merged

Update substrate crates #709

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e3db3ab
Patch all substrate deps to use my substrate branch
ascjones Nov 9, 2022
fa68cac
default-features = false causing issus in test-runtime
ascjones Nov 9, 2022
38dc2a1
Use substrate polkadot release branch
ascjones Nov 14, 2022
b0d99d4
Merge branch 'master' into aj/update-substrate-crates
ascjones Nov 14, 2022
5f1a717
Use default-features for sp-runtime again :(
ascjones Nov 14, 2022
68ec1cc
Restore default-features for subxt-cli/sp-core
ascjones Nov 14, 2022
4838ac0
Fix module error integration test
ascjones Nov 14, 2022
996b3ed
Add Send + Sync bounds to ExtrinsicEvents::iter()
ascjones Nov 15, 2022
fe8b1f1
Elide lifetime
ascjones Nov 15, 2022
313d23b
Revert adding Send + Sync
ascjones Nov 15, 2022
1d5674e
Add Sync bound to Rpc::ClientError
ascjones Nov 15, 2022
bd7a463
Remove version in subxt-metadata
ascjones Nov 15, 2022
e34eb41
Merge branch 'master' into aj/update-substrate-crates
ascjones Nov 15, 2022
c8b1718
Use released crates
ascjones Nov 16, 2022
71c25ba
Use released sp-keyring
ascjones Nov 16, 2022
c05e620
Fix sp-keyring deps
ascjones Nov 16, 2022
20a6b27
Remove unnecessary sp-keyring default-features = false
ascjones Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/Cargo.toml
View file
Open in desktop
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 = { version = "7.0.0", git = "https://github.com/paritytech/substrate", default-features = false }
ascjones marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 = { version = "7.0.0", git = "https://github.com/paritytech/substrate", default-features = false }
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
View file
Open in desktop
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
View file
Open in desktop
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"] }