Skip to content

Commit

Permalink
Fixup
Browse files Browse the repository at this point in the history 
Signed-off-by: Oliver Tale-Yazdi <[email protected]>
  • Loading branch information
@ggwpez
ggwpez committed Aug 29, 2023
1 parent aea37b3 commit 6649bbe
Show file tree
Hide file tree
Showing 24 changed files with 2,189 additions and 2,765 deletions.
4,906 changes: 2,166 additions & 2,740 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cumulus/pallets/parachain-system/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ scale-info = { version = "2.9.0", default-features = false, features = ["derive"
frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true}
frame-support = { path = "../../../substrate/frame/support", default-features = false}
frame-system = { path = "../../../substrate/frame/system", default-features = false}
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../substrate/frame/message-queue", default-features = false }
sp-core = { path = "../../../substrate/primitives/core", default-features = false}
sp-externalities = { path = "../../../substrate/primitives/externalities", default-features = false}
sp-inherents = { path = "../../../substrate/primitives/inherents", default-features = false}
Expand Down
3 changes: 1 addition & 2 deletions cumulus/pallets/parachain-system/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ use sp_runtime::{
InvalidTransaction, TransactionLongevity, TransactionSource, TransactionValidity,
ValidTransaction,
},
BoundedSlice,
RuntimeDebug,
BoundedSlice, RuntimeDebug,
};
use sp_std::{cmp, collections::btree_map::BTreeMap, prelude::*};
use xcm::latest::XcmHash;
Expand Down
2 changes: 1 addition & 1 deletion cumulus/pallets/xcmp-queue/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ frame-system = { path = "../../../substrate/frame/system", default-features = fa
sp-io = { path = "../../../substrate/primitives/io", default-features = false}
sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
sp-std = { path = "../../../substrate/primitives/std", default-features = false}
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../substrate/frame/message-queue", default-features = false }

# Polkadot
polkadot-runtime-common = { path = "../../../polkadot/runtime/common", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachain-template/runtime/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ frame-try-runtime = { path = "../../../substrate/frame/try-runtime", default-fea
pallet-aura = { path = "../../../substrate/frame/aura", default-features = false}
pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false}
pallet-balances = { path = "../../../substrate/frame/balances", default-features = false}
pallet-message-queue = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-message-queue = { path = "../../../substrate/frame/message-queue", default-features = false }
pallet-session = { path = "../../../substrate/frame/session", default-features = false}
pallet-sudo = { path = "../../../substrate/frame/sudo", default-features = false}
pallet-timestamp = { path = "../../../substrate/frame/timestamp", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/common/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pallet-asset-tx-payment = { path = "../../../substrate/frame/transaction-payment
pallet-assets = { path = "../../../substrate/frame/assets", default-features = false }
pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false }
pallet-balances = { path = "../../../substrate/frame/balances", default-features = false }
pallet-message-queue = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-message-queue = { path = "../../../substrate/frame/message-queue", default-features = false }
sp-consensus-aura = { path = "../../../substrate/primitives/consensus/aura", default-features = false }
sp-core = { path = "../../../substrate/primitives/core", default-features = false }
sp-io = { path = "../../../substrate/primitives/io", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ sp-weights = { path = "../../../../../../substrate/primitives/weights", default-
pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
pallet-asset-conversion = { path = "../../../../../../substrate/frame/asset-conversion", default-features = false}
pallet-message-queue = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-message-queue = { path = "../../../../../../substrate/frame/message-queue", default-features = false }

# Polkadot
polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sp-core = { path = "../../../../../../substrate/primitives/core", default-featur
sp-weights = { path = "../../../../../../substrate/primitives/weights", default-features = false}
pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
pallet-message-queue = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-message-queue = { path = "../../../../../../substrate/frame/message-queue", default-features = false }

# Polkadot
polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ sp-weights = { path = "../../../../../../substrate/primitives/weights", default-
pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
pallet-asset-conversion = { path = "../../../../../../substrate/frame/asset-conversion", default-features = false}
pallet-message-queue = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-message-queue = { path = "../../../../../../substrate/frame/message-queue", default-features = false }

# Polkadot
polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sp-core = { path = "../../../../../../substrate/primitives/core", default-featur
sp-weights = { path = "../../../../../../substrate/primitives/weights", default-features = false}
pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
pallet-message-queue = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-message-queue = { path = "../../../../../../substrate/frame/message-queue", default-features = false }

# Polkadot
polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}
pallet-message-queue = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-message-queue = { path = "../../../../../../substrate/frame/message-queue", default-features = false }

# Cumulus
parachains-common = { path = "../../../../common" }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-feat

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }

cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-feat

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-feat

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
Expand Down
3 changes: 1 addition & 2 deletions cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ use sp_runtime::{
create_runtime_str, generic, impl_opaque_keys,
traits::{AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, Verify},
transaction_validity::{TransactionSource, TransactionValidity},
Permill,
ApplyExtrinsicResult, Permill, RuntimeDebug,
ApplyExtrinsicResult, Perbill, Permill, RuntimeDebug,
};
use sp_std::prelude::*;
#[cfg(feature = "std")]
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-feat

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", defau
pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false}
pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false}
pallet-session = { path = "../../../../../substrate/frame/session", default-features = false}
pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-feat

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-feat

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-feat

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/runtimes/glutton/glutton-kusama/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ sp-api = { path = "../../../../../substrate/primitives/api", default-features =
sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/runtimes/testing/penpal/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-feat

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-feat

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/test/runtime/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ frame-support = { path = "../../../substrate/frame/support", default-features =
frame-system = { path = "../../../substrate/frame/system", default-features = false}
frame-system-rpc-runtime-api = { path = "../../../substrate/frame/system/rpc/runtime-api", default-features = false}
pallet-balances = { path = "../../../substrate/frame/balances", default-features = false}
pallet-message-queue = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-message-queue = { path = "../../../substrate/frame/message-queue", default-features = false }
pallet-sudo = { path = "../../../substrate/frame/sudo", default-features = false}
pallet-timestamp = { path = "../../../substrate/frame/timestamp", default-features = false}
pallet-glutton = { path = "../../../substrate/frame/glutton", default-features = false}
Expand Down

0 comments on commit 6649bbe

Please sign in to comment.