refactor cxrml dir (paritytech#95)

wasm successful pending has not remove {:?} debug trait
chainx-org · Nov 16, 2018 · 85759df · 85759df
1 parent a2643fc
commit 85759df
Show file tree

Hide file tree

Showing 14 changed files with 100 additions and 30 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,7 +32,7 @@ chainx-network = { path = "./network" }
 chainx-pool = { path = "./pool" }
 chainx-rpc = { path = "./rpc" }
 chainx-api = { path = "./api" }
-cxrml-pendingorders = { path = "./cxrml/pendingorders" }
+cxrml-pendingorders = { path = "./cxrml/exchange/pendingorders" }
 cxrml-tokenbalances = { path = "./cxrml/tokenbalances" }
 
 env_logger = "0.5.13"
@@ -67,10 +67,10 @@ members = [
     "cxrml/support",
     "cxrml/tokenbalances",
     "cxrml/staking",
-    "cxrml/financialrecords",
+    "cxrml/funds/financialrecords",
     "cxrml/multisig",
     "cxrml/bridge/btc",
-    "cxrml/pendingorders",
-    "cxrml/matchorder",
+    "cxrml/exchange/pendingorders",
+    "cxrml/exchange/matchorder",
     "cxrml/example",
 ]
diff --git a/cxrml/bridge/btc/Cargo.toml b/cxrml/bridge/btc/Cargo.toml
@@ -21,7 +21,7 @@ srml-consensus = { git = "https://github.com/paritytech/substrate", default-feat
 srml-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false }
 cxrml-support = { path = "../../support", default-features = false }
 cxrml-tokenbalances = { path = "../../tokenbalances", default-features = false }
-cxrml-financialrecords = { path = "../../financialrecords", default-features = false }
+cxrml-financialrecords = { path = "../../funds/financialrecords", default-features = false }
 
 # bitcoin-rust
 chain = { git = "https://github.com/chainx-org/bitcoin-rust", default-features = false }

diff --git a/cxrml/matchorder/Cargo.toml → cxrml/exchange/matchorder/Cargo.toml b/cxrml/matchorder/Cargo.toml → cxrml/exchange/matchorder/Cargo.toml
@@ -16,12 +16,12 @@ sr-primitives = { git = "https://github.com/paritytech/substrate", default_featu
 srml-support = { git = "https://github.com/paritytech/substrate", default_features = false }
 srml-system = { git = "https://github.com/paritytech/substrate", default_features = false }
 srml-balances = { git = "https://github.com/paritytech/substrate", default_features = false }
-cxrml-tokenbalances = { path = "../tokenbalances" }
-cxrml-pendingorders = { path = "../pendingorders" }
 log = "0.4"
 
 # cxrml module
-cxrml-support = { path = "../support",  default_features = false }
+cxrml-support = { path = "../../support",  default_features = false }
+cxrml-tokenbalances = { path = "../../tokenbalances",  default_features = false }
+cxrml-pendingorders = { path = "../pendingorders",  default_features = false }
 
 [features]
 default = ["std"]
@@ -38,4 +38,6 @@ std=[
     "srml-system/std",
     "srml-balances/std",
     "cxrml-support/std",
+    "cxrml-tokenbalances/std",
+    "cxrml-pendingorders/std",
 ]
diff --git a/cxrml/matchorder/src/lib.rs → cxrml/exchange/matchorder/src/lib.rs b/cxrml/matchorder/src/lib.rs → cxrml/exchange/matchorder/src/lib.rs
diff --git a/cxrml/matchorder/src/tests.rs → cxrml/exchange/matchorder/src/tests.rs b/cxrml/matchorder/src/tests.rs → cxrml/exchange/matchorder/src/tests.rs
diff --git a/cxrml/pendingorders/Cargo.toml → cxrml/exchange/pendingorders/Cargo.toml b/cxrml/pendingorders/Cargo.toml → cxrml/exchange/pendingorders/Cargo.toml
@@ -16,11 +16,12 @@ sr-primitives = { git = "https://github.com/paritytech/substrate", default_featu
 srml-support = { git = "https://github.com/paritytech/substrate", default_features = false }
 srml-system = { git = "https://github.com/paritytech/substrate", default_features = false }
 srml-balances = { git = "https://github.com/paritytech/substrate", default_features = false }
-cxrml-tokenbalances = { path = "../tokenbalances" }
+
 log = "0.4"
 
 # cxrml module
-cxrml-support = { path = "../support",  default_features = false }
+cxrml-support = { path = "../../support", default_features = false }
+cxrml-tokenbalances = { path = "../../tokenbalances", default_features = false }
 
 [features]
 default = ["std"]
@@ -37,4 +38,5 @@ std=[
     "srml-system/std",
     "srml-balances/std",
     "cxrml-support/std",
+    "cxrml-tokenbalances/std",
 ]
diff --git a/cxrml/pendingorders/src/lib.rs → cxrml/exchange/pendingorders/src/lib.rs b/cxrml/pendingorders/src/lib.rs → cxrml/exchange/pendingorders/src/lib.rs
diff --git a/cxrml/pendingorders/src/tests.rs → cxrml/exchange/pendingorders/src/tests.rs b/cxrml/pendingorders/src/tests.rs → cxrml/exchange/pendingorders/src/tests.rs
diff --git a/cxrml/financialrecords/Cargo.toml → cxrml/funds/financialrecords/Cargo.toml b/cxrml/financialrecords/Cargo.toml → cxrml/funds/financialrecords/Cargo.toml
@@ -18,8 +18,8 @@ srml-system = { git = "https://github.com/paritytech/substrate", default_feature
 srml-balances = { git = "https://github.com/paritytech/substrate", default_features = false }
 
 # cxrml module
-cxrml-support = { path = "../support", default_features = false }
-cxrml-tokenbalances = { path = "../tokenbalances", default_features = false }
+cxrml-support = { path = "../../support", default_features = false }
+cxrml-tokenbalances = { path = "../../tokenbalances", default_features = false }
 
 [features]
 default = ["std"]

diff --git a/cxrml/financialrecords/src/lib.rs → cxrml/funds/financialrecords/src/lib.rs b/cxrml/financialrecords/src/lib.rs → cxrml/funds/financialrecords/src/lib.rs
diff --git a/cxrml/financialrecords/src/tests.rs → cxrml/funds/financialrecords/src/tests.rs b/cxrml/financialrecords/src/tests.rs → cxrml/funds/financialrecords/src/tests.rs
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -34,11 +34,13 @@ chainx-primitives = { path = "../primitives" }
 cxrml-support = { path = "../cxrml/support" }
 cxrml-staking = { path = "../cxrml/staking" }
 cxrml-tokenbalances = { path = "../cxrml/tokenbalances" }
-cxrml-financialrecords = { path = "../cxrml/financialrecords" }
+cxrml-financialrecords = { path = "../cxrml/funds/financialrecords" }
 cxrml-multisig = { path = "../cxrml/multisig" }
+# bridge
 cxrml-bridge-btc = { path = "../cxrml/bridge/btc" }
-cxrml-pendingorders = { path = "../cxrml/pendingorders" }
-cxrml-matchorder = { path = "../cxrml/matchorder" }
+# exchange
+cxrml-pendingorders = { path = "../cxrml/exchange/pendingorders" }
+cxrml-matchorder = { path = "../cxrml/exchange/matchorder" }
 
 [features]
 default = ["std"]

diff --git a/runtime/wasm/Cargo.lock b/runtime/wasm/Cargo.lock
diff --git a/runtime/wasm/Cargo.toml b/runtime/wasm/Cargo.toml
@@ -33,9 +33,14 @@ chainx-primitives = { path = "../../primitives", default-features = false }
 cxrml-support = { path = "../../cxrml/support", default-features = false }
 cxrml-staking = { path = "../../cxrml/staking", default-features = false }
 cxrml-tokenbalances = { path = "../../cxrml/tokenbalances", default-features = false }
-cxrml-financialrecords = { path = "../../cxrml/financialrecords", default-features = false }
 cxrml-multisig = { path = "../../cxrml/multisig", default-features = false }
+# bridge
 cxrml-bridge-btc = { path = "../../cxrml/bridge/btc", default-features = false }
+# funds
+cxrml-financialrecords = { path = "../../cxrml/funds/financialrecords", default-features = false }
+# exchange
+cxrml-pendingorders = { path = "../../cxrml/exchange/pendingorders", default-features = false }
+cxrml-matchorder = { path = "../../cxrml/exchange/matchorder", default-features = false }
 
 [features]
 default = []
@@ -63,7 +68,9 @@ std = [
     "cxrml-tokenbalances/std",
     "cxrml-financialrecords/std",
     "cxrml-multisig/std",
-    "cxrml-bridge-btc/std"
+    "cxrml-bridge-btc/std",
+    "cxrml-pendingorders/std",
+    "cxrml-matchorder/std",
 ]
 
 [profile.release]