gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge api/program into single units (#7061)

Browse Source
This commit is contained in:
Jack May
2019-11-20 16:32:19 -08:00
committed by GitHub
parent 186bf7ae32
commit 3415db9739
105 changed files with 224 additions and 4095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
genesis/Cargo.toml
View File

@@ -20,6 +20,6 @@ solana-genesis-programs = { path = "../genesis-programs", version = "0.21.0" }
solana-ledger = { path = "../ledger", version = "0.21.0" }
solana-sdk = { path = "../sdk", version = "0.21.0" }
solana-stake-program = { path = "../programs/stake", version = "0.21.0" }
solana-storage-api = { path = "../programs/storage_api", version = "0.21.0" }
solana-storage-program = { path = "../programs/storage", version = "0.21.0" }
solana-vote-program = { path = "../programs/vote", version = "0.21.0" }
tempfile = "3.1.0"

6
genesis/src/main.rs
View File

@@ -21,7 +21,7 @@ use solana_sdk::{
system_program, timing,
};
use solana_stake_program::stake_state;
use solana_storage_api::storage_contract;
use solana_storage_program::storage_contract;
use solana_vote_program::vote_state;
use std::{collections::HashMap, error, fs::File, io, path::PathBuf, str::FromStr, time::Duration};
@@ -445,7 +445,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
}
// add genesis stuff from storage and stake
solana_storage_api::rewards_pools::add_genesis_accounts(&mut genesis_config);
solana_storage_program::rewards_pools::add_genesis_accounts(&mut genesis_config);
solana_stake_program::add_genesis_accounts(&mut genesis_config);
create_new_ledger(&ledger_path, &genesis_config)?;
@@ -682,7 +682,7 @@ mod tests {
)
.expect("genesis");
solana_storage_api::rewards_pools::add_genesis_accounts(&mut genesis_config);
solana_storage_program::rewards_pools::add_genesis_accounts(&mut genesis_config);
remove_file(path).unwrap();