From ffd1c8c8bacfdda21951cabf681fec8f5e73eb1e Mon Sep 17 00:00:00 2001 From: Emily Martins Date: Mon, 31 Oct 2022 13:43:32 +0100 Subject: [PATCH] apply formatting --- agora-specs/Sample/Proposal/Advance.hs | 12 ++++++++---- agora-specs/Sample/Proposal/Cosign.hs | 3 ++- agora-specs/Sample/Proposal/Unlock.hs | 3 ++- agora-specs/Spec/Effect/TreasuryWithdrawal.hs | 8 ++++---- agora/Agora/Stake/Scripts.hs | 3 ++- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/agora-specs/Sample/Proposal/Advance.hs b/agora-specs/Sample/Proposal/Advance.hs index e9ba6f8..32bf0f9 100644 --- a/agora-specs/Sample/Proposal/Advance.hs +++ b/agora-specs/Sample/Proposal/Advance.hs @@ -616,7 +616,8 @@ mkInTimeTimeRange advanceFrom = + (def :: ProposalTimingConfig).draftTime + (def :: ProposalTimingConfig).votingTime + (def :: ProposalTimingConfig).lockingTime - + (def :: ProposalTimingConfig).executingTime - 1 + + (def :: ProposalTimingConfig).executingTime + - 1 ) Finished -> error "Cannot advance 'Finished' proposal" @@ -632,7 +633,8 @@ mkTooLateTimeRange advanceFrom = (proposalStartingTime + (def :: ProposalTimingConfig).draftTime + 1) ( proposalStartingTime + (def :: ProposalTimingConfig).draftTime - + (def :: ProposalTimingConfig).votingTime - 1 + + (def :: ProposalTimingConfig).votingTime + - 1 ) -- [S + D + V + L + 1, S + D + V + L + E -1] VotingReady -> @@ -682,7 +684,8 @@ compPerStakeGTsForDraft :: NumStake -> Tagged GTTag Integer compPerStakeGTsForDraft nCosigners = Tagged $ untag (def :: ProposalThresholds).toVoting - `div` fromIntegral nCosigners + 1 + `div` fromIntegral nCosigners + + 1 dummyDatum :: () dummyDatum = () @@ -948,7 +951,8 @@ mkInsufficientCosignsBundle nCosigners nEffects = insuffcientPerStakeGTs = Tagged $ untag (def :: ProposalThresholds).toVoting - `div` fromIntegral nCosigners - 1 + `div` fromIntegral nCosigners + - 1 template = mkValidToNextStateBundle nCosigners nEffects False Draft -- * From VotingReady diff --git a/agora-specs/Sample/Proposal/Cosign.hs b/agora-specs/Sample/Proposal/Cosign.hs index ecfd1c5..7ea6601 100644 --- a/agora-specs/Sample/Proposal/Cosign.hs +++ b/agora-specs/Sample/Proposal/Cosign.hs @@ -294,7 +294,8 @@ cosign ps = builder closedBoundedInterval (coerce proposalInputDatum.startingTime + 1) ( coerce proposalInputDatum.startingTime - + proposalInputDatum.timingConfig.draftTime - 1 + + proposalInputDatum.timingConfig.draftTime + - 1 ) sig = diff --git a/agora-specs/Sample/Proposal/Unlock.hs b/agora-specs/Sample/Proposal/Unlock.hs index 20c92b7..071d644 100644 --- a/agora-specs/Sample/Proposal/Unlock.hs +++ b/agora-specs/Sample/Proposal/Unlock.hs @@ -348,7 +348,8 @@ unlock ps = builder in closedBoundedInterval (lb + 1) (ub - 1) AfterVoting -> let lb = - s + (def :: ProposalTimingConfig).draftTime + s + + (def :: ProposalTimingConfig).draftTime + (def :: ProposalTimingConfig).votingTime ub = lb + (def :: ProposalTimingConfig).lockingTime in closedBoundedInterval (lb + 1) (ub - 1) diff --git a/agora-specs/Spec/Effect/TreasuryWithdrawal.hs b/agora-specs/Spec/Effect/TreasuryWithdrawal.hs index 9dc5956..4f98c29 100644 --- a/agora-specs/Spec/Effect/TreasuryWithdrawal.hs +++ b/agora-specs/Spec/Effect/TreasuryWithdrawal.hs @@ -45,8 +45,8 @@ specs = , inputCollateral 10 , inputTreasury 1 (asset1 10) ] - $ outputTreasury 1 (asset1 7) : - buildReceiversOutputFromDatum datum1 + $ outputTreasury 1 (asset1 7) + : buildReceiversOutputFromDatum datum1 ) , effectSucceedsWith "Simple with multiple treasuries " @@ -120,8 +120,8 @@ specs = , inputCollateral 10 , inputTreasury 999 (asset1 20) ] - $ outputTreasury 999 (asset1 17) : - buildReceiversOutputFromDatum datum3 + $ outputTreasury 999 (asset1 17) + : buildReceiversOutputFromDatum datum3 ) , effectFailsWith "Prevent transactions besides the withdrawal" diff --git a/agora/Agora/Stake/Scripts.hs b/agora/Agora/Stake/Scripts.hs index 90c615e..c3ab8bf 100644 --- a/agora/Agora/Stake/Scripts.hs +++ b/agora/Agora/Stake/Scripts.hs @@ -152,7 +152,8 @@ stakePolicy = PPair mintedST burntST <- pmatchC $ - pfromJust #$ psymbolValueOf' + pfromJust + #$ psymbolValueOf' # ownSymbol # txInfoF.mint