From 9fc2947107c11a1316205b51c8964dcce401af98 Mon Sep 17 00:00:00 2001 From: "Jeff Washington (jwash)" Date: Mon, 22 Nov 2021 14:45:21 -0600 Subject: [PATCH] simplify match --- runtime/src/bank.rs | 2 +- runtime/src/cost_model.rs | 23 ++++------------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index b7a66b91eb8b67..32e1b253b3b4b7 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -232,7 +232,7 @@ impl ExecuteTimings { } type BankStatusCache = StatusCache>; -#[frozen_abi(digest = "7bCDimGo11ajw6ZHViBBu8KPfoDZBcwSnumWCU8MMuwr")] +#[frozen_abi(digest = "EJDh82SHRHkscKegmSFBGrk6Qc23L31Mn9XYprxh6EoJ")] pub type BankSlotDelta = SlotDelta>; type TransactionAccountRefCells = Vec<(Pubkey, Rc>)>; diff --git a/runtime/src/cost_model.rs b/runtime/src/cost_model.rs index 264f45a8d9f419..e78424ea8394b0 100644 --- a/runtime/src/cost_model.rs +++ b/runtime/src/cost_model.rs @@ -208,25 +208,10 @@ impl CostModel { instruction: SystemInstruction, ) -> u64 { match instruction { - SystemInstruction::CreateAccount { - lamports: _lamports, - space, - owner: _owner, - } => space, - SystemInstruction::CreateAccountWithSeed { - base: _base, - seed: _seed, - lamports: _lamports, - space, - owner: _owner, - } => space, - SystemInstruction::Allocate { space } => space, - SystemInstruction::AllocateWithSeed { - base: _base, - seed: _seed, - space, - owner: _owner, - } => space, + SystemInstruction::CreateAccount { space, .. } + | SystemInstruction::CreateAccountWithSeed { space, .. } + | SystemInstruction::Allocate { space } + | SystemInstruction::AllocateWithSeed { space, .. } => space, SystemInstruction::Assign { .. } | SystemInstruction::InitializeNonceAccount(_) | SystemInstruction::WithdrawNonceAccount(_)