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

Remove move feature (#6605) (#6612)

Browse Source 
automerge
This commit is contained in:
mergify[bot]
2019-10-29 20:50:32 -07:00
committed by Grimes
parent 23b4df0fef
commit b054f5f12d
21 changed files with 11522 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
genesis_programs/Cargo.toml
View File

@@ -18,8 +18,6 @@ solana-config-api = { path = "../programs/config_api", version = "0.20.2" }
solana-config-program = { path = "../programs/config_program", version = "0.20.2" }
solana-exchange-api = { path = "../programs/exchange_api", version = "0.20.2" }
solana-exchange-program = { path = "../programs/exchange_program", version = "0.20.2" }
solana-move-loader-program = { path = "../programs/move_loader_program", version = "0.20.2", optional = true }
solana-move-loader-api = { path = "../programs/move_loader_api", version = "0.20.2", optional = true }
solana-runtime = { path = "../runtime", version = "0.20.2" }
solana-sdk = { path = "../sdk", version = "0.20.2" }
solana-stake-api = { path = "../programs/stake_api", version = "0.20.2" }
@@ -34,6 +32,3 @@ solana-vote-program = { path = "../programs/vote_program", version = "0.20.2" }
[lib]
crate-type = ["lib"]
name = "solana_genesis_programs"
[features]
move = ["solana-move-loader-program", "solana-move-loader-api"]

12
genesis_programs/src/lib.rs
View File

@@ -1,6 +1,6 @@
use solana_sdk::{
clock::Epoch, genesis_block::OperatingMode, pubkey::Pubkey,
system_program::solana_system_program,
clock::Epoch, genesis_block::OperatingMode, move_loader::solana_move_loader_program,
pubkey::Pubkey, system_program::solana_system_program,
};
#[macro_use]
@@ -11,9 +11,6 @@ extern crate solana_budget_program;
extern crate solana_config_program;
#[macro_use]
extern crate solana_exchange_program;
#[cfg(feature = "move")]
#[macro_use]
extern crate solana_move_loader_program;
#[macro_use]
extern crate solana_stake_program;
#[macro_use]
@@ -42,8 +39,7 @@ pub fn get(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(String, P
// Programs that are only available in Development mode
solana_budget_program!(),
solana_exchange_program!(),
#[cfg(feature = "move")]
solana_move_loader_program!(),
solana_move_loader_program(),
])
} else {
None
@@ -107,7 +103,7 @@ mod tests {
#[test]
fn test_development_programs() {
assert_eq!(get(OperatingMode::Development, 0).unwrap().len(), 9);
assert_eq!(get(OperatingMode::Development, 0).unwrap().len(), 10);
assert_eq!(get(OperatingMode::Development, 1), None);
}