fix nit, update test

solana-labs · Sep 25, 2023 · 53a8deb · 53a8deb
1 parent 634228f
commit 53a8deb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/cost-model/src/cost_tracker.rs b/cost-model/src/cost_tracker.rs
@@ -186,11 +186,9 @@ impl CostTracker {
             if self.vote_cost.saturating_add(cost) > self.vote_cost_limit {
                 return Err(CostTrackerError::WouldExceedVoteMaxLimit);
             }
-        } else {
+        } else if self.block_cost.saturating_add(cost) > self.block_cost_limit {
             // check against the total package cost
-            if self.block_cost.saturating_add(cost) > self.block_cost_limit {
-                return Err(CostTrackerError::WouldExceedBlockMaxLimit);
-            }
+            return Err(CostTrackerError::WouldExceedBlockMaxLimit);
         }
 
         // check if the transaction itself is more costly than the account_cost_limit

diff --git a/cost-model/src/transaction_cost.rs b/cost-model/src/transaction_cost.rs
@@ -166,6 +166,7 @@ impl UsageCostDetails {
 #[cfg(test)]
 mod tests {
     use {
+        super::*,
         crate::cost_model::CostModel,
         solana_sdk::{
             feature_set::FeatureSet,
@@ -211,8 +212,8 @@ mod tests {
         )
         .unwrap();
 
-        // expected vote tx cost: 2 write locks, 2 sig, 1 vote ix,
-        let expected_vote_cost = 4140;
+        // expected vote tx cost: 2 write locks, 1 sig, 1 vote ix, 8cu of loaded accounts size,
+        let expected_vote_cost = SIMPLE_VOTE_USAGE_COST;
         // expected non-vote tx cost would include default loaded accounts size cost (16384) additionally
         let expected_none_vote_cost = 20535;