Skip to content

chore: fixed std wasm build of xcm #2535

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

Merged
bkchr merged 9 commits into from
Dec 5, 2023
Merged

chore: fixed std wasm build of xcm #2535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d923555
chore: fixed std wasm build of xcm
dzmitry-lahoda Nov 28, 2023
ef01ee8
Merge branch 'master' into dz/3
dzmitry-lahoda Nov 28, 2023
62137bb
lock file update
dzmitry-lahoda Nov 28, 2023
ddd784b
Update substrate/primitives/weights/Cargo.toml
dzmitry-lahoda Nov 29, 2023
3c9b1db
Merge branch 'master' into dz/3
dzmitry-lahoda Nov 29, 2023
f898ef7
fixed weight tests
dzmitry-lahoda Nov 29, 2023
d3bc419
Merge branch 'master' into dz/3
dzmitry-lahoda Nov 29, 2023
e490a85
Merge branch 'master' into dz/3
dzmitry-lahoda Dec 5, 2023
071fc47
taplo fmt fix
dzmitry-lahoda Dec 5, 2023
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 Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions substrate/primitives/weights/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ documentation = "https://docs.rs/sp-wasm-interface"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
bounded-collections = { version = "0.1.4", default-features = false }
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.193", default-features = false, optional = true, features = ["alloc", "derive"] }
smallvec = "1.11.0"
sp-arithmetic = { path = "../arithmetic", default-features = false }
sp-core = { path = "../core", default-features = false }
sp-debug-derive = { path = "../debug-derive", default-features = false }
sp-std = { path = "../std", default-features = false }

[features]
default = ["std"]
std = [
"bounded-collections/std",
"codec/std",
"scale-info/std",
"serde/std",
"sp-arithmetic/std",
"sp-core/std",
"sp-debug-derive/std",
"sp-std/std",
]
Expand All @@ -39,8 +39,8 @@ full-metadata-docs = ["scale-info/docs"]

# Serde support without relying on std features.
serde = [
"bounded-collections/serde",
"dep:serde",
"scale-info/serde",
"sp-arithmetic/serde",
"sp-core/serde",
]
6 changes: 3 additions & 3 deletions substrate/primitives/weights/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ extern crate self as sp_weights;
mod weight_meter;
mod weight_v2;

use bounded_collections::Get;
use codec::{CompactAs, Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
#[cfg(feature = "serde")]
Expand All @@ -36,7 +37,6 @@ use sp_arithmetic::{
traits::{BaseArithmetic, SaturatedConversion, Unsigned},
Perbill,
};
use sp_core::Get;
use sp_debug_derive::RuntimeDebug;

pub use weight_meter::*;
Expand Down Expand Up @@ -270,7 +270,7 @@ pub type NoFee<T> = FixedFee<0, T>;
/// # Example
///
/// ```
/// # use sp_core::ConstU128;
/// # use bounded_collections::ConstU128;
/// # use sp_weights::ConstantMultiplier;
/// // Results in a multiplier of 10 for each unit of weight (or length)
/// type LengthToFee = ConstantMultiplier::<u128, ConstU128<10u128>>;
Expand Down Expand Up @@ -360,7 +360,7 @@ mod tests {

#[test]
fn constant_fee_works() {
use sp_core::ConstU128;
use bounded_collections::ConstU128;
assert_eq!(
ConstantMultiplier::<u128, ConstU128<100u128>>::weight_to_fee(&Weight::zero()),
0
Expand Down