Remove DID RPC

Cargo.toml

@@ -5,7 +5,6 @@ panic = "unwind"
 members = [
   "nodes/*",
   "pallets/*",
-  "rpc/did",
   "rpc/did/runtime-api",
   "rpc/public-credentials",
   "rpc/public-credentials/runtime-api",

nodes/parachain/Cargo.toml

@@ -17,9 +17,7 @@ substrate-build-script-utils = {git = "https://github.com/paritytech/substrate",
 
 # Internal dependencies
 clone-runtime = {path = "../../runtimes/clone"}
-did-rpc = {path = "../../rpc/did"}
 node-common = {path = "../common"}
-pallet-did-lookup = {path = "../../pallets/pallet-did-lookup"}
 peregrine-runtime = {path = "../../runtimes/peregrine"}
 public-credentials = {path = "../../pallets/public-credentials"}
 public-credentials-rpc = {path = "../../rpc/public-credentials"}
@@ -106,7 +104,6 @@ fast-gov = [
   "runtime-common/fast-gov",
 ]
 runtime-benchmarks = [
-  "pallet-did-lookup/runtime-benchmarks",
   "polkadot-service/runtime-benchmarks",
   "peregrine-runtime/runtime-benchmarks",
   "public-credentials/runtime-benchmarks",

nodes/parachain/src/rpc.rs

@@ -33,7 +33,6 @@ use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 
-use pallet_did_lookup::linkable_account::LinkableAccountId;
 use public_credentials::CredentialEntry;
 use runtime_common::{
 	assets::AssetDid, authorization::AuthorizationId, AccountId, Balance, Block, BlockNumber, DidIdentifier, Hash,
@@ -59,7 +58,6 @@ where
 	C::Api: frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
 	C::Api: BlockBuilder<Block>,
-	C::Api: did_rpc::DidRuntimeApi<Block, DidIdentifier, AccountId, LinkableAccountId, Balance, Hash, BlockNumber>,
 	C::Api: public_credentials_rpc::PublicCredentialsRuntimeApi<
 		Block,
 		AssetDid,
@@ -68,7 +66,6 @@ where
 	>,
 	P: TransactionPool + 'static,
 {
-	use did_rpc::{DidApiServer, DidQuery};
 	use frame_rpc_system::{System, SystemApiServer};
 	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
 	use public_credentials_rpc::{PublicCredentialsApiServer, PublicCredentialsQuery};
@@ -87,7 +84,6 @@ where
 	// to call into the runtime.
 	//
 	// `module.merge(YourRpcStruct::new(ReferenceToClient).into_rpc())?;`
-	module.merge(DidQuery::new(client.clone()).into_rpc())?;
 	module.merge(
 		PublicCredentialsQuery::<
 			C,

nodes/parachain/src/service.rs

@@ -42,7 +42,6 @@ use sp_runtime::traits::BlakeTwo256;
 use std::{sync::Arc, time::Duration};
 use substrate_prometheus_endpoint::Registry;
 
-use pallet_did_lookup::linkable_account::LinkableAccountId;
 use public_credentials::CredentialEntry;
 use runtime_common::{
 	assets::AssetDid, authorization::AuthorizationId, AccountId, AuthorityId, Balance, BlockNumber, DidIdentifier,
@@ -257,7 +256,6 @@ where
 		+ cumulus_primitives_core::CollectCollationInfo<Block>
 		+ pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>
 		+ frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
-		+ did_rpc::DidRuntimeApi<Block, DidIdentifier, AccountId, LinkableAccountId, Balance, Hash, BlockNumber>
 		+ public_credentials_rpc::PublicCredentialsRuntimeApi<
 			Block,
 			AssetDid,
@@ -502,7 +500,6 @@ where
 		+ pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>
 		+ sp_consensus_aura::AuraApi<Block, AuthorityId>
 		+ cumulus_primitives_core::CollectCollationInfo<Block>
-		+ did_rpc::DidRuntimeApi<Block, DidIdentifier, AccountId, LinkableAccountId, Balance, Hash, BlockNumber>
 		+ public_credentials_rpc::PublicCredentialsRuntimeApi<
 			Block,
 			AssetDid,

nodes/standalone/Cargo.toml

@@ -15,10 +15,8 @@ substrate-build-script-utils = {git = "https://github.com/paritytech/substrate",
 [dependencies]
 
 # Internal dependencies
-did-rpc = {path = "../../rpc/did"}
 mashnet-node-runtime = {path = "../../runtimes/standalone"}
 node-common = {path = "../common"}
-pallet-did-lookup = {path = "../../pallets/pallet-did-lookup"}
 public-credentials = {path = "../../pallets/public-credentials"}
 public-credentials-rpc = {path = "../../rpc/public-credentials"}
 runtime-common = {path = "../../runtimes/common"}
@@ -77,7 +75,6 @@ try-runtime-cli = {git = "https://github.com/paritytech/substrate", branch = "po
 default = []
 runtime-benchmarks = [
   "mashnet-node-runtime/runtime-benchmarks",
-  "pallet-did-lookup/runtime-benchmarks",
   "public-credentials/runtime-benchmarks",
   "runtime-common/runtime-benchmarks",
 ]

nodes/standalone/src/rpc.rs

@@ -33,7 +33,6 @@ use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 
-use pallet_did_lookup::linkable_account::LinkableAccountId;
 use public_credentials::CredentialEntry;
 use runtime_common::{
 	assets::AssetDid, authorization::AuthorizationId, AccountId, Balance, Block, BlockNumber, DidIdentifier, Hash,
@@ -59,7 +58,6 @@ where
 	C::Api: frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
 	C::Api: BlockBuilder<Block>,
-	C::Api: did_rpc::DidRuntimeApi<Block, DidIdentifier, AccountId, LinkableAccountId, Balance, Hash, BlockNumber>,
 	C::Api: public_credentials_rpc::PublicCredentialsRuntimeApi<
 		Block,
 		AssetDid,
@@ -68,7 +66,6 @@ where
 	>,
 	P: TransactionPool + 'static,
 {
-	use did_rpc::{DidApiServer, DidQuery};
 	use frame_rpc_system::{System, SystemApiServer};
 	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
 	use public_credentials_rpc::{PublicCredentialsApiServer, PublicCredentialsQuery};
@@ -88,7 +85,6 @@ where
 	// to call into the runtime.
 	//
 	// `module.merge(YourRpcStruct::new(ReferenceToClient).into_rpc())?;`
-	module.merge(DidQuery::new(client.clone()).into_rpc())?;
 	module.merge(
 		PublicCredentialsQuery::<
 			C,