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

7
runtime/Cargo.toml
View File

@ -27,11 +27,10 @@ serde_json = "1.0.41"
solana-logger = { path = "../logger", version = "0.21.0" }
solana-measure = { path = "../measure", version = "0.21.0" }
solana-metrics = { path = "../metrics", version = "0.21.0" }
solana-bpf-loader-api = { path = "../programs/bpf_loader_api", version = "0.21.0" }
solana-bpf-loader-program = { path = "../programs/bpf_loader_program", version = "0.21.0" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", 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" }
sys-info = "0.5.8"
tempfile = "3.1.0"
@ -43,4 +42,4 @@ crate-type = ["lib"]
name = "solana_runtime"
[dev-dependencies]
solana-noop-program = { path = "../programs/noop_program", version = "0.21.0" }
solana-noop-program = { path = "../programs/noop", version = "0.21.0" }

2
runtime/src/genesis_utils.rs
View File

@ -86,7 +86,7 @@ pub fn create_genesis_config_with_leader(
};
solana_stake_program::add_genesis_accounts(&mut genesis_config);
solana_storage_api::rewards_pools::add_genesis_accounts(&mut genesis_config);
solana_storage_program::rewards_pools::add_genesis_accounts(&mut genesis_config);
GenesisConfigInfo {
genesis_config,

22
runtime/src/storage_utils.rs
View File

@ -2,7 +2,7 @@ use crate::bank::Bank;
use solana_sdk::account::Account;
use solana_sdk::account_utils::State;
use solana_sdk::pubkey::Pubkey;
use solana_storage_api::storage_contract::StorageContract;
use solana_storage_program::storage_contract::StorageContract;
use std::collections::{HashMap, HashSet};
#[derive(Default, Clone, PartialEq, Debug, Deserialize, Serialize)]
@ -19,7 +19,7 @@ pub struct StorageAccounts {
}
pub fn is_storage(account: &Account) -> bool {
solana_storage_api::check_id(&account.owner)
solana_storage_program::check_id(&account.owner)
}
impl StorageAccounts {
@ -86,7 +86,7 @@ pub(crate) mod tests {
use solana_sdk::genesis_config::create_genesis_config;
use solana_sdk::message::Message;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_storage_api::{
use solana_storage_program::{
storage_contract::{StorageAccount, STORAGE_ACCOUNT_SPACE},
storage_instruction::{self, StorageAccountType},
storage_processor,
@ -103,7 +103,7 @@ pub(crate) mod tests {
let validator_pubkey = validator_keypair.pubkey();
let mut bank = Bank::new(&genesis_config);
bank.add_instruction_processor(
solana_storage_api::id(),
solana_storage_program::id(),
storage_processor::process_instruction,
);
@ -191,8 +191,11 @@ pub(crate) mod tests {
let validator_pubkey = Pubkey::new_rand();
let archiver_pubkey = Pubkey::new_rand();
let mut validator_account =
Account::new(1, STORAGE_ACCOUNT_SPACE as usize, &solana_storage_api::id());
let mut validator_account = Account::new(
1,
STORAGE_ACCOUNT_SPACE as usize,
&solana_storage_program::id(),
);
let mut validator = StorageAccount::new(validator_pubkey, &mut validator_account);
validator
.initialize_storage(validator_pubkey, StorageAccountType::Validator)
@ -207,8 +210,11 @@ pub(crate) mod tests {
}
validator_account.set_state(storage_contract).unwrap();
let mut archiver_account =
Account::new(1, STORAGE_ACCOUNT_SPACE as usize, &solana_storage_api::id());
let mut archiver_account = Account::new(
1,
STORAGE_ACCOUNT_SPACE as usize,
&solana_storage_program::id(),
);
let mut archiver = StorageAccount::new(archiver_pubkey, &mut archiver_account);
archiver
.initialize_storage(archiver_pubkey, StorageAccountType::Archiver)