From a6dc4915cc71526346d16063be0d72f63bf27ef9 Mon Sep 17 00:00:00 2001 From: Alex <69764315+Serial-ATA@users.noreply.github.com> Date: Fri, 6 Sep 2024 15:41:12 -0400 Subject: [PATCH] tangle-subxt: Fixup features (#757) --- Cargo.lock | 2 +- Cargo.toml | 3 +++ precompiles/multi-asset-delegation/src/tests.rs | 4 ++-- tangle-subxt/Cargo.toml | 12 +++++++----- tangle-subxt/src/lib.rs | 8 ++++++-- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b462b830..67640f55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14597,7 +14597,7 @@ dependencies = [ [[package]] name = "tangle-subxt" -version = "0.2.0" +version = "0.3.0" dependencies = [ "parity-scale-codec", "scale-info", diff --git a/Cargo.toml b/Cargo.toml index 4a19e1a7..ae967f70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -215,6 +215,9 @@ mmr-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "releas sc-rpc-spec-v2 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false } substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false } sc-sync-state-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false } +subxt = { version = "0.37.0", default-features = false } +subxt-core = { version = "0.37.0", default-features = false } +subxt-signer = { version = "0.37.0", default-features = false } pallet-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false } pallet-bags-list = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false } diff --git a/precompiles/multi-asset-delegation/src/tests.rs b/precompiles/multi-asset-delegation/src/tests.rs index 2fab00ed..b0a9bf27 100644 --- a/precompiles/multi-asset-delegation/src/tests.rs +++ b/precompiles/multi-asset-delegation/src/tests.rs @@ -339,8 +339,8 @@ fn test_execute_withdraw_before_due() { .prepare_test(TestAccount::Alex, H160::from_low_u64_be(1), PCall::execute_withdraw {}) .execute_returns(()); // should not fail - assert_eq!(Assets::balance(1, delegator_account), 500 - 200); // not expired so should not change - // balance + // not expired so should not change balance + assert_eq!(Assets::balance(1, delegator_account), 500 - 200); }); } diff --git a/tangle-subxt/Cargo.toml b/tangle-subxt/Cargo.toml index 25686fc9..1633fc85 100644 --- a/tangle-subxt/Cargo.toml +++ b/tangle-subxt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tangle-subxt" -version = "0.2.0" +version = "0.3.0" description = "Rust bindings and interface to interact with Tangle Network using subxt" authors = { workspace = true } edition = { workspace = true } @@ -15,16 +15,18 @@ readme = "README.md" [dependencies] parity-scale-codec = { workspace = true } scale-info = { workspace = true } -subxt = { version = "0.37.0", default-features = false, features = ["jsonrpsee"], optional = true } -subxt-signer = { version = "0.37.0", default-features = false, features = ["subxt", "sr25519", "ecdsa"] } +subxt = { workspace = true, features = ["jsonrpsee"], optional = true } +subxt-signer = { workspace = true, features = ["subxt", "sr25519", "ecdsa"] } serde = { workspace = true, features = ["derive"] } -subxt-core = "0.37.0" +subxt-core = { workspace = true } [features] -default = ["std", "subxt/native"] +default = ["std"] std = [ "dep:subxt", + "subxt/native", "subxt/jsonrpsee", + "subxt-core/std", "subxt-signer/std" ] web = [ diff --git a/tangle-subxt/src/lib.rs b/tangle-subxt/src/lib.rs index 140c5fc5..41367304 100644 --- a/tangle-subxt/src/lib.rs +++ b/tangle-subxt/src/lib.rs @@ -8,8 +8,7 @@ clippy::exhaustive_enums )] #![allow(clippy::all, clippy::exhaustive_enums)] -// pub mod tangle_mainnet_runtime; -pub mod tangle_testnet_runtime; + pub use parity_scale_codec; pub use scale_info; #[cfg(any(feature = "std", feature = "web"))] @@ -18,3 +17,8 @@ pub use subxt_signer; // `subxt` already re-exports `subxt-core` #[cfg(not(any(feature = "std", feature = "web")))] pub use subxt_core; + +// #[cfg_attr(rustfmt, rustfmt::skip)] +// pub mod tangle_mainnet_runtime; +#[cfg_attr(rustfmt, rustfmt::skip)] +pub mod tangle_testnet_runtime;