test: Add another new committee test

Author: sgillespie

cardano-chain-gen/src/Cardano/Mock/Forging/Tx/Conway.hs

@@ -542,11 +542,13 @@ mkTxDelegCert ::
 mkTxDelegCert f = ConwayTxCertDeleg . f
 
 mkAddCommitteeTx ::
+  Maybe (Governance.GovPurposeId 'Governance.CommitteePurpose StandardConway) ->
   Credential 'ColdCommitteeRole StandardCrypto ->
   AlonzoTx StandardConway
-mkAddCommitteeTx cred = mkGovActionProposalTx govAction
+mkAddCommitteeTx prevGovAction cred = mkGovActionProposalTx govAction
   where
-    govAction = Governance.UpdateCommittee SNothing mempty newMembers threshold
+    govAction = Governance.UpdateCommittee prevGovAction' mempty newMembers threshold
+    prevGovAction' = maybeToStrictMaybe prevGovAction
     newMembers = Map.singleton cred (EpochNo 20)
     threshold = fromJust $ boundRational (1 % 1)
 

cardano-chain-gen/src/Cardano/Mock/Query.hs

@@ -16,10 +16,11 @@ module Cardano.Mock.Query (
   queryVoteCounts,
   queryEpochStateCount,
   queryCommitteeByTxHash,
+  queryCommitteeMemberCountByTxHash,
 ) where
 
 import qualified Cardano.Db as Db
-import Cardano.Prelude hiding (from, on)
+import Cardano.Prelude hiding (from, isNothing, on)
 import Database.Esqueleto.Experimental
 import Prelude ()
 
@@ -237,3 +238,35 @@ queryCommitteeByTxHash txHash = do
     pure committee
 
   pure (entityVal <$> res)
+
+queryCommitteeMemberCountByTxHash ::
+  MonadIO io =>
+  Maybe ByteString ->
+  ReaderT SqlBackend io Word64
+queryCommitteeMemberCountByTxHash txHash = do
+  res <- selectOne $ do
+    (_ :& committee :& _ :& tx) <-
+      from
+        $ table @Db.CommitteeMember
+          `innerJoin` table @Db.Committee
+        `on` ( \(member :& committee) ->
+                member ^. Db.CommitteeMemberCommitteeId ==. committee ^. Db.CommitteeId
+             )
+          `leftJoin` table @Db.GovActionProposal
+        `on` ( \(_ :& committee :& govAction) ->
+                committee ^. Db.CommitteeGovActionProposalId ==. govAction ?. Db.GovActionProposalId
+             )
+          `leftJoin` table @Db.Tx
+        `on` ( \(_ :& _ :& govAction :& tx) ->
+                govAction ?. Db.GovActionProposalTxId ==. tx ?. Db.TxId
+             )
+
+    where_ $
+      case txHash of
+        -- Search by Tx hash, if specified
+        Just _ -> tx ?. Db.TxHash ==. val txHash
+        -- Otherwise, get the initial committee
+        Nothing -> isNothing (committee ^. Db.CommitteeGovActionProposalId)
+    pure countRows
+
+  pure (maybe 0 unValue res)

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway.hs

@@ -241,14 +241,15 @@ unitTests iom knownMigrations =
         "Governance"
         [ test "drep distribution" Governance.drepDistr
         , test "new committee member" Governance.newCommittee
+        , test "chained committee proposals" Governance.chainedNewCommittee
+        , test "rollback new committee member" Governance.rollbackNewCommittee
+        , test "rollback new committee member proposal" Governance.rollbackNewCommitteeProposal
         , test "update constitution" Governance.updateConstitution
         , test "treasury withdrawal" Governance.treasuryWithdrawal
         , test "parameter change" Governance.parameterChange
         , test "hard fork" Governance.hardFork
-        , test "info action" Governance.infoAction
-        , test "rollback new committee member" Governance.rollbackNewCommittee
-        , test "rollback new committee member proposal" Governance.rollbackNewCommitteeProposal
         , test "rollback hardfork" Governance.rollbackHardFork
+        , test "info action" Governance.infoAction
         ]
     ]
   where

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Governance.hs

