Skip to content

Commit

Permalink
refactor: remove module prefix from rpc pallets
Browse files Browse the repository at this point in the history 
Signed-off-by: Gregory Hill <gregorydhill@outlook.com>
  • Loading branch information
@gregdhill
gregdhill committed Nov 15, 2022
1 parent fe4b6dc commit d87ae31
Show file tree
Hide file tree
Showing 25 changed files with 390 additions and 387 deletions.
495 changes: 249 additions & 246 deletions Cargo.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions crates/btc-relay/rpc/Cargo.toml
View file
@@ -1,5 +1,5 @@
[package]
name = "module-btc-relay-rpc"
name = "btc-relay-rpc"
version = "1.2.0"
authors = ["Interlay Ltd"]
edition = "2021"
Expand All @@ -10,4 +10,4 @@ jsonrpsee = { version = "0.15.1", features = ["server", "macros"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
module-btc-relay-rpc-runtime-api = { path = "runtime-api" }
btc-relay-rpc-runtime-api = { path = "runtime-api" }
2 changes: 1 addition & 1 deletion crates/btc-relay/rpc/runtime-api/Cargo.toml
View file
@@ -1,5 +1,5 @@
[package]
name = "module-btc-relay-rpc-runtime-api"
name = "btc-relay-rpc-runtime-api"
version = "1.2.0"
authors = ["Interlay Ltd"]
edition = "2021"
Expand Down
6 changes: 3 additions & 3 deletions crates/escrow/rpc/Cargo.toml
View file
@@ -1,7 +1,7 @@
[package]
authors = ["Interlay Ltd"]
edition = "2021"
name = "module-escrow-rpc"
name = "escrow-rpc"
version = '0.3.0'

[dependencies]
Expand All @@ -10,7 +10,7 @@ jsonrpsee = { version = "0.15.1", features = ["server", "macros"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
module-escrow-rpc-runtime-api = { path = "runtime-api" }
escrow-rpc-runtime-api = { path = "runtime-api" }

[dependencies.module-oracle-rpc-runtime-api]
[dependencies.oracle-rpc-runtime-api]
path = '../../oracle/rpc/runtime-api'
6 changes: 3 additions & 3 deletions crates/escrow/rpc/runtime-api/Cargo.toml
View file
@@ -1,14 +1,14 @@
[package]
authors = ["Interlay Ltd"]
edition = "2021"
name = "module-escrow-rpc-runtime-api"
name = "escrow-rpc-runtime-api"
version = '0.3.0'

[dependencies]
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }

[dependencies.module-oracle-rpc-runtime-api]
[dependencies.oracle-rpc-runtime-api]
default-features = false
path = '../../../oracle/rpc/runtime-api'

Expand All @@ -17,5 +17,5 @@ default = ["std"]
std = [
"codec/std",
"sp-api/std",
"module-oracle-rpc-runtime-api/std",
"oracle-rpc-runtime-api/std",
]
4 changes: 2 additions & 2 deletions crates/issue/rpc/Cargo.toml
View file
@@ -1,5 +1,5 @@
[package]
name = "module-issue-rpc"
name = "issue-rpc"
version = "1.2.0"
authors = ["Interlay Ltd"]
edition = "2021"
Expand All @@ -10,4 +10,4 @@ jsonrpsee = { version = "0.15.1", features = ["server", "macros"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
module-issue-rpc-runtime-api = { path = "runtime-api" }
issue-rpc-runtime-api = { path = "runtime-api" }
2 changes: 1 addition & 1 deletion crates/issue/rpc/runtime-api/Cargo.toml
View file
@@ -1,5 +1,5 @@
[package]
name = "module-issue-rpc-runtime-api"
name = "issue-rpc-runtime-api"
version = "1.2.0"
authors = ["Interlay Ltd"]
edition = "2021"
Expand Down
4 changes: 2 additions & 2 deletions crates/oracle/rpc/Cargo.toml
View file
@@ -1,5 +1,5 @@
[package]
name = "module-oracle-rpc"
name = "oracle-rpc"
version = "1.2.0"
authors = ["Interlay Ltd"]
edition = "2021"
Expand All @@ -10,4 +10,4 @@ jsonrpsee = { version = "0.15.1", features = ["server", "macros"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
module-oracle-rpc-runtime-api = { path = "runtime-api" }
oracle-rpc-runtime-api = { path = "runtime-api" }
2 changes: 1 addition & 1 deletion crates/oracle/rpc/runtime-api/Cargo.toml
View file
@@ -1,5 +1,5 @@
[package]
name = "module-oracle-rpc-runtime-api"
name = "oracle-rpc-runtime-api"
version = "1.2.0"
authors = ["Interlay Ltd"]
edition = "2021"
Expand Down
4 changes: 2 additions & 2 deletions crates/redeem/rpc/Cargo.toml
View file
@@ -1,5 +1,5 @@
[package]
name = "module-redeem-rpc"
name = "redeem-rpc"
version = "1.2.0"
authors = ["Interlay Ltd"]
edition = "2021"
Expand All @@ -10,4 +10,4 @@ jsonrpsee = { version = "0.15.1", features = ["server", "macros"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
module-redeem-rpc-runtime-api = { path = "runtime-api" }
redeem-rpc-runtime-api = { path = "runtime-api" }
2 changes: 1 addition & 1 deletion crates/redeem/rpc/runtime-api/Cargo.toml
View file
@@ -1,5 +1,5 @@
[package]
name = "module-redeem-rpc-runtime-api"
name = "redeem-rpc-runtime-api"
version = "1.2.0"
authors = ["Interlay Ltd"]
edition = "2021"
Expand Down
4 changes: 2 additions & 2 deletions crates/replace/rpc/Cargo.toml
View file
@@ -1,5 +1,5 @@
[package]
name = "module-replace-rpc"
name = "replace-rpc"
version = "1.2.0"
authors = ["Interlay Ltd"]
edition = "2021"
Expand All @@ -10,4 +10,4 @@ jsonrpsee = { version = "0.15.1", features = ["server", "macros"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
module-replace-rpc-runtime-api = { path = "runtime-api" }
replace-rpc-runtime-api = { path = "runtime-api" }
2 changes: 1 addition & 1 deletion crates/replace/rpc/runtime-api/Cargo.toml
View file
@@ -1,5 +1,5 @@
[package]
name = "module-replace-rpc-runtime-api"
name = "replace-rpc-runtime-api"
version = "1.2.0"
authors = ["Interlay Ltd"]
edition = "2021"
Expand Down
6 changes: 3 additions & 3 deletions crates/reward/rpc/Cargo.toml
View file
@@ -1,7 +1,7 @@
[package]
authors = ["Interlay Ltd"]
edition = "2021"
name = "module-reward-rpc"
name = "reward-rpc"
version = '0.3.0'

[dependencies]
Expand All @@ -10,7 +10,7 @@ jsonrpsee = { version = "0.15.1", features = ["server", "macros"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
module-reward-rpc-runtime-api = { path = "runtime-api" }
reward-rpc-runtime-api = { path = "runtime-api" }

[dependencies.module-oracle-rpc-runtime-api]
[dependencies.oracle-rpc-runtime-api]
path = '../../oracle/rpc/runtime-api'
6 changes: 3 additions & 3 deletions crates/reward/rpc/runtime-api/Cargo.toml
View file
@@ -1,15 +1,15 @@
[package]
authors = ["Interlay Ltd"]
edition = "2021"
name = "module-reward-rpc-runtime-api"
name = "reward-rpc-runtime-api"
version = '0.3.0'

[dependencies]
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }

[dependencies.module-oracle-rpc-runtime-api]
[dependencies.oracle-rpc-runtime-api]
default-features = false
path = '../../../oracle/rpc/runtime-api'

Expand All @@ -19,5 +19,5 @@ std = [
"codec/std",
"frame-support/std",
"sp-api/std",
"module-oracle-rpc-runtime-api/std",
"oracle-rpc-runtime-api/std",
]
6 changes: 3 additions & 3 deletions crates/vault-registry/rpc/Cargo.toml
View file
@@ -1,7 +1,7 @@
[package]
authors = ["Interlay Ltd"]
edition = "2021"
name = "module-vault-registry-rpc"
name = "vault-registry-rpc"
version = '0.3.0'

[dependencies]
Expand All @@ -10,7 +10,7 @@ jsonrpsee = { version = "0.15.1", features = ["server", "macros"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
module-vault-registry-rpc-runtime-api = { path = "runtime-api" }
vault-registry-rpc-runtime-api = { path = "runtime-api" }

[dependencies.module-oracle-rpc-runtime-api]
[dependencies.oracle-rpc-runtime-api]
path = '../../oracle/rpc/runtime-api'
6 changes: 3 additions & 3 deletions crates/vault-registry/rpc/runtime-api/Cargo.toml
View file
@@ -1,7 +1,7 @@
[package]
authors = ["Interlay Ltd"]
edition = "2021"
name = "module-vault-registry-rpc-runtime-api"
name = "vault-registry-rpc-runtime-api"
version = '0.3.0'

[dependencies]
Expand All @@ -10,7 +10,7 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "pol
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }

[dependencies.module-oracle-rpc-runtime-api]
[dependencies.oracle-rpc-runtime-api]
default-features = false
path = '../../../oracle/rpc/runtime-api'

Expand All @@ -21,5 +21,5 @@ std = [
"frame-support/std",
"sp-api/std",
"sp-std/std",
"module-oracle-rpc-runtime-api/std",
"oracle-rpc-runtime-api/std",
]
16 changes: 8 additions & 8 deletions parachain/Cargo.toml
View file
Expand Up @@ -34,14 +34,14 @@ interbtc-rpc = { path = "../rpc" }
bitcoin = { path = "../crates/bitcoin" }
primitives = { package = "interbtc-primitives", path = "../primitives" }

module-btc-relay-rpc-runtime-api = { path = "../crates/btc-relay/rpc/runtime-api" }
module-oracle-rpc-runtime-api = { path = "../crates/oracle/rpc/runtime-api" }
module-vault-registry-rpc-runtime-api = { path = "../crates/vault-registry/rpc/runtime-api" }
module-escrow-rpc-runtime-api = { path = "../crates/escrow/rpc/runtime-api" }
module-reward-rpc-runtime-api = { path = "../crates/reward/rpc/runtime-api" }
module-issue-rpc-runtime-api = { path = "../crates/issue/rpc/runtime-api" }
module-redeem-rpc-runtime-api = { path = "../crates/redeem/rpc/runtime-api" }
module-replace-rpc-runtime-api = { path = "../crates/replace/rpc/runtime-api" }
btc-relay-rpc-runtime-api = { path = "../crates/btc-relay/rpc/runtime-api" }
oracle-rpc-runtime-api = { path = "../crates/oracle/rpc/runtime-api" }
vault-registry-rpc-runtime-api = { path = "../crates/vault-registry/rpc/runtime-api" }
escrow-rpc-runtime-api = { path = "../crates/escrow/rpc/runtime-api" }
reward-rpc-runtime-api = { path = "../crates/reward/rpc/runtime-api" }
issue-rpc-runtime-api = { path = "../crates/issue/rpc/runtime-api" }
redeem-rpc-runtime-api = { path = "../crates/redeem/rpc/runtime-api" }
replace-rpc-runtime-api = { path = "../crates/replace/rpc/runtime-api" }
loans-rpc-runtime-api = { path = "../crates/loans/rpc/runtime-api" }

# Substrate dependencies
Expand Down
32 changes: 16 additions & 16 deletions parachain/runtime/interlay/Cargo.toml
View file
Expand Up @@ -98,14 +98,14 @@ traits = { path = "../../../crates/traits", default-features = false }

primitives = { package = "interbtc-primitives", path = "../../../primitives", default-features = false }

module-btc-relay-rpc-runtime-api = { path = "../../../crates/btc-relay/rpc/runtime-api", default-features = false }
module-oracle-rpc-runtime-api = { path = "../../../crates/oracle/rpc/runtime-api", default-features = false }
module-vault-registry-rpc-runtime-api = { path = "../../../crates/vault-registry/rpc/runtime-api", default-features = false }
module-escrow-rpc-runtime-api = { path = "../../../crates/escrow/rpc/runtime-api", default-features = false }
module-reward-rpc-runtime-api = { path = "../../../crates/reward/rpc/runtime-api", default-features = false }
module-issue-rpc-runtime-api = { path = "../../../crates/issue/rpc/runtime-api", default-features = false }
module-redeem-rpc-runtime-api = { path = "../../../crates/redeem/rpc/runtime-api", default-features = false }
module-replace-rpc-runtime-api = { path = "../../../crates/replace/rpc/runtime-api", default-features = false }
btc-relay-rpc-runtime-api = { path = "../../../crates/btc-relay/rpc/runtime-api", default-features = false }
oracle-rpc-runtime-api = { path = "../../../crates/oracle/rpc/runtime-api", default-features = false }
vault-registry-rpc-runtime-api = { path = "../../../crates/vault-registry/rpc/runtime-api", default-features = false }
escrow-rpc-runtime-api = { path = "../../../crates/escrow/rpc/runtime-api", default-features = false }
reward-rpc-runtime-api = { path = "../../../crates/reward/rpc/runtime-api", default-features = false }
issue-rpc-runtime-api = { path = "../../../crates/issue/rpc/runtime-api", default-features = false }
redeem-rpc-runtime-api = { path = "../../../crates/redeem/rpc/runtime-api", default-features = false }
replace-rpc-runtime-api = { path = "../../../crates/replace/rpc/runtime-api", default-features = false }
loans-rpc-runtime-api = { path = "../../../crates/loans/rpc/runtime-api", default-features = false }

# Orml dependencies
Expand Down Expand Up @@ -213,14 +213,14 @@ std = [

"parachain-info/std",

"module-btc-relay-rpc-runtime-api/std",
"module-oracle-rpc-runtime-api/std",
"module-vault-registry-rpc-runtime-api/std",
"module-escrow-rpc-runtime-api/std",
"module-reward-rpc-runtime-api/std",
"module-issue-rpc-runtime-api/std",
"module-redeem-rpc-runtime-api/std",
"module-replace-rpc-runtime-api/std",
"btc-relay-rpc-runtime-api/std",
"oracle-rpc-runtime-api/std",
"vault-registry-rpc-runtime-api/std",
"escrow-rpc-runtime-api/std",
"reward-rpc-runtime-api/std",
"issue-rpc-runtime-api/std",
"redeem-rpc-runtime-api/std",
"replace-rpc-runtime-api/std",
"loans-rpc-runtime-api/std",

"orml-tokens/std",
Expand Down
32 changes: 16 additions & 16 deletions parachain/runtime/kintsugi/Cargo.toml
View file
Expand Up @@ -98,14 +98,14 @@ traits = { path = "../../../crates/traits", default-features = false }

primitives = { package = "interbtc-primitives", path = "../../../primitives", default-features = false }

module-btc-relay-rpc-runtime-api = { path = "../../../crates/btc-relay/rpc/runtime-api", default-features = false }
module-oracle-rpc-runtime-api = { path = "../../../crates/oracle/rpc/runtime-api", default-features = false }
module-vault-registry-rpc-runtime-api = { path = "../../../crates/vault-registry/rpc/runtime-api", default-features = false }
module-escrow-rpc-runtime-api = { path = "../../../crates/escrow/rpc/runtime-api", default-features = false }
module-reward-rpc-runtime-api = { path = "../../../crates/reward/rpc/runtime-api", default-features = false }
module-issue-rpc-runtime-api = { path = "../../../crates/issue/rpc/runtime-api", default-features = false }
module-redeem-rpc-runtime-api = { path = "../../../crates/redeem/rpc/runtime-api", default-features = false }
module-replace-rpc-runtime-api = { path = "../../../crates/replace/rpc/runtime-api", default-features = false }
btc-relay-rpc-runtime-api = { path = "../../../crates/btc-relay/rpc/runtime-api", default-features = false }
oracle-rpc-runtime-api = { path = "../../../crates/oracle/rpc/runtime-api", default-features = false }
vault-registry-rpc-runtime-api = { path = "../../../crates/vault-registry/rpc/runtime-api", default-features = false }
escrow-rpc-runtime-api = { path = "../../../crates/escrow/rpc/runtime-api", default-features = false }
reward-rpc-runtime-api = { path = "../../../crates/reward/rpc/runtime-api", default-features = false }
issue-rpc-runtime-api = { path = "../../../crates/issue/rpc/runtime-api", default-features = false }
redeem-rpc-runtime-api = { path = "../../../crates/redeem/rpc/runtime-api", default-features = false }
replace-rpc-runtime-api = { path = "../../../crates/replace/rpc/runtime-api", default-features = false }
loans-rpc-runtime-api = { path = "../../../crates/loans/rpc/runtime-api", default-features = false }

# Orml dependencies
Expand Down Expand Up @@ -217,14 +217,14 @@ std = [

"parachain-info/std",

"module-btc-relay-rpc-runtime-api/std",
"module-oracle-rpc-runtime-api/std",
"module-vault-registry-rpc-runtime-api/std",
"module-escrow-rpc-runtime-api/std",
"module-reward-rpc-runtime-api/std",
"module-issue-rpc-runtime-api/std",
"module-redeem-rpc-runtime-api/std",
"module-replace-rpc-runtime-api/std",
"btc-relay-rpc-runtime-api/std",
"oracle-rpc-runtime-api/std",
"vault-registry-rpc-runtime-api/std",
"escrow-rpc-runtime-api/std",
"reward-rpc-runtime-api/std",
"issue-rpc-runtime-api/std",
"redeem-rpc-runtime-api/std",
"replace-rpc-runtime-api/std",
"loans-rpc-runtime-api/std",

"orml-tokens/std",
Expand Down
24 changes: 12 additions & 12 deletions parachain/runtime/runtime-tests/Cargo.toml
View file
Expand Up @@ -106,12 +106,12 @@ testnet-interlay-runtime-parachain = { path = "../testnet-interlay", default-fea

primitives = { package = "interbtc-primitives", path = "../../../primitives", default-features = false }

module-btc-relay-rpc-runtime-api = { path = "../../../crates/btc-relay/rpc/runtime-api", default-features = false }
module-oracle-rpc-runtime-api = { path = "../../../crates/oracle/rpc/runtime-api", default-features = false }
module-vault-registry-rpc-runtime-api = { path = "../../../crates/vault-registry/rpc/runtime-api", default-features = false }
module-issue-rpc-runtime-api = { path = "../../../crates/issue/rpc/runtime-api", default-features = false }
module-redeem-rpc-runtime-api = { path = "../../../crates/redeem/rpc/runtime-api", default-features = false }
module-replace-rpc-runtime-api = { path = "../../../crates/replace/rpc/runtime-api", default-features = false }
btc-relay-rpc-runtime-api = { path = "../../../crates/btc-relay/rpc/runtime-api", default-features = false }
oracle-rpc-runtime-api = { path = "../../../crates/oracle/rpc/runtime-api", default-features = false }
vault-registry-rpc-runtime-api = { path = "../../../crates/vault-registry/rpc/runtime-api", default-features = false }
issue-rpc-runtime-api = { path = "../../../crates/issue/rpc/runtime-api", default-features = false }
redeem-rpc-runtime-api = { path = "../../../crates/redeem/rpc/runtime-api", default-features = false }
replace-rpc-runtime-api = { path = "../../../crates/replace/rpc/runtime-api", default-features = false }

# Orml dependencies
orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "f4ef99fb108232c4c1fe9ed54d08be3681b77669", default-features = false }
Expand Down Expand Up @@ -221,12 +221,12 @@ std = [

"parachain-info/std",

"module-btc-relay-rpc-runtime-api/std",
"module-oracle-rpc-runtime-api/std",
"module-vault-registry-rpc-runtime-api/std",
"module-issue-rpc-runtime-api/std",
"module-redeem-rpc-runtime-api/std",
"module-replace-rpc-runtime-api/std",
"btc-relay-rpc-runtime-api/std",
"oracle-rpc-runtime-api/std",
"vault-registry-rpc-runtime-api/std",
"issue-rpc-runtime-api/std",
"redeem-rpc-runtime-api/std",
"replace-rpc-runtime-api/std",

"orml-tokens/std",
"orml-traits/std",
Expand Down

0 comments on commit d87ae31

Please sign in to comment.