Resolve conflicts

gamedaoco · Mar 13, 2022 · e929fc7 · e929fc7
2 parents 54c65e2 + 8eb87a5
commit e929fc7
Show file tree

Hide file tree

Showing 10 changed files with 1,754 additions and 1,056 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,16 @@
+root = true
+[*]
+indent_style=tab
+indent_size=tab
+tab_width=4
+end_of_line=lf
+charset=utf-8
+trim_trailing_whitespace=true
+max_line_length=120
+insert_final_newline=true
+
+[*.{yml,yaml}]
+indent_style=space
+indent_size=2
+tab_width=8
+end_of_line=lf
diff --git a/flow/Cargo.toml b/flow/Cargo.toml
@@ -18,14 +18,21 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false, optional = true }
 
 orml-traits = { path = "../../orml/traits", default-features = false }
-primitives = { package = "zero-primitives", path = "../../primitives", default-features = false }
-support = { package = "gamedao-protocol-support", path = "../support", default-features = false }
+zero-primitives = { package = "zero-primitives", path = "../../primitives", default-features = false }
+gamedao-protocol-support = { package = "gamedao-protocol-support", path = "../support", default-features = false }
 
 [dev-dependencies]
+frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" }
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" }
 
+pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" }
+pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" }
+
+orml-tokens = { path = "../../orml/tokens", default-features = false }
+orml-currencies = { path = "../../orml/currencies", default-features = false }
+
 [features]
 default = ["std"]
 runtime-benchmarks = ["frame-benchmarking"]
@@ -42,6 +49,8 @@ std = [
 	"sp-std/std",
 	"sp-runtime/std",
 	"orml-traits/std",
-	"support/std",
+	"orml-tokens/std",
+	"orml-currencies/std",
+	"gamedao-protocol-support/std",
 ]
 try-runtime = ["frame-support/try-runtime"]