fix broken test cases

agora-specs/Sample/Proposal.hs

@@ -507,7 +507,7 @@ advanceProposalSuccess' params =
       outcome0WinningVotes =
         ProposalVotes $
           updateMap
-            (\_ -> Just $ untag (def :: ProposalThresholds).vote + 1)
+            (\_ -> Just $ untag (def :: ProposalThresholds).execute + 1)
             (ResultTag 0)
             emptyVotes'
 
@@ -664,16 +664,30 @@ advanceProposalInsufficientVotes =
           ]
 
       -- Insufficient votes.
-      votes = emptyVotesFor effects
+      votes =
+        ProposalVotes
+          ( AssocMap.fromList
+              [ (ResultTag 0, 1)
+              , (ResultTag 1, 0)
+              ]
+          )
 
       proposalStartingTime = 0
 
       -- Valid time range.
-      -- [S + D + 1, S + V - 1]
+      -- [S + D + 1, S + V + 10]
       timeRange =
         closedBoundedInterval
-          (proposalStartingTime + (def :: ProposalTimingConfig).draftTime + 1)
+          ( proposalStartingTime
-          (proposalStartingTime + (def :: ProposalTimingConfig).votingTime - 1)
+              + (def :: ProposalTimingConfig).draftTime
+              + (def :: ProposalTimingConfig).votingTime
+              + 1
+          )
+          ( proposalStartingTime
+              + (def :: ProposalTimingConfig).draftTime
+              + (def :: ProposalTimingConfig).votingTime
+              + 10
+          )
    in mkTransitionTxInfo
         VotingReady
         Locked

agora-specs/Spec/Proposal.hs

@@ -181,7 +181,7 @@ specs =
                                       ( ResultTag 0
                                       , case initialState of
                                           Draft -> 0
-                                          _ -> untag (def :: ProposalThresholds).vote + 1
+                                          _ -> untag (def :: ProposalThresholds).execute + 1
                                       )
                                     , (ResultTag 1, 0)
                                     ]
