Skip to content

Commit

Permalink
chore: rename sender -> provider and receiver -> consumer (#503)
Browse files Browse the repository at this point in the history
Fixes KILTprotocol/ticket#2588, based on top
of #502.

Won't be reviewed as it is merely a renaming PR. Will merge onto
`aa/dip` once #502 gets
reviewed and merged.
  • Loading branch information
ntn-x2 authored Apr 13, 2023
1 parent 4567409 commit 4f6fe1f
Show file tree
Hide file tree
Showing 46 changed files with 167 additions and 164 deletions.
32 changes: 16 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ attestation = {path = "pallets/attestation", default-features = false}
ctype = {path = "pallets/ctype", default-features = false}
delegation = {path = "pallets/delegation", default-features = false}
did = {path = "pallets/did", default-features = false}
pallet-dip-receiver = {path = "pallets/pallet-dip-receiver", default-features = false}
pallet-dip-sender = {path = "pallets/pallet-dip-sender", default-features = false}
pallet-dip-consumer = {path = "pallets/pallet-dip-consumer", default-features = false}
pallet-dip-provider = {path = "pallets/pallet-dip-provider", default-features = false}
pallet-did-lookup = {path = "pallets/pallet-did-lookup", default-features = false}
pallet-inflation = {path = "pallets/pallet-inflation", default-features = false}
pallet-web3-names = {path = "pallets/pallet-web3-names", default-features = false}
Expand All @@ -66,12 +66,12 @@ kilt-support = {path = "support", default-features = false}
runtime-common = {path = "runtimes/common", default-features = false}

# Templates
dip-receiver-runtime-template = {path = "dip-template/runtimes/dip-receiver", default-features = false}
dip-sender-runtime-template = {path = "dip-template/runtimes/dip-sender", default-features = false}
dip-consumer-runtime-template = {path = "dip-template/runtimes/dip-consumer", default-features = false}
dip-provider-runtime-template = {path = "dip-template/runtimes/dip-provider", default-features = false}

# Internal runtime API (with default disabled)
kilt-runtime-api-did = {path = "runtime-api/did", default-features = false}
kilt-runtime-api-dip-sender = {path = "runtime-api/dip-sender", default-features = false}
kilt-runtime-api-dip-provider = {path = "runtime-api/dip-provider", default-features = false}
kilt-runtime-api-public-credentials = {path = "runtime-api/public-credentials", default-features = false}
kilt-runtime-api-staking = {path = "runtime-api/staking", default-features = false}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ license-file.workspace = true
readme.workspace = true
repository.workspace = true
version.workspace = true
name = "dip-receiver-node-template"
description = "Node template for the KILT Decentralized Identity Provider (DIP) receiver."
name = "dip-consumer-node-template"
description = "Node template for the KILT Decentralized Identity Provider (DIP) consumer."
build = "build.rs"

[dependencies]
Expand All @@ -19,7 +19,7 @@ serde = {workspace = true, features = ["std", "derive"]}
jsonrpsee = {workspace = true, features = ["server"]}

# Internal dependencies
dip-receiver-runtime-template = { workspace = true, features = ["std"] }
dip-consumer-runtime-template = { workspace = true, features = ["std"] }

# Substrate
frame-benchmarking.workspace = true
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// If you feel like getting in touch with us, you can do so at [email protected]

use cumulus_primitives_core::ParaId;
use dip_receiver_runtime_template::{
use dip_consumer_runtime_template::{
AccountId, AuraId, BalancesConfig, CollatorSelectionConfig, GenesisConfig, ParachainInfoConfig, SessionConfig,
SessionKeys, Signature, SudoConfig, SystemConfig, EXISTENTIAL_DEPOSIT, SS58_PREFIX, WASM_BINARY,
};
Expand Down Expand Up @@ -111,8 +111,8 @@ pub fn development_config() -> ChainSpec {
properties.insert("ss58Format".into(), SS58_PREFIX.into());

ChainSpec::from_genesis(
"DIP receiver dev",
"dip-receiver-dev",
"DIP consumer dev",
"dip-consumer-dev",
ChainType::Development,
move || {
testnet_genesis(
Expand All @@ -133,7 +133,7 @@ pub fn development_config() -> ChainSpec {
},
Vec::new(),
None,
"dip-receiver-dev".into(),
"dip-consumer-dev".into(),
None,
None,
Extensions {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use std::{fs::create_dir_all, net::SocketAddr};
use codec::Encode;
use cumulus_client_cli::generate_genesis_block;
use cumulus_primitives_core::ParaId;
use dip_receiver_runtime_template::Block;
use dip_consumer_runtime_template::Block;
use log::{info, warn};
use sc_cli::{
ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, LoggerBuilder,
Expand Down Expand Up @@ -51,7 +51,7 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {

impl SubstrateCli for Cli {
fn impl_name() -> String {
"DIP Receiver Node Template".into()
"DIP Consumer Node Template".into()
}

fn impl_version() -> String {
Expand All @@ -60,7 +60,7 @@ impl SubstrateCli for Cli {

fn description() -> String {
format!(
"DIP Receiver Node Template\n\nThe command-line arguments provided first will be \
"DIP Consumer Node Template\n\nThe command-line arguments provided first will be \
passed to the parachain node, while the arguments provided after -- will be passed \
to the relay chain node.\n\n\
{} <parachain-args> -- <relay-chain-args>",
Expand All @@ -85,13 +85,13 @@ impl SubstrateCli for Cli {
}

fn native_runtime_version(_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
&dip_receiver_runtime_template::VERSION
&dip_consumer_runtime_template::VERSION
}
}

impl SubstrateCli for RelayChainCli {
fn impl_name() -> String {
"DIP Receiver Node Template".into()
"DIP Consumer Node Template".into()
}

fn impl_version() -> String {
Expand All @@ -100,7 +100,7 @@ impl SubstrateCli for RelayChainCli {

fn description() -> String {
format!(
"DIP Receiver Node Template\n\nThe command-line arguments provided first will be \
"DIP Consumer Node Template\n\nThe command-line arguments provided first will be \
passed to the parachain node, while the arguments provided after -- will be passed \
to the relay chain node.\n\n\
{} <parachain-args> -- <relay-chain-args>",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

// If you feel like getting in touch with us, you can do so at [email protected]

//! KILT Decentralized Identity Provider (DIP) sender CLI.
//! KILT Decentralized Identity Provider (DIP) consumer CLI.

#![warn(missing_docs)]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use substrate_frame_rpc_system::AccountNonceApi;

use std::{error::Error, sync::Arc};

use dip_receiver_runtime_template::{AccountId, Balance, Index as Nonce, NodeBlock as Block};
use dip_consumer_runtime_template::{AccountId, Balance, Index as Nonce, NodeBlock as Block};
use jsonrpsee::RpcModule;
use pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi;
use sc_client_api::AuxStore;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use cumulus_client_service::{
use cumulus_primitives_core::ParaId;
use cumulus_primitives_parachain_inherent::ParachainInherentData;
use cumulus_relay_chain_interface::RelayChainInterface;
use dip_receiver_runtime_template::{api, native_version, Hash, NodeBlock as Block, RuntimeApi};
use dip_consumer_runtime_template::{api, native_version, Hash, NodeBlock as Block, RuntimeApi};
use frame_benchmarking::benchmarking::HostFunctions;
use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE;
use sc_basic_authorship::ProposerFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ license-file.workspace = true
readme.workspace = true
repository.workspace = true
version.workspace = true
name = "dip-sender-node-template"
description = "Node template for the KILT Decentralized Identity Provider (DIP) sender."
name = "dip-provider-node-template"
description = "Node template for the KILT Decentralized Identity Provider (DIP) provider."
build = "build.rs"

[dependencies]
Expand All @@ -19,7 +19,7 @@ serde = {workspace = true, features = ["std", "derive"]}
jsonrpsee = {workspace = true, features = ["server"]}

# Internal dependencies
dip-sender-runtime-template = { workspace = true, features = ["std"] }
dip-provider-runtime-template = { workspace = true, features = ["std"] }

# Substrate
frame-benchmarking.workspace = true
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// If you feel like getting in touch with us, you can do so at [email protected]

use cumulus_primitives_core::ParaId;
use dip_sender_runtime_template::{
use dip_provider_runtime_template::{
AccountId, AuraId, BalancesConfig, CollatorSelectionConfig, GenesisConfig, ParachainInfoConfig, SessionConfig,
SessionKeys, Signature, SudoConfig, SystemConfig, EXISTENTIAL_DEPOSIT, SS58_PREFIX, WASM_BINARY,
};
Expand Down Expand Up @@ -110,8 +110,8 @@ pub fn development_config() -> ChainSpec {
properties.insert("ss58Format".into(), SS58_PREFIX.into());

ChainSpec::from_genesis(
"DIP sender dev",
"dip-sender-dev",
"DIP provider dev",
"dip-provider-dev",
ChainType::Development,
move || {
testnet_genesis(
Expand All @@ -132,7 +132,7 @@ pub fn development_config() -> ChainSpec {
},
Vec::new(),
None,
"dip-sender-dev".into(),
"dip-provider-dev".into(),
None,
None,
Extensions {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use std::{fs::create_dir_all, net::SocketAddr};
use codec::Encode;
use cumulus_client_cli::generate_genesis_block;
use cumulus_primitives_core::ParaId;
use dip_sender_runtime_template::Block;
use dip_provider_runtime_template::Block;
use log::{info, warn};
use sc_cli::{
ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, LoggerBuilder,
Expand Down Expand Up @@ -51,7 +51,7 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {

impl SubstrateCli for Cli {
fn impl_name() -> String {
"DIP Sender Node Template".into()
"DIP Provider Node Template".into()
}

fn impl_version() -> String {
Expand All @@ -60,7 +60,7 @@ impl SubstrateCli for Cli {

fn description() -> String {
format!(
"DIP Sender Node Template\n\nThe command-line arguments provided first will be \
"DIP Provider Node Template\n\nThe command-line arguments provided first will be \
passed to the parachain node, while the arguments provided after -- will be passed \
to the relay chain node.\n\n\
{} <parachain-args> -- <relay-chain-args>",
Expand All @@ -85,13 +85,13 @@ impl SubstrateCli for Cli {
}

fn native_runtime_version(_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
&dip_sender_runtime_template::VERSION
&dip_provider_runtime_template::VERSION
}
}

impl SubstrateCli for RelayChainCli {
fn impl_name() -> String {
"DIP Sender Node Template".into()
"DIP Provider Node Template".into()
}

fn impl_version() -> String {
Expand All @@ -100,7 +100,7 @@ impl SubstrateCli for RelayChainCli {

fn description() -> String {
format!(
"DIP Sender Node Template\n\nThe command-line arguments provided first will be \
"DIP Provider Node Template\n\nThe command-line arguments provided first will be \
passed to the parachain node, while the arguments provided after -- will be passed \
to the relay chain node.\n\n\
{} <parachain-args> -- <relay-chain-args>",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

// If you feel like getting in touch with us, you can do so at [email protected]

//! KILT Decentralized Identity Provider (DIP) receiver CLI.
//! KILT Decentralized Identity Provider (DIP) Provider CLI.

#![warn(missing_docs)]

Expand Down
Loading

0 comments on commit 4f6fe1f

Please sign in to comment.