Move Arbitrary instances of HeadObservation types

Author: ch1bo

hydra-chain-observer/src/Hydra/ChainObserver/NodeClient.hs

@@ -16,7 +16,21 @@ import Hydra.Cardano.Api.Prelude (TxId)
 import Hydra.Contract (ScriptInfo)
 import Hydra.Ledger.Cardano (adjustUTxO)
 import Hydra.Tx.HeadId (HeadId (..))
-import Hydra.Tx.Observe (AbortObservation (..), CloseObservation (..), CollectComObservation (..), CommitObservation (..), ContestObservation (..), DecrementObservation (..), DepositObservation (..), FanoutObservation (..), HeadObservation (..), IncrementObservation (..), InitObservation (..), RecoverObservation (..), observeHeadTx)
+import Hydra.Tx.Observe (
+  AbortObservation (..),
+  CloseObservation (..),
+  CollectComObservation (..),
+  CommitObservation (..),
+  ContestObservation (..),
+  DecrementObservation (..),
+  DepositObservation (..),
+  FanoutObservation (..),
+  HeadObservation (..),
+  IncrementObservation (..),
+  InitObservation (..),
+  RecoverObservation (..),
+  observeHeadTx,
+ )
 
 type ObserverHandler m = [ChainObservation] -> m ()
 

hydra-tx/src/Hydra/Tx/Abort.hs

@@ -108,10 +108,6 @@ newtype AbortObservation = AbortObservation {headId :: HeadId}
   deriving stock (Eq, Show, Generic)
   deriving anyclass (ToJSON, FromJSON)
 
-instance Arbitrary AbortObservation where
-  arbitrary = genericArbitrary
-  shrink = genericShrink
-
 -- | Identify an abort tx by looking up the input spending the Head output and
 -- decoding its redeemer.
 observeAbortTx ::

hydra-tx/src/Hydra/Tx/Close.hs

@@ -158,10 +158,6 @@ data CloseObservation = CloseObservation
   deriving stock (Show, Eq, Generic)
   deriving anyclass (ToJSON, FromJSON)
 
-instance Arbitrary CloseObservation where
-  arbitrary = genericArbitrary
-  shrink = genericShrink
-
 -- | Identify a close tx by lookup up the input spending the Head output and
 -- decoding its redeemer.
 observeCloseTx ::

hydra-tx/src/Hydra/Tx/CollectCom.hs

@@ -120,10 +120,6 @@ data CollectComObservation = CollectComObservation
   deriving stock (Show, Eq, Generic)
   deriving anyclass (ToJSON, FromJSON)
 
-instance Arbitrary CollectComObservation where
-  arbitrary = genericArbitrary
-  shrink = genericShrink
-
 -- | Identify a collectCom tx by lookup up the input spending the Head output
 -- and decoding its redeemer.
 observeCollectComTx ::

hydra-tx/src/Hydra/Tx/Commit.hs

@@ -157,10 +157,6 @@ data CommitObservation = CommitObservation
   deriving stock (Eq, Show, Generic)
   deriving anyclass (ToJSON, FromJSON)
 
-instance Arbitrary CommitObservation where
-  arbitrary = undefined -- TODO: Arbitrary UTxO in hydra-tx
-  shrink = undefined -- TODO: Arbitrary UTxO in hydra-tx
-
 -- | Identify a commit tx by:
 --
 -- - Check that its spending from the init validator,

hydra-tx/src/Hydra/Tx/Contest.hs

@@ -21,6 +21,8 @@ import PlutusLedgerApi.V1.Crypto qualified as Plutus
 import PlutusLedgerApi.V3 (toBuiltin)
 import PlutusLedgerApi.V3 qualified as Plutus
 
+import Hydra.Plutus.Orphans ()
+
 -- * Construction
 
 data ClosedThreadOutput = ClosedThreadOutput
@@ -154,16 +156,7 @@ data ContestObservation = ContestObservation
   , contesters :: [Plutus.PubKeyHash]
   }
   deriving stock (Show, Eq, Generic)
-
-instance ToJSON ContestObservation where
-  toJSON = undefined -- TODO: ToJSON PubKeyHash?
-
-instance FromJSON ContestObservation where
-  parseJSON = undefined -- TODO: FromJSON PubKeyHash?
-
-instance Arbitrary ContestObservation where
-  arbitrary = undefined -- TODO: Arbitrary PubKeyHash
-  shrink = undefined -- TODO: Arbitrary PubKeyHash
+  deriving anyclass (ToJSON, FromJSON)
 
 -- | Identify a close tx by lookup up the input spending the Head output and
 -- decoding its redeemer.

hydra-tx/src/Hydra/Tx/Decrement.hs

@@ -101,10 +101,6 @@ data DecrementObservation = DecrementObservation
   deriving stock (Show, Eq, Generic)
   deriving anyclass (ToJSON, FromJSON)
 
-instance Arbitrary DecrementObservation where
-  arbitrary = undefined -- TODO: Arbitrary UTxO in hydra-tx
-  shrink = undefined -- TODO: Arbitrary UTxO in hydra-tx
-
 observeDecrementTx ::
   UTxO ->
   Tx ->

hydra-tx/src/Hydra/Tx/Fanout.hs

@@ -82,10 +82,6 @@ data FanoutObservation = FanoutObservation
   deriving stock (Eq, Show, Generic)
   deriving anyclass (ToJSON, FromJSON)
 
-instance Arbitrary FanoutObservation where
-  arbitrary = undefined -- TODO: Arbitrary UTxO in hydra
-  shrink = undefined -- TODO: Arbitrary UTxO in hydra-tx
-
 -- | Identify a fanout tx by lookup up the input spending the Head output and
 -- decoding its redeemer.
 observeFanoutTx ::

hydra-tx/src/Hydra/Tx/Increment.hs

@@ -115,10 +115,6 @@ data IncrementObservation = IncrementObservation
   deriving stock (Show, Eq, Generic)
   deriving anyclass (ToJSON, FromJSON)
 
-instance Arbitrary IncrementObservation where
-  arbitrary = undefined -- TODO: Arbitrary TxId
-  shrink = undefined -- TODO: Arbitrary TxId
-
 observeIncrementTx ::
   UTxO ->
   Tx ->

hydra-tx/src/Hydra/Tx/Init.hs

@@ -95,10 +95,6 @@ data InitObservation = InitObservation
   deriving stock (Show, Eq, Generic)
   deriving anyclass (ToJSON, FromJSON)
 
-instance Arbitrary InitObservation where
-  arbitrary = genericArbitrary
-  shrink = genericShrink
-
 data NotAnInitReason
   = NoHeadOutput
   | NotAHeadDatum