From 90c1e6b0769eebca667241bea6796789d998dd4b Mon Sep 17 00:00:00 2001
From: Hongrui Fang <chfanghr@gmail.com>
Date: Tue, 4 Oct 2022 21:15:39 +0800
Subject: [PATCH] avoid `#>>>`

---
 agora/Agora/Proposal/Scripts.hs |  4 ++--
 agora/Agora/Stake/Scripts.hs    | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/agora/Agora/Proposal/Scripts.hs b/agora/Agora/Proposal/Scripts.hs
index 63129ed..a743b5e 100644
--- a/agora/Agora/Proposal/Scripts.hs
+++ b/agora/Agora/Proposal/Scripts.hs
@@ -52,7 +52,7 @@ import Plutarch.Api.V2 (
   PValidator,
  )
 import Plutarch.Extra.AssetClass (passetClass, passetClassValueOf)
-import Plutarch.Extra.Category (PCategory (pidentity), PSemigroupoid ((#>>>)))
+import Plutarch.Extra.Category (PCategory (pidentity))
 import Plutarch.Extra.Comonad (pextract)
 import Plutarch.Extra.Field (pletAll, pletAllC)
 import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust)
@@ -324,7 +324,7 @@ proposalValidator as maximumCosigners =
         plam $
           let stakeInputs =
                 pmapMaybe
-                  # (pfield @"resolved" #>>> getStakeDatum)
+                  # plam ((getStakeDatum #) . (pfield @"resolved" #))
                   # pfromData txInfoF.inputs
 
               ctx = pcon $ PStakeInputsContext stakeInputs
diff --git a/agora/Agora/Stake/Scripts.hs b/agora/Agora/Stake/Scripts.hs
index 0948dbc..ef09ecf 100644
--- a/agora/Agora/Stake/Scripts.hs
+++ b/agora/Agora/Stake/Scripts.hs
@@ -83,7 +83,6 @@ import Plutarch.Extra.AssetClass (
   passetClassValueOf,
   pvalueOf,
  )
-import Plutarch.Extra.Category (PSemigroupoid ((#>>>)))
 import Plutarch.Extra.Field (pletAll)
 import Plutarch.Extra.Functor (PFunctor (pfmap))
 import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust)
@@ -319,7 +318,7 @@ mkStakeValidator
       stakeInputDatums <-
         pletC $
           pmapMaybe
-            # ((pfield @"resolved") #>>> getStakeDatum)
+            # plam ((getStakeDatum #) . (pfield @"resolved" #))
             # pfromData txInfoF.inputs
 
       --------------------------------------------------------------------------
@@ -335,14 +334,16 @@ mkStakeValidator
       pguardC "All input stakes have the same owner or delegate" $
         let allHaveSameOwner =
               pall
-                # ( (pfield @"owner")
-                      #>>> plam (#== firstStakeInputDatumF.owner)
+                # plam
+                  ( (#== firstStakeInputDatumF.owner)
+                      . (pfield @"owner" #)
                   )
                 # restOfStakeInputDatums
             allHaveSameDelegate =
               pall
-                # ( (pfield @"delegatedTo")
-                      #>>> plam (#== firstStakeInputDatumF.delegatedTo)
+                # plam
+                  ( (#== firstStakeInputDatumF.delegatedTo)
+                      . (pfield @"delegatedTo" #)
                   )
                 # restOfStakeInputDatums
          in allHaveSameOwner #|| allHaveSameDelegate