@@ -11,14 +11,15 @@
 module Test.Cardano.Db.Mock.Unit.Conway.Governance (
   drepDistr,
   newCommittee,
+  rollbackNewCommittee,
+  rollbackNewCommitteeProposal,
   updateConstitution,
   treasuryWithdrawal,
   parameterChange,
+  chainedNewCommittee,
   hardFork,
-  infoAction,
-  rollbackNewCommittee,
-  rollbackNewCommitteeProposal,
   rollbackHardFork,
+  infoAction,
 ) where
 
 import qualified Cardano.Db as Db
@@ -148,6 +149,56 @@ rollbackNewCommittee =
   where
     testLabel = "conwayRollbackNewCommittee"
 
+chainedNewCommittee :: IOManager -> [(Text, Text)] -> Assertion
+chainedNewCommittee =
+  withFullConfig conwayConfigDir testLabel $ \interpreter server dbSync -> do
+    startDBSync dbSync
+
+    -- Register SPOs, DReps, and committee to vote
+    epoch1 <- initGovernance interpreter server
+
+    -- Wait for it to sync
+    assertBlockNoBackoff dbSync (length epoch1)
+    -- Should start with 4 committee members
+    assertEqQuery
+      dbSync
+      (Query.queryCommitteeMemberCountByTxHash Nothing)
+      4
+      "Unexpected committee member count"
+
+    let
+      -- Propose a new committee member
+      committee1Hash = "e0a714319812c3f773ba04ec5d6b3ffcd5aad85006805b047b082541"
+      committee1Cred = KeyHashObj (KeyHash committee1Hash)
+      proposal1 = Conway.mkAddCommitteeTx Nothing committee1Cred
+
+      -- Propose another, using proposal1 as the prev governance action
+      committee2Hash = "f15d3cfda3ac52c86d2d98925419795588e74f4e270a3c17beabeaff"
+      committee2Cred = KeyHashObj (KeyHash committee2Hash)
+      proposal2 = Conway.mkAddCommitteeTx (Just prevGovActionId) committee2Cred
+      proposal2TxHash = unTxHash (txIdTx proposal2)
+
+      prevGovActionId =
+        Governance.GovPurposeId $
+          Governance.GovActionId
+            { gaidTxId = txIdTx proposal1
+            , gaidGovActionIx = GovActionIx 0
+            }
+
+    void $ Api.withConwayFindLeaderAndSubmit interpreter server $ \_ ->
+      Right [proposal1, proposal2]
+
+    -- Wait for it to sync
+    assertBlockNoBackoff dbSync (length epoch1 + 1)
+    -- Should now have 6 members
+    assertEqQuery
+      dbSync
+      (Query.queryCommitteeMemberCountByTxHash $ Just proposal2TxHash)
+      6
+      "Unexpected committee member count"
+  where
+    testLabel = "conwayChainedNewCommittee"
+
 rollbackNewCommitteeProposal :: IOManager -> [(Text, Text)] -> Assertion
 rollbackNewCommitteeProposal =
   withFullConfig conwayConfigDir testLabel $ \interpreter server dbSync -> do
@@ -215,7 +266,7 @@ enactNewCommittee interpreter server = do
 
 proposeNewCommittee :: AlonzoTx Consensus.StandardConway
 proposeNewCommittee =
-  Conway.mkAddCommitteeTx committeeCred
+  Conway.mkAddCommitteeTx Nothing committeeCred
   where
     committeeHash = "e0a714319812c3f773ba04ec5d6b3ffcd5aad85006805b047b082541"
     committeeCred = KeyHashObj (KeyHash committeeHash)

cardano-chain-gen/test/testfiles/fingerprint/conwayChainedNewCommittee

@@ -0,0 +1 @@
+[12,16,18,21,24,30,31,32,33,40,41,42,43,47,52,60,62,70,80,84,86,92,98,100,106,109,110,111,112,127,134,138,146,149,154,166,168,178,183,188,193,194,198,200,202,220,222,223,224,225,231,239,242,247,261,282,283,288,289,301,302,303,308,313,315,316,320,331,334,344,345,363,364,368,369,375,377,381,389,394,407,418,422,425,430,437,438,439,440,447,450,453,454,456,458,461,467,492,499,507,516,524]