Rename bieAccountIsSuspended (#1295)

Concordium · Dec 10, 2024 · d189872 · d189872
1 parent 182a32b
commit d189872
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/concordium-base b/concordium-base
diff --git a/concordium-consensus/src/Concordium/GlobalState/BakerInfo.hs b/concordium-consensus/src/Concordium/GlobalState/BakerInfo.hs
@@ -393,5 +393,5 @@ genesisBakerInfoEx spv cp GenesisBaker{..} = case spv of
                       _poolMetadataUrl = emptyUrlText,
                       _poolCommissionRates = cp ^. cpPoolParameters . ppCommissionBounds . to maximumCommissionRates
                     },
-              _bieAccountIsSuspended = conditionally (sSupportsValidatorSuspension (sAccountVersionFor spv)) False
+              _bieIsSuspended = conditionally (sSupportsValidatorSuspension (sAccountVersionFor spv)) False
             }
diff --git a/concordium-consensus/src/Concordium/GlobalState/Persistent/Account/StructureV1.hs b/concordium-consensus/src/Concordium/GlobalState/Persistent/Account/StructureV1.hs
@@ -121,7 +121,7 @@ migratePersistentBakerInfoEx StateMigrationParametersP6ToP7{} = migrateReference
         (AVSupportsDelegation av1, AVSupportsDelegation av2, SupportsValidatorSuspension av2 ~ 'False, Monad m') =>
         BakerInfoEx av1 ->
         m' (BakerInfoEx av2)
-    migrateBakerInfoExV1 BakerInfoExV1{..} = return BakerInfoExV1{_bieAccountIsSuspended = CFalse, ..}
+    migrateBakerInfoExV1 BakerInfoExV1{..} = return BakerInfoExV1{_bieIsSuspended = CFalse, ..}
 migratePersistentBakerInfoEx StateMigrationParametersP7ToP8{} = error "TODO(drsk) github #1220. Implement migratePersistenBakerInfoEx p7 -> p8"
 
 -- | Migrate a 'V0.PersistentBakerInfoEx' to a 'PersistentBakerInfoEx'.
@@ -1489,7 +1489,7 @@ setValidatorSuspended ::
 setValidatorSuspended isSusp = updateStake $ \case
     baker@PersistentAccountStakeEnduringBaker{} -> do
         oldInfo <- refLoad (paseBakerInfo baker)
-        let newInfo = oldInfo & bieAccountIsSuspended .~ isSusp
+        let newInfo = oldInfo & bieIsSuspended .~ isSusp
         newInfoRef <- refMake $! newInfo
         return $! baker{paseBakerInfo = newInfoRef}
     PersistentAccountStakeEnduringDelegator{} ->

diff --git a/concordium-consensus/src/Concordium/GlobalState/Persistent/BlockState.hs b/concordium-consensus/src/Concordium/GlobalState/Persistent/BlockState.hs
@@ -1341,7 +1341,7 @@ doGetActiveBakersAndDelegators pbs = do
                           activeBakerDelegators = abd,
                           activeBakerIsSuspended =
                             fromCondDef
-                                ( BaseAccounts._bieAccountIsSuspended $
+                                ( BaseAccounts._bieIsSuspended $
                                     BaseAccounts._accountBakerInfo $
                                         theBaker
                                 )
@@ -1632,7 +1632,7 @@ newAddValidator pbs ai va@ValidatorAdd{..} = do
             BaseAccounts.BakerInfoExV1
                 { _bieBakerPoolInfo = poolInfo,
                   _bieBakerInfo = bakerInfo,
-                  _bieAccountIsSuspended = conditionally hasValidatorSuspension False
+                  _bieIsSuspended = conditionally hasValidatorSuspension False
                 }
     -- The precondition guaranties that the account exists
     acc <- fromJust <$> Accounts.indexedAccount ai (bspAccounts bsp)
@@ -3570,7 +3570,7 @@ doSuspendValidators pbs ais =
                                     Just ba
                                         -- The validator is not yet suspended
                                         | False <-
-                                            uncond $ BaseAccounts._bieAccountIsSuspended $ _accountBakerInfo ba -> do
+                                            uncond $ BaseAccounts._bieIsSuspended $ _accountBakerInfo ba -> do
                                             newAcc <- setAccountValidatorSuspended True acc
                                             newAccounts <- Accounts.setAccountAtIndex ai newAcc (bspAccounts bsp)
                                             address <- accountCanonicalAddress newAcc

diff --git a/concordium-consensus/tests/globalstate/GlobalStateTests/AccountsMigrationP6ToP7.hs b/concordium-consensus/tests/globalstate/GlobalStateTests/AccountsMigrationP6ToP7.hs
@@ -147,7 +147,7 @@ dummyBakerStake compStake accIndex pc =
                               _bakerAggregationVerifyKey =
                                 Bls.derivePublicKey (bakerAggregationKey seed)
                             },
-                      _bieAccountIsSuspended = CFalse
+                      _bieIsSuspended = CFalse
                     }
             }
   where

