blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor new() and default() for CostTracker (#23267)

This commit is contained in:
Brooks Prumo 2022-02-22 10:44:23 -06:00 committed by GitHub
parent cadc2de77d
commit 88e1192c6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
runtime/src/cost_tracker.rs
View File

@ -39,18 +39,16 @@ pub struct CostTracker {
impl Default for CostTracker { impl Default for CostTracker {
fn default() -> Self { fn default() -> Self {
CostTracker::new(MAX_WRITABLE_ACCOUNT_UNITS, MAX_BLOCK_UNITS, MAX_VOTE_UNITS) // Clippy doesn't like asserts in const contexts, so need to explicitly allow them. For
} // more info, see this issue: https://github.com/rust-lang/rust-clippy/issues/8159
} #![allow(clippy::assertions_on_constants)]
const _: () = assert!(MAX_WRITABLE_ACCOUNT_UNITS <= MAX_BLOCK_UNITS);
const _: () = assert!(MAX_VOTE_UNITS <= MAX_BLOCK_UNITS);
impl CostTracker {
pub fn new(account_cost_limit: u64, block_cost_limit: u64, vote_cost_limit: u64) -> Self {
assert!(account_cost_limit <= block_cost_limit);
assert!(vote_cost_limit <= block_cost_limit);
Self { Self {
account_cost_limit, account_cost_limit: MAX_WRITABLE_ACCOUNT_UNITS,
block_cost_limit, block_cost_limit: MAX_BLOCK_UNITS,
vote_cost_limit, vote_cost_limit: MAX_VOTE_UNITS,
cost_by_writable_accounts: HashMap::with_capacity(WRITABLE_ACCOUNTS_PER_BLOCK), cost_by_writable_accounts: HashMap::with_capacity(WRITABLE_ACCOUNTS_PER_BLOCK),
block_cost: 0, block_cost: 0,
vote_cost: 0, vote_cost: 0,
@ -58,7 +56,9 @@ impl CostTracker {
account_data_size: 0, account_data_size: 0,
} }
} }
}
impl CostTracker {
// bench tests needs to reset limits // bench tests needs to reset limits
pub fn set_limits( pub fn set_limits(
&mut self, &mut self,
@ -242,6 +242,19 @@ mod tests {
std::{cmp, sync::Arc}, std::{cmp, sync::Arc},
}; };
impl CostTracker {
fn new(account_cost_limit: u64, block_cost_limit: u64, vote_cost_limit: u64) -> Self {
assert!(account_cost_limit <= block_cost_limit);
assert!(vote_cost_limit <= block_cost_limit);
Self {
account_cost_limit,
block_cost_limit,
vote_cost_limit,
..Self::default()
}
}
}
fn test_setup() -> (Keypair, Hash) { fn test_setup() -> (Keypair, Hash) {
solana_logger::setup(); solana_logger::setup();
let GenesisConfigInfo { let GenesisConfigInfo {