Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.dev.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev =
sp-trie = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
sp-version = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
sp-utils = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }

[patch.'https://github.com/paritytech/cumulus']
cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "c5c3abf7eb9d4fdfb588d6560efaa8dca66a8dbc" }
Expand Down
36 changes: 25 additions & 11 deletions xtokens/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,26 @@ orml-xcm-support = { path = "../xcm-support", default-features = false }
orml-traits = { path = "../traits", default-features = false}

[dev-dependencies]
# sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.7" }
# polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.7" }
# polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.7" }
# pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.7" }
# xcm-simulator = { git = "https://github.com/shaunxw/xcm-simulator", branch = "master" }
# parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.7" }
# xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.7" }
# xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.7" }

# orml-tokens = { path = "../tokens" }
# orml-traits = { path = "../traits" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.7" }
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.7" }

# cumulus
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.7" }
cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.7" }
cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.7" }
cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.7" }
parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.7" }

# polkadot
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.7" }
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.7" }
xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.7" }
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.7" }
pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.7" }
polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.7" }

orml-tokens = { path = "../tokens" }
xcm-simulator = { git = "https://github.com/shaunxw/xcm-simulator.git", branch = "polkadot-v0.9.7"}

[features]
default = ["std"]
Expand All @@ -55,3 +64,8 @@ std = [
"orml-traits/std",
]
try-runtime = ["frame-support/try-runtime"]
# Needed because of cargo feature pollution.
runtime-benchmarks = [
"xcm-builder/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
]
4 changes: 2 additions & 2 deletions xtokens/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ use xcm_executor::traits::WeightBounds;
pub use module::*;
use orml_traits::location::{Parse, Reserve};

// mod mock;
// mod tests;
mod mock;
mod tests;

enum TransferKind {
/// Transfer self reserve asset.
Expand Down
Loading