Rename new_committee_info and new_committee_member

to simply committee and committee_member

Author: kderme

cardano-db-sync/src/Cardano/DbSync/Era/Universal/Insert/GovAction.hs

@@ -28,7 +28,7 @@ module Cardano.DbSync.Era.Universal.Insert.GovAction (
 )
 where
 
-import Cardano.BM.Trace (Trace, logWarning)
+import Cardano.BM.Trace (Trace, logInfo, logWarning)
 import qualified Cardano.Crypto as Crypto
 import Cardano.Db (DbWord64 (..))
 import qualified Cardano.Db as DB
@@ -140,33 +140,33 @@ insertGovActionProposal cache blkId txId govExpiresAt mmCommittee (index, pp) =
     insertNewCommittee gapId removed added q = do
       void $ insertCommittee' gapId (updatedCommittee removed added q <$> mmCommittee) q
 
-insertCommittee :: (MonadIO m, MonadBaseControl IO m) => Maybe DB.GovActionProposalId -> Committee StandardConway -> ReaderT SqlBackend m DB.NewCommitteeInfoId
+insertCommittee :: (MonadIO m, MonadBaseControl IO m) => Maybe DB.GovActionProposalId -> Committee StandardConway -> ReaderT SqlBackend m DB.CommitteeId
 insertCommittee mgapId committee = do
   insertCommittee' mgapId (Just committee) (committeeThreshold committee)
 
-insertCommittee' :: (MonadIO m, MonadBaseControl IO m) => Maybe DB.GovActionProposalId -> Maybe (Committee StandardConway) -> UnitInterval -> ReaderT SqlBackend m DB.NewCommitteeInfoId
+insertCommittee' :: (MonadIO m, MonadBaseControl IO m) => Maybe DB.GovActionProposalId -> Maybe (Committee StandardConway) -> UnitInterval -> ReaderT SqlBackend m DB.CommitteeId
 insertCommittee' mgapId mcommittee q = do
-  infoId <- insertNewCommitteeInfo
+  committeeId <- insertCommitteeDB
   whenJust mcommittee $ \committee ->
-    mapM_ (insertNewMember infoId) (Map.toList $ committeeMembers committee)
-  pure infoId
+    mapM_ (insertNewMember committeeId) (Map.toList $ committeeMembers committee)
+  pure committeeId
   where
     r = unboundRational q -- TODO work directly with Ratio Word64. This is not currently supported in ledger
-    insertNewMember infoId (cred, e) = do
+    insertNewMember committeeId (cred, e) = do
       chId <- insertCommitteeHash cred
