Skip to content

Commit ec4c8a0

Browse files
jasljasl
committed
Regroup Phala pallets
1 parent dd304c8 commit ec4c8a0

File tree

49 files changed

+148
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+148
-152
lines changed

‎Cargo.lock‎

Lines changed: 78 additions & 78 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@ exclude = [
1010
]
1111

1212
members = [
13-
"common/types",
1413
"standalone/executor",
1514
"standalone/rpc",
16-
"standalone/node",
15+
"standalone/node",
1716
"standalone/runtime",
1817
"standalone/pherry",
19-
"crates/trie-storage",
18+
"crates/phala-trie-storage",
2019
"crates/phala-mq",
21-
"crates/crypto",
20+
"crates/phala-crypto",
2221
"crates/prpc",
2322
"crates/prpc-build",
23+
"crates/phala-node-rpc-ext",
24+
"crates/phala-types",
2425
"pallets/phala",
2526
"pallets/phala/mq-runtime-api",
2627
"pallets/bridge",

crates/crypto/Cargo.toml renamed to crates/phala-crypto/Cargo.toml

File renamed without changes.

crates/crypto/src/aead.rs renamed to crates/phala-crypto/src/aead.rs

File renamed without changes.

crates/crypto/src/ecdh.rs renamed to crates/phala-crypto/src/ecdh.rs

File renamed without changes.

crates/crypto/src/lib.rs renamed to crates/phala-crypto/src/lib.rs

File renamed without changes.

crates/crypto/src/sr25519.rs renamed to crates/phala-crypto/src/sr25519.rs

File renamed without changes.

standalone/rpc-ext/Cargo.toml renamed to crates/phala-node-rpc-ext/Cargo.toml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "rpc-ext"
2+
name = "phala-node-rpc-ext"
33
version = "0.1.0"
44
edition = "2018"
55
authors = ["Phala Network"]
@@ -27,11 +27,8 @@ sp-api = { path = "../../substrate/primitives/api" }
2727
# client dependencies
2828
sc-client-api = { path = "../../substrate/client/api" }
2929
sc-transaction-pool-api = { path = "../../substrate/client/transaction-pool/api" }
30+
sc-rpc = { path = "../../substrate/client/rpc" }
3031

3132
phala-mq = { path = "../../crates/phala-mq", default-features = false }
3233
phala-pallets = { path = "../../pallets/phala", default-features = false }
3334
pallet-mq-runtime-api = { path = "../../pallets/phala/mq-runtime-api", default-features = false }
34-
35-
# node-specific dependencies
36-
node-rpc = { version = "2.0.0", path = "../rpc" }
37-

standalone/rpc-ext/src/lib.rs renamed to crates/phala-node-rpc-ext/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use std::sync::Arc;
33

44
use jsonrpc_derive::rpc;
55
use mq_seq::Error as MqSeqError;
6-
use node_rpc::IoHandler;
76
use pallet_mq_runtime_api::MqApi;
87
use sc_client_api::blockchain::{HeaderBackend, HeaderMetadata};
98
use sc_client_api::{backend, Backend, BlockBackend, StorageProvider};
@@ -102,7 +101,7 @@ where
102101
}
103102

104103
pub fn extend_rpc<Client, BE, Block, P>(
105-
io: &mut IoHandler,
104+
io: &mut jsonrpc_core::IoHandler<sc_rpc::Metadata>,
106105
client: Arc<Client>,
107106
backend: Arc<BE>,
108107
is_archive_mode: bool,

standalone/rpc-ext/src/mq_seq.rs renamed to crates/phala-node-rpc-ext/src/mq_seq.rs

File renamed without changes.

0 commit comments

Comments
 (0)