diff --git a/concordium-consensus/tests/globalstate/GlobalStateTests/BlockStateHelpers.hs b/concordium-consensus/tests/globalstate/GlobalStateTests/BlockStateHelpers.hs
@@ -112,7 +112,7 @@ setAccountStakeDetails ai StakeDetailsBaker{..} mPoolInfo acc =
         BakerInfoExV1
             { _bieBakerInfo = fulBaker ^. bakerInfo,
               _bieBakerPoolInfo = poolInfo,
-              _bieAccountIsSuspended = conditionally hasValidatorSuspension False
+              _bieIsSuspended = conditionally hasValidatorSuspension False
             }
     fulBaker = DummyData.mkFullBaker (fromIntegral ai) (BakerId ai) ^. _1
     poolInfo = fromMaybe dummyBakerPoolInfo mPoolInfo

diff --git a/concordium-consensus/tests/globalstate/GlobalStateTests/ConfigureValidator.hs b/concordium-consensus/tests/globalstate/GlobalStateTests/ConfigureValidator.hs
@@ -189,7 +189,7 @@ testAddValidatorAllCases spv = describe "bsoAddValidator" $ do
                                           _poolMetadataUrl = vaMetadataURL va,
                                           _poolCommissionRates = vaCommissionRates va
                                         },
-                                  _bieAccountIsSuspended = conditionally (sSupportsValidatorSuspension (accountVersion @(AccountVersionFor pv))) False
+                                  _bieIsSuspended = conditionally (sSupportsValidatorSuspension (accountVersion @(AccountVersionFor pv))) False
                                 }
                         }
             bkr <- getAccountBaker (fromJust acc)

diff --git a/concordium-consensus/tests/scheduler/SchedulerTests/ConfigureBaker.hs b/concordium-consensus/tests/scheduler/SchedulerTests/ConfigureBaker.hs
@@ -64,7 +64,7 @@ makeTestBakerV1FromSeed amount stake bakerId seed suspend = do
             BakerInfoExV1
                 { _bieBakerInfo = fulBaker ^. theBakerInfo,
                   _bieBakerPoolInfo = poolInfo,
-                  _bieAccountIsSuspended = conditionally (sSupportsValidatorSuspension (accountVersion @av)) suspend
+                  _bieIsSuspended = conditionally (sSupportsValidatorSuspension (accountVersion @av)) suspend
                 }
     BS.addAccountBakerV1 bakerInfoEx stake True account
   where
@@ -338,7 +338,7 @@ testDelegatorToBakerOk spv pvString =
                               _transactionCommission = makeAmountFraction 1_000
                             }
                     },
-              _bieAccountIsSuspended = conditionally (sSupportsValidatorSuspension (sAccountVersionFor spv)) False
+              _bieIsSuspended = conditionally (sSupportsValidatorSuspension (sAccountVersionFor spv)) False
             }
     updateStaking keysWithProofs = case sSupportsFlexibleCooldown (sAccountVersionFor spv) of
         SFalse -> id
@@ -604,7 +604,7 @@ testAddBakerOk spv pvString =
                               _transactionCommission = makeAmountFraction 1_000
                             }
                     },
-              _bieAccountIsSuspended = conditionally (sSupportsValidatorSuspension (sAccountVersionFor spv)) False
+              _bieIsSuspended = conditionally (sSupportsValidatorSuspension (sAccountVersionFor spv)) False
             }
     updateStaking keysWithProofs =
         ( Transient.accountStaking
@@ -1304,7 +1304,7 @@ testUpdateBakerSuspendResumeOk spv pvString suspendOrResume accM =
             Transient.accountStaking
                 . accountBaker
                 . accountBakerInfo
-                . bieAccountIsSuspended
+                . bieIsSuspended
                 .~ (suspendOrResume == Suspend)
         SFalse -> id
     accountBaker f (AccountStakeBaker b) = AccountStakeBaker <$> f b

diff --git a/concordium-consensus/tests/scheduler/SchedulerTests/Delegation.hs b/concordium-consensus/tests/scheduler/SchedulerTests/Delegation.hs
@@ -62,7 +62,7 @@ makeTestBakerV1FromSeed amount stake bakerId seed = do
             BakerInfoExV1
                 { _bieBakerInfo = fulBaker ^. theBakerInfo,
                   _bieBakerPoolInfo = poolInfo,
-                  _bieAccountIsSuspended =
+                  _bieIsSuspended =
                     conditionally (sSupportsValidatorSuspension (accountVersion @av)) False
                 }
     BS.addAccountBakerV1 bakerInfoEx stake True account

diff --git a/concordium-consensus/tests/scheduler/SchedulerTests/KonsensusV1/EpochTransition.hs b/concordium-consensus/tests/scheduler/SchedulerTests/KonsensusV1/EpochTransition.hs
@@ -232,7 +232,7 @@ makePersistentAccountStakeEnduring StakeDetailsBaker{..} ai = do
             BakerInfoExV1
                 { _bieBakerInfo = fulBaker ^. bakerInfo,
                   _bieBakerPoolInfo = poolInfo,
-                  _bieAccountIsSuspended = conditionally hasValidatorSuspension False
+                  _bieIsSuspended = conditionally hasValidatorSuspension False
                 }
     return
         ( SV1.PersistentAccountStakeEnduringBaker