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

replace function with const var for better readability (#19285)

Browse Source
This commit is contained in:
Tao Zhu
2021-08-19 14:59:53 -05:00
committed by GitHub
parent e1fb45bd3f
commit 4982dc20f9
3 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/cost_model.rs
View File

@ -68,7 +68,7 @@ pub struct CostModel {
impl Default for CostModel {
fn default() -> Self {
CostModel::new(account_cost_max(), block_cost_max())
CostModel::new(ACCOUNT_COST_MAX, BLOCK_COST_MAX)
}
}
@ -126,9 +126,9 @@ impl CostModel {
if is_writable {
self.transaction_cost.writable_accounts.push(*k);
self.transaction_cost.account_access_cost += account_write_cost();
self.transaction_cost.account_access_cost += ACCOUNT_WRITE_COST;
} else {
self.transaction_cost.account_access_cost += account_read_cost();
self.transaction_cost.account_access_cost += ACCOUNT_READ_COST;
}
});
debug!(
@ -388,8 +388,7 @@ mod tests {
.try_into()
.unwrap();
let expected_account_cost =
account_write_cost() + account_write_cost() + account_read_cost();
let expected_account_cost = ACCOUNT_WRITE_COST + ACCOUNT_WRITE_COST + ACCOUNT_READ_COST;
let expected_execution_cost = 8;
let mut cost_model = CostModel::default();
@ -445,7 +444,7 @@ mod tests {
let number_threads = 10;
let expected_account_cost =
account_write_cost() + account_write_cost() * 2 + account_read_cost() * 2;
ACCOUNT_WRITE_COST + ACCOUNT_WRITE_COST * 2 + ACCOUNT_READ_COST * 2;
let cost1 = 100;
let cost2 = 200;
// execution cost can be either 2 * Default (before write) or cost1+cost2 (after write)