Move into frames

darwinia-network · Oct 19, 2020 · dcfe0fd · dcfe0fd
1 parent 3082185
commit dcfe0fd
Show file tree

Hide file tree

Showing 41 changed files with 13 additions and 13 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,12 +29,12 @@ members = [
 	"primitives/ethereum-primitives",
 	"primitives/merkle-patricia-trie",
 	"primitives/relay",
-	"frontier/frame/ethereum",
-	"frontier/rpc",
-	"frontier/rpc/core",
-	"frontier/rpc/primitives",
-	"frontier/consensus",
-	"frontier/consensus/primitives",
+	"frame/dvm/ethereum",
+	"frame/dvm/rpc",
+	"frame/dvm/rpc/core",
+	"frame/dvm/rpc/primitives",
+	"frame/dvm/consensus",
+	"frame/dvm/consensus/primitives",
 ]
 
 # The list of dependencies below (which can be both direct and indirect dependencies) are crates

diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
@@ -74,9 +74,9 @@ substrate-frame-rpc-system                 = { git = "https://github.com/darwini
 substrate-prometheus-endpoint              = { git = "https://github.com/darwinia-network/substrate.git", branch = "common-library" }
 # frontier
 evm = { default-features = false, package = "pallet-evm", git = "https://github.com/darwinia-network/substrate.git", branch = "common-library" }
-frontier-rpc = { default-features = false, path = "../../../frontier/rpc" }
-frontier-consensus = { path = "../../../frontier/consensus" }
-frontier-rpc-primitives = { default-features = false, path = "../../../frontier/rpc/primitives" }
+frontier-rpc = { default-features = false, path = "../../../frame/dvm/rpc" }
+frontier-consensus = { path = "../../../frame/dvm/consensus" }
+frontier-rpc-primitives = { default-features = false, path = "../../../frame/dvm/rpc/primitives" }
 
 [build-dependencies]
 # substrate

diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
@@ -75,8 +75,8 @@ sp-transaction-pool                        = { default-features = false, git = "
 sp-version                                 = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "common-library" }
 # frontier
 frame-evm = { default-features = false, package = "pallet-evm", git = "https://github.com/darwinia-network/substrate.git", branch = "common-library" }
-frame-ethereum = { version = "0.1.0", default-features = false, package = "pallet-ethereum", path = "../../../frontier/frame/ethereum" }
-frontier-rpc-primitives = { default-features = false, path = "../../../frontier/rpc/primitives" }
+frame-ethereum = { version = "0.1.0", default-features = false, package = "pallet-ethereum", path = "../../../frame/dvm/ethereum" }
+frontier-rpc-primitives = { default-features = false, path = "../../../frame/dvm/rpc/primitives" }
 
 [build-dependencies]
 # substrate

diff --git a/frontier/consensus/Cargo.toml → frame/dvm/consensus/Cargo.toml b/frontier/consensus/Cargo.toml → frame/dvm/consensus/Cargo.toml
diff --git a/frontier/consensus/primitives/Cargo.toml → frame/dvm/consensus/primitives/Cargo.toml b/frontier/consensus/primitives/Cargo.toml → frame/dvm/consensus/primitives/Cargo.toml
diff --git a/frontier/consensus/primitives/src/lib.rs → frame/dvm/consensus/primitives/src/lib.rs b/frontier/consensus/primitives/src/lib.rs → frame/dvm/consensus/primitives/src/lib.rs
diff --git a/frontier/consensus/src/aux_schema.rs → frame/dvm/consensus/src/aux_schema.rs b/frontier/consensus/src/aux_schema.rs → frame/dvm/consensus/src/aux_schema.rs
diff --git a/frontier/consensus/src/lib.rs → frame/dvm/consensus/src/lib.rs b/frontier/consensus/src/lib.rs → frame/dvm/consensus/src/lib.rs
diff --git a/frontier/frame/ethereum/Cargo.toml → frame/dvm/ethereum/Cargo.toml b/frontier/frame/ethereum/Cargo.toml → frame/dvm/ethereum/Cargo.toml
@@ -24,8 +24,8 @@ ethereum-types = { version = "0.9", default-features = false }
 rlp = { version = "0.4", default-features = false }
 sha3 = { version = "0.8", default-features = false }
 libsecp256k1 = { version = "0.3", default-features = false }
-frontier-consensus-primitives = { path = "../../consensus/primitives", default-features = false }
-frontier-rpc-primitives = { path = "../../rpc/primitives", default-features = false }
+frontier-consensus-primitives = { path = "../consensus/primitives", default-features = false }
+frontier-rpc-primitives = { path = "../rpc/primitives", default-features = false }
 darwinia-support                  = { default-features = false, path = "../../../frame/support" }
 
 [dev-dependencies]

diff --git a/frontier/frame/ethereum/src/lib.rs → frame/dvm/ethereum/src/lib.rs b/frontier/frame/ethereum/src/lib.rs → frame/dvm/ethereum/src/lib.rs
diff --git a/frontier/frame/ethereum/src/mock.rs → frame/dvm/ethereum/src/mock.rs b/frontier/frame/ethereum/src/mock.rs → frame/dvm/ethereum/src/mock.rs
diff --git a/frontier/frame/ethereum/src/tests.rs → frame/dvm/ethereum/src/tests.rs b/frontier/frame/ethereum/src/tests.rs → frame/dvm/ethereum/src/tests.rs
diff --git a/frontier/rpc/Cargo.toml → frame/dvm/rpc/Cargo.toml b/frontier/rpc/Cargo.toml → frame/dvm/rpc/Cargo.toml
diff --git a/frontier/rpc/core/Cargo.toml → frame/dvm/rpc/core/Cargo.toml b/frontier/rpc/core/Cargo.toml → frame/dvm/rpc/core/Cargo.toml
diff --git a/frontier/rpc/core/src/eth.rs → frame/dvm/rpc/core/src/eth.rs b/frontier/rpc/core/src/eth.rs → frame/dvm/rpc/core/src/eth.rs
diff --git a/frontier/rpc/core/src/eth_pubsub.rs → frame/dvm/rpc/core/src/eth_pubsub.rs b/frontier/rpc/core/src/eth_pubsub.rs → frame/dvm/rpc/core/src/eth_pubsub.rs
diff --git a/frontier/rpc/core/src/eth_signing.rs → frame/dvm/rpc/core/src/eth_signing.rs b/frontier/rpc/core/src/eth_signing.rs → frame/dvm/rpc/core/src/eth_signing.rs
diff --git a/frontier/rpc/core/src/lib.rs → frame/dvm/rpc/core/src/lib.rs b/frontier/rpc/core/src/lib.rs → frame/dvm/rpc/core/src/lib.rs
diff --git a/frontier/rpc/core/src/net.rs → frame/dvm/rpc/core/src/net.rs b/frontier/rpc/core/src/net.rs → frame/dvm/rpc/core/src/net.rs
diff --git a/frontier/rpc/core/src/types/account_info.rs → frame/dvm/rpc/core/src/types/account_info.rs b/frontier/rpc/core/src/types/account_info.rs → frame/dvm/rpc/core/src/types/account_info.rs
diff --git a/frontier/rpc/core/src/types/block.rs → frame/dvm/rpc/core/src/types/block.rs b/frontier/rpc/core/src/types/block.rs → frame/dvm/rpc/core/src/types/block.rs
diff --git a/frontier/rpc/core/src/types/block_number.rs → frame/dvm/rpc/core/src/types/block_number.rs b/frontier/rpc/core/src/types/block_number.rs → frame/dvm/rpc/core/src/types/block_number.rs
diff --git a/frontier/rpc/core/src/types/bytes.rs → frame/dvm/rpc/core/src/types/bytes.rs b/frontier/rpc/core/src/types/bytes.rs → frame/dvm/rpc/core/src/types/bytes.rs
diff --git a/frontier/rpc/core/src/types/call_request.rs → frame/dvm/rpc/core/src/types/call_request.rs b/frontier/rpc/core/src/types/call_request.rs → frame/dvm/rpc/core/src/types/call_request.rs
diff --git a/frontier/rpc/core/src/types/filter.rs → frame/dvm/rpc/core/src/types/filter.rs b/frontier/rpc/core/src/types/filter.rs → frame/dvm/rpc/core/src/types/filter.rs
diff --git a/frontier/rpc/core/src/types/index.rs → frame/dvm/rpc/core/src/types/index.rs b/frontier/rpc/core/src/types/index.rs → frame/dvm/rpc/core/src/types/index.rs
diff --git a/frontier/rpc/core/src/types/log.rs → frame/dvm/rpc/core/src/types/log.rs b/frontier/rpc/core/src/types/log.rs → frame/dvm/rpc/core/src/types/log.rs
diff --git a/frontier/rpc/core/src/types/mod.rs → frame/dvm/rpc/core/src/types/mod.rs b/frontier/rpc/core/src/types/mod.rs → frame/dvm/rpc/core/src/types/mod.rs
diff --git a/frontier/rpc/core/src/types/pubsub.rs → frame/dvm/rpc/core/src/types/pubsub.rs b/frontier/rpc/core/src/types/pubsub.rs → frame/dvm/rpc/core/src/types/pubsub.rs
diff --git a/frontier/rpc/core/src/types/receipt.rs → frame/dvm/rpc/core/src/types/receipt.rs b/frontier/rpc/core/src/types/receipt.rs → frame/dvm/rpc/core/src/types/receipt.rs
diff --git a/frontier/rpc/core/src/types/sync.rs → frame/dvm/rpc/core/src/types/sync.rs b/frontier/rpc/core/src/types/sync.rs → frame/dvm/rpc/core/src/types/sync.rs
diff --git a/frontier/rpc/core/src/types/transaction.rs → frame/dvm/rpc/core/src/types/transaction.rs b/frontier/rpc/core/src/types/transaction.rs → frame/dvm/rpc/core/src/types/transaction.rs
diff --git a/...c/core/src/types/transaction_condition.rs → ...c/core/src/types/transaction_condition.rs b/...c/core/src/types/transaction_condition.rs → ...c/core/src/types/transaction_condition.rs
diff --git a/...rpc/core/src/types/transaction_request.rs → ...rpc/core/src/types/transaction_request.rs b/...rpc/core/src/types/transaction_request.rs → ...rpc/core/src/types/transaction_request.rs
diff --git a/frontier/rpc/core/src/types/work.rs → frame/dvm/rpc/core/src/types/work.rs b/frontier/rpc/core/src/types/work.rs → frame/dvm/rpc/core/src/types/work.rs
diff --git a/frontier/rpc/core/src/web3.rs → frame/dvm/rpc/core/src/web3.rs b/frontier/rpc/core/src/web3.rs → frame/dvm/rpc/core/src/web3.rs
diff --git a/frontier/rpc/primitives/Cargo.toml → frame/dvm/rpc/primitives/Cargo.toml b/frontier/rpc/primitives/Cargo.toml → frame/dvm/rpc/primitives/Cargo.toml
diff --git a/frontier/rpc/primitives/src/lib.rs → frame/dvm/rpc/primitives/src/lib.rs b/frontier/rpc/primitives/src/lib.rs → frame/dvm/rpc/primitives/src/lib.rs
diff --git a/frontier/rpc/src/eth.rs → frame/dvm/rpc/src/eth.rs b/frontier/rpc/src/eth.rs → frame/dvm/rpc/src/eth.rs
diff --git a/frontier/rpc/src/eth_pubsub.rs → frame/dvm/rpc/src/eth_pubsub.rs b/frontier/rpc/src/eth_pubsub.rs → frame/dvm/rpc/src/eth_pubsub.rs
diff --git a/frontier/rpc/src/lib.rs → frame/dvm/rpc/src/lib.rs b/frontier/rpc/src/lib.rs → frame/dvm/rpc/src/lib.rs