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

Boot token_program from the SDK

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-03-04 20:28:43 -07:00
parent e4be57c3b6
commit 5e9f802d7d
7 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/Cargo.toml
View File

@ -26,6 +26,7 @@ solana-logger = { path = "../logger", version = "0.12.0" }
solana-metrics = { path = "../metrics", version = "0.12.0" }
solana-sdk = { path = "../sdk", version = "0.12.0" }
solana-system-program = { path = "../programs/system", version = "0.12.0" }
solana-token-api = { path = "../programs/token_api", version = "0.12.0" }
solana-vote-api = { path = "../programs/vote_api", version = "0.12.0" }
[lib]

9
runtime/src/bank.rs
View File

@ -10,7 +10,6 @@ use crate::status_cache::StatusCache;
use bincode::serialize;
use hashbrown::HashMap;
use log::*;
use solana_budget_api;
use solana_metrics::counter::Counter;
use solana_sdk::account::Account;
use solana_sdk::bpf_loader;
@ -24,9 +23,7 @@ use solana_sdk::storage_program;
use solana_sdk::system_program;
use solana_sdk::system_transaction::SystemTransaction;
use solana_sdk::timing::{duration_as_us, MAX_RECENT_BLOCKHASHES, NUM_TICKS_PER_SECOND};
use solana_sdk::token_program;
use solana_sdk::transaction::Transaction;
use solana_vote_api;
use solana_vote_api::vote_instruction::Vote;
use solana_vote_api::vote_state::{Lockout, VoteState};
use std::result;
@ -301,7 +298,7 @@ impl Bank {
self.add_native_program("solana_storage_program", &storage_program::id());
self.add_native_program("solana_bpf_loader", &bpf_loader::id());
self.add_native_program("solana_budget_program", &solana_budget_api::id());
self.add_native_program("solana_token_program", &token_program::id());
self.add_native_program("solana_token_program", &solana_token_api::id());
}
/// Return the last block hash registered.
@ -1277,7 +1274,7 @@ mod tests {
assert_eq!(bpf_loader::id(), bpf);
assert_eq!(solana_budget_api::id(), budget);
assert_eq!(storage_program::id(), storage);
assert_eq!(token_program::id(), token);
assert_eq!(solana_token_api::id(), token);
assert_eq!(solana_vote_api::id(), vote);
}
@ -1290,7 +1287,7 @@ mod tests {
bpf_loader::id(),
solana_budget_api::id(),
storage_program::id(),
token_program::id(),
solana_token_api::id(),
solana_vote_api::id(),
];
assert!(ids.into_iter().all(move |id| unique.insert(id)));