From 4dd53001d87361294eea1bab175724496b6a43fd Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Mon, 19 Apr 2021 17:01:57 +1200 Subject: [PATCH 1/2] no longer need to pin funty --- auction/Cargo.toml | 2 -- authority/Cargo.toml | 2 -- benchmarking/Cargo.toml | 2 -- currencies/Cargo.toml | 2 -- gradually-update/Cargo.toml | 2 -- nft/Cargo.toml | 2 -- oracle/Cargo.toml | 2 -- oracle/rpc/Cargo.toml | 2 -- oracle/rpc/runtime-api/Cargo.toml | 2 -- rewards/Cargo.toml | 2 -- tokens/Cargo.toml | 2 -- traits/Cargo.toml | 2 -- utilities/Cargo.toml | 2 -- vesting/Cargo.toml | 2 -- 14 files changed, 28 deletions(-) diff --git a/auction/Cargo.toml b/auction/Cargo.toml index 64d024a3d..ab367b80f 100644 --- a/auction/Cargo.toml +++ b/auction/Cargo.toml @@ -17,8 +17,6 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "roc frame-system = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 - [dev-dependencies] sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } diff --git a/authority/Cargo.toml b/authority/Cargo.toml index ecd262d0d..2debd0b50 100644 --- a/authority/Cargo.toml +++ b/authority/Cargo.toml @@ -19,8 +19,6 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "roco orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 - [dev-dependencies] sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index 5727669c6..1c72472a1 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -20,8 +20,6 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "roc frame-system = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 - [dev-dependencies] hex-literal = "0.2.1" diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index a58fd4cf8..da5f2e0b4 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -20,8 +20,6 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "roco orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 - [dev-dependencies] sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index 1bde0d610..b9d11b63b 100644 --- a/gradually-update/Cargo.toml +++ b/gradually-update/Cargo.toml @@ -17,8 +17,6 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 - [features] default = ["std"] std = [ diff --git a/nft/Cargo.toml b/nft/Cargo.toml index 35f1b3cee..6866cac4b 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -20,8 +20,6 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "roco sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 - [features] default = ["std"] std = [ diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index 54e7bde93..5ba51042e 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -21,8 +21,6 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "roco orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 - [dev-dependencies] sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml index d64349197..c27a5d01c 100644 --- a/oracle/rpc/Cargo.toml +++ b/oracle/rpc/Cargo.toml @@ -16,5 +16,3 @@ sp-api = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } orml-oracle-rpc-runtime-api = { path = "runtime-api", version = "0.4.1-dev" } - -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 diff --git a/oracle/rpc/runtime-api/Cargo.toml b/oracle/rpc/runtime-api/Cargo.toml index 19edb53a2..5976c9233 100644 --- a/oracle/rpc/runtime-api/Cargo.toml +++ b/oracle/rpc/runtime-api/Cargo.toml @@ -11,8 +11,6 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features = sp-api = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 - [features] default = ["std"] std = [ diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index 674018a63..e329d4fee 100644 --- a/rewards/Cargo.toml +++ b/rewards/Cargo.toml @@ -17,8 +17,6 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "roc frame-system = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 - [dev-dependencies] sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index 735420dd3..2f86a11ad 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -16,8 +16,6 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "ro frame-system = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 - [dev-dependencies] sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 2c92c0f16..bf3b3ddf4 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -19,8 +19,6 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "roc orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } xcm = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1", default-features = false } -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 - [features] default = ["std"] std = [ diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index 4b505a7a6..1d8806bab 100644 --- a/utilities/Cargo.toml +++ b/utilities/Cargo.toml @@ -15,8 +15,6 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rococo sp-std = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 - [dev-dependencies] serde_json = "1.0.64" frame-system = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index 064519e91..bd241011a 100644 --- a/vesting/Cargo.toml +++ b/vesting/Cargo.toml @@ -17,8 +17,6 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" frame-support = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } frame-system = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } -funty = { version = "=1.1.0", default-features = false } # https://github.com/bitvecto-rs/bitvec/issues/105 - [dev-dependencies] sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } From 9df6e50a9c3a5a6fe9d8b2d6f73b813fcafac772 Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Mon, 19 Apr 2021 17:09:54 +1200 Subject: [PATCH 2/2] pin xcm-simulator version --- Cargo.dev.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.dev.toml b/Cargo.dev.toml index b09dd6547..f19d8d328 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -87,3 +87,6 @@ polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", re polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "8adff378fe35c850d5155732ae32260bcb5feb9b" } polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "8adff378fe35c850d5155732ae32260bcb5feb9b" } polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "8adff378fe35c850d5155732ae32260bcb5feb9b" } + +[patch.'https://github.com/shaunxw/xcm-simulator'] +xcm-simulator = { git = "https://github.com/shaunxw//xcm-simulator", rev = "c52bd64a41a51d08bd5a1e27f32c47419b41f3e5" }