plutus-scb: Fix psgenerator

sarvex · Jan 12, 2021 · 284df70 · 284df70
1 parent e73ba57
commit 284df70
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/playground-common/src/PSGenerator/Common.hs b/playground-common/src/PSGenerator/Common.hs
@@ -278,10 +278,10 @@ ledgerTypes =
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @ThreadId)
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @(Request A))
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @(Response A))
-    , (equal <*> (genericShow <*> mkSumType)) (Proxy @RequestID)
+    , (order <*> (genericShow <*> mkSumType)) (Proxy @RequestID)
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @Priority)
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @StopReason)
-    , (equal <*> (genericShow <*> mkSumType)) (Proxy @IterationID)
+    , (order <*> (genericShow <*> mkSumType)) (Proxy @IterationID)
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @ScriptValidationEvent)
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @ScriptType)
     ]

diff --git a/plutus-scb/app/PSGenerator.hs b/plutus-scb/app/PSGenerator.hs
@@ -30,7 +30,7 @@ import           Language.Plutus.Contract.Effects.Instance         (OwnIdRequest
 import           Language.Plutus.Contract.Effects.OwnPubKey        (OwnPubKeyRequest)
 import           Language.Plutus.Contract.Effects.UtxoAt           (UtxoAtAddress)
 import           Language.Plutus.Contract.Effects.WriteTx          (WriteTxResponse)
-import           Language.Plutus.Contract.Resumable                (Request, RequestID, Response, Responses)
+import           Language.Plutus.Contract.Resumable                (Responses)
 import           Language.Plutus.Contract.State                    (ContractRequest, State)
 import           Language.PlutusTx.Coordination.Contracts.Currency (SimpleMPS (..))
 import           Language.PureScript.Bridge                        (BridgePart, Language (Haskell), SumType,
@@ -48,8 +48,7 @@ import           Plutus.SCB.Effects.ContractTest                   (TestContract
 import           Plutus.SCB.Effects.MultiAgent                     (agentAction)
 import           Plutus.SCB.Events                                 (ChainEvent, ContractSCBRequest, csContract)
 import           Plutus.SCB.Events.Contract                        (ContractEvent, ContractInstanceState,
-                                                                    ContractResponse, IterationID,
-                                                                    PartiallyDecodedResponse)
+                                                                    ContractResponse, PartiallyDecodedResponse)
 import           Plutus.SCB.Events.Node                            (NodeEvent)
 import           Plutus.SCB.Events.User                            (UserEvent)
 import           Plutus.SCB.Events.Wallet                          (WalletEvent)
@@ -121,7 +120,6 @@ myTypes =
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @ContractSCBRequest)
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @ContractResponse)
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @(ContractEvent A))
-    , (order <*> (genericShow <*> mkSumType)) (Proxy @IterationID)
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @UnbalancedTx)
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @NodeEvent)
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @(UserEvent A))
@@ -138,9 +136,6 @@ myTypes =
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @(State A))
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @CheckpointStore)
     , (order <*> (genericShow <*> mkSumType)) (Proxy @CheckpointKey)
-    , (equal <*> (genericShow <*> mkSumType)) (Proxy @(Response A))
-    , (order <*> (genericShow <*> mkSumType)) (Proxy @RequestID)
-    , (equal <*> (genericShow <*> mkSumType)) (Proxy @(Request A))
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @(Responses A))
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @AddressChangeRequest)
     , (equal <*> (genericShow <*> mkSumType)) (Proxy @AddressChangeResponse)