@@ -268,7 +268,7 @@ specs =
                   , votes =
                       ProposalVotes
                         ( AssocMap.fromList
-                            [ (ResultTag 0, 0)
+                            [ (ResultTag 0, 1)
                             , (ResultTag 1, 0)
                             ]
                         )

bench.csv

@@ -2,36 +2,36 @@ name,cpu,mem,size
 Agora/Effects/Treasury Withdrawal Effect/effect/Simple,333327612,830203,3674
 Agora/Effects/Treasury Withdrawal Effect/effect/Simple with multiple treasuries ,492387542,1197315,3986
 Agora/Effects/Treasury Withdrawal Effect/effect/Mixed Assets,456007605,1104500,3859
-Agora/Effects/Governor Mutation Effect/validator/valid new governor datum/governor validator should pass,90397270,249528,8798
+Agora/Effects/Governor Mutation Effect/validator/valid new governor datum/governor validator should pass,90397270,249528,8807
 Agora/Effects/Governor Mutation Effect/validator/valid new governor datum/effect validator should pass,106082031,292993,3609
 Agora/Stake/policy/stakeCreation,52241265,152127,2514
 Agora/Stake/validator/stakeDepositWithdraw deposit,180880812,492023,4431
 Agora/Stake/validator/stakeDepositWithdraw withdraw,180880812,492023,4419
 Agora/Proposal/policy/proposalCreation,23140177,69194,1519
-Agora/Proposal/validator/cosignature/proposal,338414402,960812,8361
+Agora/Proposal/validator/cosignature/proposal,338483402,961112,8620
 Agora/Proposal/validator/cosignature/stake,126327509,315061,4968
-Agora/Proposal/validator/voting/proposal,298791918,833990,8290
+Agora/Proposal/validator/voting/proposal,296656410,830692,8549
-Agora/Proposal/validator/voting/stake,125076577,331847,4942
+Agora/Proposal/validator/voting/stake,121170376,320853,4942
-Agora/Proposal/validator/advancing/successfully advance to next state/Draft -> VotringReady,292475323,820090,8188
+Agora/Proposal/validator/advancing/successfully advance to next state/Draft -> VotringReady,294340341,825452,8447
-Agora/Proposal/validator/advancing/successfully advance to next state/VotingReady -> Locked,291631901,818587,8191
+Agora/Proposal/validator/advancing/successfully advance to next state/VotingReady -> Locked,306801371,861382,8456
-Agora/Proposal/validator/advancing/successfully advance to next state/Locked -> Finished,293328368,822193,8191
+Agora/Proposal/validator/advancing/successfully advance to next state/Locked -> Finished,295193386,827555,8456
-Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/Draft -> Finished,291345522,817360,8190
+Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/Draft -> Finished,293210540,822722,8449
-Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/VotingReady -> Finished,289936611,814655,8191
+Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/VotingReady -> Finished,291801629,820017,8450
-Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/Locked -> Finished,291067589,817059,8191
+Agora/Proposal/validator/advancing/successfully advance to failed state: timeout/Locked -> Finished,292932607,822421,8450
-"Agora/Proposal/validator/unlocking/legal/1 proposals, voter, unlock stake + retract votes, VotingReady",304637691,851452,8241
+"Agora/Proposal/validator/unlocking/legal/1 proposals, voter, unlock stake + retract votes, VotingReady",302502183,848154,8500
-"Agora/Proposal/validator/unlocking/legal/1 proposals, creator, unlock stake, Finished",275360000,776686,8245
+"Agora/Proposal/validator/unlocking/legal/1 proposals, creator, unlock stake, Finished",273224492,773388,8504
-"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/1 proposals, voter, unlock stake, Finished",270836329,766331,8245
+"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/1 proposals, voter, unlock stake, Finished",268700821,763033,8504
-"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/1 proposals, voter, unlock stake, Locked",270836329,766331,8245
+"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/1 proposals, voter, unlock stake, Locked",268700821,763033,8504
-"Agora/Proposal/validator/unlocking/legal/42 proposals, voter, unlock stake + retract votes, VotingReady",3074171496,8538583,29759
+"Agora/Proposal/validator/unlocking/legal/42 proposals, voter, unlock stake + retract votes, VotingReady",2908014422,8180225,30018
-"Agora/Proposal/validator/unlocking/legal/42 proposals, creator, unlock stake, Finished",2782286591,7741684,30028
+"Agora/Proposal/validator/unlocking/legal/42 proposals, creator, unlock stake, Finished",2616129517,7383326,30287
-"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/42 proposals, voter, unlock stake, Finished",2630541760,7294679,29928
+"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/42 proposals, voter, unlock stake, Finished",2464384686,6936321,30187
-"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/42 proposals, voter, unlock stake, Locked",2630541760,7294679,29928
+"Agora/Proposal/validator/unlocking/legal/voter unlocks stake after voting/42 proposals, voter, unlock stake, Locked",2464384686,6936321,30187
 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct simple,21017788,55883,806
 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct many inputs,33204186,88241,900
 Agora/Treasury/Validator/Positive/Allows for effect changes,29938856,79744,1391
 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct simple,21017788,55883,806
 Agora/AuthorityToken/singleAuthorityTokenBurned/Correct many inputs,33204186,88241,900
 Agora/Governor/policy/GST minting,51007235,144191,2034
-Agora/Governor/validator/proposal creation,318217298,856165,9314
+Agora/Governor/validator/proposal creation,317651809,854963,9323
-Agora/Governor/validator/GATs minting,422983916,1148898,9435
+Agora/Governor/validator/GATs minting,423756405,1151000,9444
-Agora/Governor/validator/mutate governor state,91544121,254987,8899
+Agora/Governor/validator/mutate governor state,91544121,254987,8908