From a1322a9e75fb70807c167a3e00916a86b715f758 Mon Sep 17 00:00:00 2001
From: zhenfei <zhenfei.zhang@hotmail.com>
Date: Tue, 20 Apr 2021 18:44:08 -0400
Subject: [PATCH] Change git submodule to cargo dependencies (#5)

* adding dependencies

* removing submodule
---
 .gitmodules                          |  3 ---
 Cargo.lock                           | 13 ++++---------
 orml                                 |  1 -
 runtimes/manta-pc/Cargo.toml         |  2 +-
 runtimes/manta-pc/runtime/Cargo.toml |  6 +++---
 5 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 160000 orml

diff --git a/.gitmodules b/.gitmodules
index 8861d9963..e69de29bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "orml"]
-	path = orml
-	url = git@github.com:open-web3-stack/open-runtime-module-library.git
diff --git a/Cargo.lock b/Cargo.lock
index 4b6f573cb..aff51fdf8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4563,17 +4563,15 @@ dependencies = [
 [[package]]
 name = "orml-currencies"
 version = "0.4.1-dev"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#57af18a0a035c919e20eeed02bebba5dbd15114a"
 dependencies = [
  "frame-support",
  "frame-system",
  "funty",
- "orml-tokens",
  "orml-traits",
  "orml-utilities",
- "pallet-balances",
  "parity-scale-codec",
  "serde",
- "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
@@ -4582,17 +4580,14 @@ dependencies = [
 [[package]]
 name = "orml-tokens"
 version = "0.4.1-dev"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#57af18a0a035c919e20eeed02bebba5dbd15114a"
 dependencies = [
  "frame-support",
  "frame-system",
  "funty",
  "orml-traits",
- "pallet-elections-phragmen",
- "pallet-treasury",
  "parity-scale-codec",
  "serde",
- "sp-core",
- "sp-io",
  "sp-runtime",
  "sp-std",
 ]
@@ -4600,6 +4595,7 @@ dependencies = [
 [[package]]
 name = "orml-traits"
 version = "0.4.1-dev"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#57af18a0a035c919e20eeed02bebba5dbd15114a"
 dependencies = [
  "frame-support",
  "funty",
@@ -4617,13 +4613,12 @@ dependencies = [
 [[package]]
 name = "orml-utilities"
 version = "0.4.1-dev"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#57af18a0a035c919e20eeed02bebba5dbd15114a"
 dependencies = [
  "frame-support",
- "frame-system",
  "funty",
  "parity-scale-codec",
  "serde",
- "serde_json",
  "sp-io",
  "sp-runtime",
  "sp-std",
diff --git a/orml b/orml
deleted file mode 160000
index 57af18a0a..000000000
--- a/orml
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 57af18a0a035c919e20eeed02bebba5dbd15114a
diff --git a/runtimes/manta-pc/Cargo.toml b/runtimes/manta-pc/Cargo.toml
index 89602f156..2466637ee 100644
--- a/runtimes/manta-pc/Cargo.toml
+++ b/runtimes/manta-pc/Cargo.toml
@@ -72,7 +72,7 @@ polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" }
 
 # orml dependencies
-orml-tokens = { path = "../../orml/tokens", default-features = false }
+orml-tokens = { package = "orml-tokens", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false }
 
 [build-dependencies]
 substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" }
diff --git a/runtimes/manta-pc/runtime/Cargo.toml b/runtimes/manta-pc/runtime/Cargo.toml
index 649913557..fe346095e 100644
--- a/runtimes/manta-pc/runtime/Cargo.toml
+++ b/runtimes/manta-pc/runtime/Cargo.toml
@@ -46,9 +46,9 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features
 xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "rococo-v1" }
 
 # orml dependencies
-orml-currencies = { path = "../../../orml/currencies", default-features = false }
-orml-tokens = { path = "../../../orml/tokens", default-features = false }
-orml-traits = { path = "../../../orml/traits", default-features = false }
+orml-tokens = { package = "orml-tokens", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false }
+orml-currencies = { package = "orml-currencies", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false }
+orml-traits = { package = "orml-traits", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = "3.0.0"