remove unnecessary SingI constraint

Concordium · Sep 5, 2024 · f765a13 · f765a13
1 parent e76a385
commit f765a13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/haskell-src/Concordium/Types/Accounts.hs b/haskell-src/Concordium/Types/Accounts.hs
@@ -261,13 +261,14 @@ instance forall av. (IsAccountVersion av) => Serialize (BakerInfoEx av) where
     put BakerInfoExV1{..} = do
         put _bieBakerInfo
         put _bieBakerPoolInfo
-        put _bieAccountIsSuspended
+        mapM_ put _bieAccountIsSuspended
     get = case delegationSupport @av of
         SAVDelegationNotSupported -> BakerInfoExV0 <$> get
         SAVDelegationSupported -> do
             _bieBakerInfo <- get
             _bieBakerPoolInfo <- get
-            _bieAccountIsSuspended <- get
+            _bieAccountIsSuspended <-
+                conditionallyA (sSupportsValidatorSuspension (accountVersion @av)) get
             return BakerInfoExV1{..}
 
 instance HasBakerInfo (BakerInfoEx av) where

diff --git a/haskell-src/Concordium/Types/ProtocolVersion.hs b/haskell-src/Concordium/Types/ProtocolVersion.hs
@@ -452,7 +452,7 @@ demoteProtocolVersion = fromSing
 
 -- | Constraint on a type level 'AccountVersion' that can be used to get a corresponding
 --  'SAccountVersion' (see 'accountVersion'). (An alias for 'SingI'.)
-type IsAccountVersion (av :: AccountVersion) = (SingI av, SingI (SupportsValidatorSuspension av))
+type IsAccountVersion (av :: AccountVersion) = SingI av
 
 -- | Constraint on a type level 'ChainParametersVersion' that can be used to get a corresponding
 --  'SChainParametersVersion' (see 'chainParametersVersion'). (An alias for 'SingI'.)