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

update ledger tool to restore cost table from blockstore (#18489)

Browse Source 
* update ledger tool to restore cost model from blockstore when compute-slot-cost

* Move initialize_cost_table into cost_model, so the function can be tested and shared between validator and ledger-tool

* refactor and simplify a test
This commit is contained in:
Tao Zhu
2021-07-07 23:44:51 -05:00
committed by GitHub
parent d4ec0a6da5
commit b6dff12923
3 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ledger-tool/src/main.rs
View File

@ -14,7 +14,7 @@ use solana_clap_utils::{
is_parsable, is_pubkey, is_pubkey_or_keypair, is_slot, is_valid_percentage,
},
};
use solana_core::cost_model::{CostModel, ACCOUNT_MAX_COST, BLOCK_MAX_COST};
use solana_core::cost_model::CostModel;
use solana_core::cost_tracker::CostTracker;
use solana_ledger::entry::Entry;
use solana_ledger::{
@ -737,10 +737,9 @@ fn compute_slot_cost(blockstore: &Blockstore, slot: Slot) -> Result<(), String>
let mut transactions = 0;
let mut programs = 0;
let mut program_ids = HashMap::new();
let cost_model = Arc::new(RwLock::new(CostModel::new(
ACCOUNT_MAX_COST,
BLOCK_MAX_COST,
)));
let mut cost_model = CostModel::default();
cost_model.initialize_cost_table(&blockstore.read_program_costs().unwrap());
let cost_model = Arc::new(RwLock::new(cost_model));
let mut cost_tracker = CostTracker::new(cost_model.clone());
for entry in &entries {