Merge pull request #590 from Concordium/suspended-pool

Move isSuspended from BakerPoolStatus to ActiveBakerPoolStatus.
Concordium · Jan 14, 2025 · 65b2fea · 65b2fea
2 parents 92150ab + d797d5b
commit 65b2fea
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/concordium-grpc-api b/concordium-grpc-api
diff --git a/haskell-src/Concordium/GRPC2.hs b/haskell-src/Concordium/GRPC2.hs
@@ -1689,9 +1689,9 @@ instance ToProto QueryTypes.BakerPoolStatus where
             ProtoFields.delegatedCapitalCap .= toProto abpsDelegatedCapitalCap
             ProtoFields.poolInfo .= toProto abpsPoolInfo
             ProtoFields.maybe'equityPendingChange .= toProto abpsBakerStakePendingChange
+            ProtoFields.maybe'isSuspended .= abpsIsSuspended
         ProtoFields.maybe'currentPaydayInfo .= fmap toProto psCurrentPaydayStatus
         ProtoFields.allPoolTotalCapital .= toProto psAllPoolTotalCapital
-        ProtoFields.maybe'isSuspended .= psIsSuspended
 
 instance ToProto QueryTypes.PassiveDelegationStatus where
     type Output QueryTypes.PassiveDelegationStatus = Proto.PassiveDelegationInfo

diff --git a/haskell-src/Concordium/Types/Queries.hs b/haskell-src/Concordium/Types/Queries.hs
@@ -472,13 +472,17 @@ data ActiveBakerPoolStatus = ActiveBakerPoolStatus
       -- | The pool info associated with the pool: open status, metadata URL and commission rates.
       abpsPoolInfo :: !BakerPoolInfo,
       -- | Any pending change to the baker's stake.
-      abpsBakerStakePendingChange :: !PoolPendingChange
+      abpsBakerStakePendingChange :: !PoolPendingChange,
+      -- | A flag indicating Whether the pool owner is suspended or not. Present
+      --  from protocol version P8.
+      abpsIsSuspended :: !(Maybe Bool)
     }
     deriving (Eq, Show)
 
 $( deriveJSON
     defaultOptions
-        { fieldLabelModifier = firstLower . dropWhile isLower
+        { fieldLabelModifier = firstLower . dropWhile isLower,
+          omitNothingFields = True
         }
     ''ActiveBakerPoolStatus
  )
@@ -531,10 +535,7 @@ data BakerPoolStatus = BakerPoolStatus
       --  for the current reward period.
       psCurrentPaydayStatus :: !(Maybe CurrentPaydayBakerPoolStatus),
       -- | Total capital staked across all pools, including passive delegation.
-      psAllPoolTotalCapital :: !Amount,
-      -- | A flag indicating Whether the pool owner is suspended or not. Present
-      --  from protocol version P8.
-      psIsSuspended :: !(Maybe Bool)
+      psAllPoolTotalCapital :: !Amount
     }
     deriving (Eq, Show)
 
@@ -547,7 +548,6 @@ instance ToJSON BakerPoolStatus where
               "currentPaydayStatus" .= psCurrentPaydayStatus,
               "allPoolTotalCapital" .= psAllPoolTotalCapital
             ]
-                ++ ["isSuspended" .= isSuspended | Just isSuspended <- [psIsSuspended]]
                 ++ activeStatusFields
       where
         activeStatusFields = case psActiveStatus of
@@ -558,6 +558,7 @@ instance ToJSON BakerPoolStatus where
                   "poolInfo" .= abpsPoolInfo,
                   "bakerStakePendingChange" .= abpsBakerStakePendingChange
                 ]
+                    ++ ["isSuspended" .= isSuspended | Just isSuspended <- [abpsIsSuspended]]
             Nothing -> []
 
 instance FromJSON BakerPoolStatus where
@@ -576,9 +577,9 @@ instance FromJSON BakerPoolStatus where
                 abpsDelegatedCapitalCap <- obj .: "delegatedCapitalCap"
                 abpsPoolInfo <- obj .: "poolInfo"
                 abpsBakerStakePendingChange <- obj .: "bakerStakePendingChange"
+                abpsIsSuspended <- obj .:? "isSuspended"
                 return ActiveBakerPoolStatus{..}
         psActiveStatus <- optional activeStatusFields
-        psIsSuspended <- optional $ obj .: "isSuspended"
         return BakerPoolStatus{..}
 
 -- | Status of the passive delegators.