-      void . DB.insertNewCommitteeMember $
-        DB.NewCommitteeMember
-          { DB.newCommitteeMemberNewCommitteeInfoId = infoId
-          , DB.newCommitteeMemberCommitteeHashId = chId
-          , DB.newCommitteeMemberExpirationEpoch = unEpochNo e
+      void . DB.insertCommitteeMember $
+        DB.CommitteeMember
+          { DB.committeeMemberCommitteeId = committeeId
+          , DB.committeeMemberCommitteeHashId = chId
+          , DB.committeeMemberExpirationEpoch = unEpochNo e
           }
 
-    insertNewCommitteeInfo =
-      DB.insertNewCommitteeInfo $
-        DB.NewCommitteeInfo
-          { DB.newCommitteeInfoGovActionProposalId = mgapId
-          , DB.newCommitteeInfoQuorumNumerator = fromIntegral $ numerator r
-          , DB.newCommitteeInfoQuorumDenominator = fromIntegral $ denominator r
+    insertCommitteeDB =
+      DB.insertCommittee $
+        DB.Committee
+          { DB.committeeGovActionProposalId = mgapId
+          , DB.committeeQuorumNumerator = fromIntegral $ numerator r
+          , DB.committeeQuorumDenominator = fromIntegral $ denominator r
           }
 
 --------------------------------------------------------------------------------------
@@ -465,7 +465,7 @@ insertUpdateEnacted trce blkId epochNo enactedState = do
         (Nothing, Nothing) -> pure (Nothing, Nothing)
         (Nothing, Just committee) -> do
           -- No enacted proposal means we're after conway genesis territory
-          committeeIds <- lift $ DB.queryProposalNewCommitteeInfo Nothing
+          committeeIds <- lift $ DB.queryProposalCommittee Nothing
           case committeeIds of
             [] -> do
               committeeId <- lift $ insertCommittee Nothing committee
@@ -476,7 +476,7 @@ insertUpdateEnacted trce blkId epochNo enactedState = do
           -- No committee with enacted action means it's a no confidence action.
           pure (Nothing, Just committeeGaId)
         (Just committeeGaId, Just committee) -> do
-          committeeIds <- lift $ DB.queryProposalNewCommitteeInfo (Just committeeGaId)
+          committeeIds <- lift $ DB.queryProposalCommittee (Just committeeGaId)
           case committeeIds of
             [] -> do
               -- This should never happen. Having a committee and an enacted action, means

cardano-db/src/Cardano/Db/Delete.hs

@@ -163,7 +163,7 @@ deleteTablesAfterTxId mtxId mtxInId mtxOutId mmaTxOutId = do
     mgaId <- queryMinRefId GovActionProposalTxId txId
     whenJust mgaId $ \gaId -> do
       queryFirstAndDeleteAfter TreasuryWithdrawalGovActionProposalId gaId
-      queryFirstAndDeleteAfter' NewCommitteeInfoGovActionProposalId gaId
+      queryFirstAndDeleteAfter' CommitteeGovActionProposalId gaId
       queryFirstAndDeleteAfter' ConstitutionGovActionProposalId gaId
       deleteWhere [GovActionProposalId >=. gaId]
     minPmr <- queryMinRefId PoolMetadataRefRegisteredTxId txId

cardano-db/src/Cardano/Db/Insert.hs

@@ -80,8 +80,8 @@ module Cardano.Db.Insert (
   insertConstitution,
   insertGovActionProposal,
   insertTreasuryWithdrawal,
-  insertNewCommitteeInfo,
-  insertNewCommitteeMember,
+  insertCommittee,
+  insertCommitteeMember,
   insertVotingProcedure,
   insertDrepHash,
   insertCommitteeHash,
@@ -442,11 +442,11 @@ insertGovActionProposal = insertUnchecked "GovActionProposal"
 insertTreasuryWithdrawal :: (MonadBaseControl IO m, MonadIO m) => TreasuryWithdrawal -> ReaderT SqlBackend m TreasuryWithdrawalId
 insertTreasuryWithdrawal = insertUnchecked "TreasuryWithdrawal"
 
-insertNewCommitteeInfo :: (MonadBaseControl IO m, MonadIO m) => NewCommitteeInfo -> ReaderT SqlBackend m NewCommitteeInfoId
-insertNewCommitteeInfo = insertUnchecked "NewCommitteeInfo"
+insertCommittee :: (MonadBaseControl IO m, MonadIO m) => Committee -> ReaderT SqlBackend m CommitteeId
+insertCommittee = insertUnchecked "Committee"
 
-insertNewCommitteeMember :: (MonadBaseControl IO m, MonadIO m) => NewCommitteeMember -> ReaderT SqlBackend m NewCommitteeMemberId
-insertNewCommitteeMember = insertUnchecked "NewCommitteeMember"
+insertCommitteeMember :: (MonadBaseControl IO m, MonadIO m) => CommitteeMember -> ReaderT SqlBackend m CommitteeMemberId
+insertCommitteeMember = insertUnchecked "CommitteeMember"
 
 insertVotingProcedure :: (MonadBaseControl IO m, MonadIO m) => VotingProcedure -> ReaderT SqlBackend m VotingProcedureId
 insertVotingProcedure = insertUnchecked "VotingProcedure"

cardano-db/src/Cardano/Db/Query.hs

@@ -63,7 +63,7 @@ module Cardano.Db.Query (
   queryDrepHashAlwaysNoConfidence,
   queryCommitteeHash,
   queryProposalConstitution,
-  queryProposalNewCommitteeInfo,
+  queryProposalCommittee,
   -- queries used in smash
   queryOffChainPoolData,
   queryPoolRegister,
@@ -839,17 +839,25 @@ queryProposalConstitution :: MonadIO m => Maybe GovActionProposalId -> ReaderT S
 queryProposalConstitution mgapId = do
   res <- select $ do
     c <- from $ table @Constitution
-    where_ (c ^. ConstitutionGovActionProposalId ==. val mgapId)
+    where_ (bl c)
     pure $ c ^. ConstitutionId
   pure $ unValue <$> res
+  where
+    bl c = case mgapId of
+      Nothing -> isNothing (c ^. ConstitutionGovActionProposalId)
+      Just vl -> c ^. ConstitutionGovActionProposalId ==. val (Just vl)
 
-queryProposalNewCommitteeInfo :: MonadIO m => Maybe GovActionProposalId -> ReaderT SqlBackend m [NewCommitteeInfoId]
-queryProposalNewCommitteeInfo mgapId = do
+queryProposalCommittee :: MonadIO m => Maybe GovActionProposalId -> ReaderT SqlBackend m [CommitteeId]
+queryProposalCommittee mgapId = do
   res <- select $ do
-    c <- from $ table @NewCommitteeInfo
-    where_ (c ^. NewCommitteeInfoGovActionProposalId ==. val mgapId)
-    pure $ c ^. NewCommitteeInfoId
+    c <- from $ table @Committee
+    where_ (bl c)
+    pure $ c ^. CommitteeId
   pure $ unValue <$> res
+  where
+    bl c = case mgapId of
+      Nothing -> isNothing (c ^. CommitteeGovActionProposalId)
+      Just vl -> c ^. CommitteeGovActionProposalId ==. val (Just vl)
 
 {--------------------------------------------
   Queries use in SMASH

cardano-db/src/Cardano/Db/Schema.hs

@@ -621,13 +621,13 @@ share
     stakeAddressId       StakeAddressId      noreference
     amount               DbLovelace          sqltype=lovelace
 
-  NewCommitteeInfo
+  Committee
     govActionProposalId  GovActionProposalId Maybe noreference
     quorumNumerator      Word64
     quorumDenominator    Word64
 
-  NewCommitteeMember
-    newCommitteeInfoId   NewCommitteeInfoId   -- here intentionally we use foreign keys
+  CommitteeMember
+    committeeId          CommitteeId   -- here intentionally we use foreign keys
     committeeHashId      CommitteeHashId      noreference
     expirationEpoch      Word64               sqltype=word31type
 
@@ -655,7 +655,7 @@ share
     UniqueDrepDistr hashId epochNo
 
   EpochState
-    committeeId             NewCommitteeInfoId Maybe noreference
+    committeeId             CommitteeId Maybe noreference
     noConfidenceId          GovActionProposalId Maybe noreference
     constitutionId          ConstitutionId Maybe noreference
     epochNo                 Word64              sqltype=word31type
@@ -1321,11 +1321,17 @@ schemaDocs =
       TreasuryWithdrawalStakeAddressId # "The address that benefits from this withdrawal."
       TreasuryWithdrawalAmount # "The amount for this withdrawl."
 
-    NewCommitteeInfo --^ do
+    Committee --^ do
       "A table for new committee proposed on a GovActionProposal. New in 13.2-Conway."
-      NewCommitteeInfoGovActionProposalId # "The GovActionProposal table index for this new committee. This can be null for genesis committees."
-      NewCommitteeInfoQuorumNumerator # "The proposed quorum nominator."
-      NewCommitteeInfoQuorumDenominator # "The proposed quorum denominator."
+      CommitteeGovActionProposalId # "The GovActionProposal table index for this new committee. This can be null for genesis committees."
+      CommitteeQuorumNumerator # "The proposed quorum nominator."
+      CommitteeQuorumDenominator # "The proposed quorum denominator."
+
+    CommitteeMember --^ do
+      "A table for members of the committee. A committee can have multiple members. New in 13.3-Conway."
+      CommitteeMemberCommitteeId # "The reference to the committee"
+      CommitteeMemberCommitteeHashId # "The reference to the committee hash"
+      CommitteeMemberExpirationEpoch # "The epoch this member expires"
 
     Constitution --^ do
       "A table for constitutiona attached to a GovActionProposal. New in 13.2-Conway."