Skip to content

align naming #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brenzi merged 8 commits into from
Oct 4, 2021
Merged

align naming #61

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
da95652
align naming
Oct 4, 2021
b4ea8bd
WIP
Oct 4, 2021
4ea2b5a
simplify chain_spec.rs
brenzi Oct 4, 2021
66d3e83
more renaming
brenzi Oct 4, 2021
8d7f900
cosmetics
brenzi Oct 4, 2021
dd94052
fix
brenzi Oct 4, 2021
f823c3e
reasonable prefunding that allows for 20 proxy deposit
brenzi Oct 4, 2021
b557c11
fmt
brenzi Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
more renaming
  • Loading branch information
@brenzi
brenzi committed Oct 4, 2021
commit 66d3e83d1e6efd702721077f4b5f39138d2895ae
51 changes: 28 additions & 23 deletions node/res/cranny.json
View file
Open in desktop

Large diffs are not rendered by default.

51 changes: 0 additions & 51 deletions node/res/integritee-mainnet.json
View file
Open in desktop

This file was deleted.

61 changes: 61 additions & 0 deletions node/res/integritee-solo.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions node/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ pub fn treasury_account_id() -> AccountId {
pub fn multisig_account(mut accounts: Vec<AccountId>, threshold: u16) -> AccountId {
// sort accounts by public key, as js/apps would do
accounts.sort_by(|a, b| (*a).encode_hex::<String>().cmp(&(*b).encode_hex::<String>()));
println!("sorted multisig account members: {:?}", accounts);
Multisig::multi_account_id(&accounts, threshold)
}

Expand Down Expand Up @@ -155,7 +154,7 @@ pub fn local_testnet_config() -> Result<ChainSpec, String> {
))
}

pub fn integritee_mainnet_fresh_config() -> Result<ChainSpec, String> {
pub fn integritee_solo_fresh_config() -> Result<ChainSpec, String> {
let wasm_binary = WASM_BINARY.ok_or_else(|| "wasm not available".to_string())?;

let sudo_account: AccountId =
Expand Down Expand Up @@ -388,8 +387,8 @@ fn genesis_config(

/// hard-coded configs

pub fn integritee_mainnet_config() -> Result<ChainSpec, String> {
ChainSpec::from_json_bytes(&include_bytes!("../res/integritee-mainnet.json")[..])
pub fn integritee_solo_config() -> Result<ChainSpec, String> {
ChainSpec::from_json_bytes(&include_bytes!("../res/integritee-solo.json")[..])
}

pub fn cranny_config() -> Result<ChainSpec, String> {
Expand Down
4 changes: 2 additions & 2 deletions node/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ impl SubstrateCli for Cli {
fn load_spec(&self, id: &str) -> Result<Box<dyn sc_service::ChainSpec>, String> {
Ok(match id {
"dev" => Box::new(chain_spec::development_config()?),
"integritee-mainnet-fresh" => Box::new(chain_spec::integritee_mainnet_fresh_config()?),
"integritee-mainnet" => Box::new(chain_spec::integritee_mainnet_config()?),
"integritee-solo-fresh" => Box::new(chain_spec::integritee_solo_fresh_config()?),
"integritee-solo" => Box::new(chain_spec::integritee_solo_config()?),
"cranny-fresh" => Box::new(chain_spec::cranny_fresh_config()?),
"cranny" => Box::new(chain_spec::cranny_config()?),
"" | "local" => Box::new(chain_spec::local_testnet_config()?),
Expand Down