From c7bfe116d5b80480822a2d2abc92270931aa2c14 Mon Sep 17 00:00:00 2001
From: fanghr <chfanghr@gmail.com>
Date: Wed, 27 Apr 2022 16:23:35 +0800
Subject: [PATCH] remove executable state of the proposal

revert 45a09e8 and 8ffc430
---
 agora/Agora/Governor.hs | 6 +++---
 agora/Agora/Proposal.hs | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/agora/Agora/Governor.hs b/agora/Agora/Governor.hs
index 812c6ed..da057a9 100644
--- a/agora/Agora/Governor.hs
+++ b/agora/Agora/Governor.hs
@@ -50,7 +50,7 @@ import Agora.Proposal (
   PResultTag,
   Proposal (..),
   ProposalId,
-  ProposalStatus (Draft, Executable),
+  ProposalStatus (Draft, Locked),
   ProposalThresholds,
   pnextProposalId,
   proposalDatumValid,
@@ -613,8 +613,8 @@ governorValidator gov =
           pletFields @'["id", "effects", "status", "cosigners", "thresholds", "votes"]
             inputProposalDatum'
 
-        passert "Proposal must be in executable state in order to execute effects" $
-          inputProposalDatum.status #== pconstantData Executable
+        passert "Proposal must be in locked(executable) state in order to execute effects" $
+          inputProposalDatum.status #== pconstantData Locked
 
         let expectedOutputProposalDatum =
               pforgetData $
diff --git a/agora/Agora/Proposal.hs b/agora/Agora/Proposal.hs
index ffca57a..db97f7a 100644
--- a/agora/Agora/Proposal.hs
+++ b/agora/Agora/Proposal.hs
@@ -303,7 +303,6 @@ data PProposalStatus (s :: S)
     PDraft (Term s (PDataRecord '[]))
   | PVotingReady (Term s (PDataRecord '[]))
   | PLocked (Term s (PDataRecord '[]))
-  | PExecutable (Term s (PDataRecord '[]))
   | PFinished (Term s (PDataRecord '[]))
   deriving stock (GHC.Generic)
   deriving anyclass (Generic)