Companion for polkadot#5569 (#1281)

* Companion for polkadot#5569

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* update lockfile for {"polkadot"}

Co-authored-by: parity-processbot <>
This commit is contained in:
Qinxuan Chen
2022-05-21 17:14:02 +08:00
committed by GitHub
parent 5db6491add
commit 12221cb534
4 changed files with 262 additions and 262 deletions
+246 -246
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -478,8 +478,8 @@ mod tests {
.0 .0
.into_memory_db(); .into_memory_db();
let backend = let backend = sp_state_machine::new_in_mem_hash_key::<BlakeTwo256>()
sp_state_machine::new_in_mem::<BlakeTwo256>().update_backend(*header.state_root(), db); .update_backend(*header.state_root(), db);
// Should return an error, as it was not included while building the proof. // Should return an error, as it was not included while building the proof.
assert!(backend assert!(backend
+4 -4
View File
@@ -46,13 +46,13 @@ where
C::Api: BlockBuilder<Block>, C::Api: BlockBuilder<Block>,
P: TransactionPool + Sync + Send + 'static, P: TransactionPool + Sync + Send + 'static,
{ {
use pallet_transaction_payment_rpc::{TransactionPaymentApiServer, TransactionPaymentRpc}; use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
use substrate_frame_rpc_system::{SystemApiServer, SystemRpc}; use substrate_frame_rpc_system::{System, SystemApiServer};
let mut module = RpcExtension::new(()); let mut module = RpcExtension::new(());
let FullDeps { client, pool, deny_unsafe } = deps; let FullDeps { client, pool, deny_unsafe } = deps;
module.merge(SystemRpc::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?; module.merge(System::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?;
module.merge(TransactionPaymentRpc::new(client.clone()).into_rpc())?; module.merge(TransactionPayment::new(client.clone()).into_rpc())?;
Ok(module) Ok(module)
} }
+10 -10
View File
@@ -58,14 +58,14 @@ where
C::Api: BlockBuilder<Block>, C::Api: BlockBuilder<Block>,
P: TransactionPool + Sync + Send + 'static, P: TransactionPool + Sync + Send + 'static,
{ {
use frame_rpc_system::{SystemApiServer, SystemRpc}; use frame_rpc_system::{System, SystemApiServer};
use pallet_transaction_payment_rpc::{TransactionPaymentApiServer, TransactionPaymentRpc}; use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
let mut module = RpcExtension::new(()); let mut module = RpcExtension::new(());
let FullDeps { client, pool, deny_unsafe } = deps; let FullDeps { client, pool, deny_unsafe } = deps;
module.merge(SystemRpc::new(client.clone(), pool, deny_unsafe).into_rpc())?; module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?;
module.merge(TransactionPaymentRpc::new(client.clone()).into_rpc())?; module.merge(TransactionPayment::new(client.clone()).into_rpc())?;
Ok(module) Ok(module)
} }
@@ -89,17 +89,17 @@ where
C::Api: BlockBuilder<Block>, C::Api: BlockBuilder<Block>,
P: TransactionPool + Sync + Send + 'static, P: TransactionPool + Sync + Send + 'static,
{ {
use frame_rpc_system::{SystemApiServer, SystemRpc}; use frame_rpc_system::{System, SystemApiServer};
use pallet_contracts_rpc::{ContractsApiServer, ContractsRpc}; use pallet_contracts_rpc::{Contracts, ContractsApiServer};
use pallet_transaction_payment_rpc::{TransactionPaymentApiServer, TransactionPaymentRpc}; use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
use sc_rpc::dev::{Dev, DevApiServer}; use sc_rpc::dev::{Dev, DevApiServer};
let mut module = RpcExtension::new(()); let mut module = RpcExtension::new(());
let FullDeps { client, pool, deny_unsafe } = deps; let FullDeps { client, pool, deny_unsafe } = deps;
module.merge(SystemRpc::new(client.clone(), pool, deny_unsafe).into_rpc())?; module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?;
module.merge(TransactionPaymentRpc::new(client.clone()).into_rpc())?; module.merge(TransactionPayment::new(client.clone()).into_rpc())?;
module.merge(ContractsRpc::new(client.clone()).into_rpc())?; module.merge(Contracts::new(client.clone()).into_rpc())?;
module.merge(Dev::new(client, deny_unsafe).into_rpc())?; module.merge(Dev::new(client, deny_unsafe).into_rpc())?;
Ok(module) Ok(module)