Fix merge issues

moondance-labs · Dec 24, 2024 · 99bbbc1 · 99bbbc1
1 parent ef6a3e5
commit 99bbbc1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -104,8 +104,6 @@ tp-maths = { path = "primitives/maths", default-features = false }
 tp-traits = { path = "primitives/traits", default-features = false }
 tp-xcm-commons = { path = "primitives/xcm-commons", default-features = false }
 tp-xcm-core-buyer = { path = "primitives/xcm-core-buyer", default-features = false }
-tp-xcm-commons = { path = "primitives/xcm-commons", default-features = false }
-tp-xcm-core-buyer = { path = "primitives/xcm-core-buyer", default-features = false }
 
 # Dancekit (wasm)
 ccp-authorities-noting-inherent = { git = "https://github.com/moondance-labs/dancekit", branch = "tanssi-polkadot-stable2409", default-features = false }

diff --git a/primitives/xcm-commons/Cargo.toml b/primitives/xcm-commons/Cargo.toml
@@ -14,17 +14,15 @@ workspace = true
 frame-support = { workspace = true }
 log = { workspace = true }
 staging-xcm = { workspace = true }
-frame-support = { workspace = true }
-log = { workspace = true }
 
 [features]
 default = [
 	"std",
 ]
 std = [
 	"frame-support/std",
-	"log/std",
-	"staging-xcm/std",
 	"frame-support/std",
 	"log/std",
+	"log/std",
+	"staging-xcm/std",
 ]
diff --git a/runtime/dancebox/Cargo.toml b/runtime/dancebox/Cargo.toml
@@ -50,8 +50,6 @@ tanssi-relay-encoder = { workspace = true }
 tanssi-runtime-common = { workspace = true }
 tp-xcm-commons = { workspace = true }
 tp-xcm-core-buyer = { workspace = true }
-tp-xcm-commons = { workspace = true }
-tp-xcm-core-buyer = { workspace = true }
 
 # Moonkit
 async-backing-primitives = { workspace = true }
@@ -275,9 +273,9 @@ std = [
 	"tp-author-noting-inherent/std",
 	"tp-traits/std",
 	"tp-xcm-commons/std",
-	"tp-xcm-core-buyer/std",
 	"tp-xcm-commons/std",
 	"tp-xcm-core-buyer/std",
+	"tp-xcm-core-buyer/std",
 	"westend-runtime-constants/std",
 	"westend-runtime/std",
 	"xcm-primitives/std",