cleanup

Author: Bromel777

cardano-dex-contracts-onchain/ErgoDex/PContracts/PPoolStakeChangeMintPolicy.hs

@@ -40,11 +40,6 @@ poolStakeChangeMintPolicyValidatorT poolNft adminPkh = plam $ \_ ctx -> unTermCo
     let
       poolInputResolved = getField @"resolved" poolInput
 
-    feeInput' <- tlet $ pelemAt # 1 # inputs
-    feeInput  <- pletFieldsC @'["outRef", "resolved"] feeInput'
-    let
-      feeInputResolved = getField @"resolved" feeInput
-    
     poolInputValue  <- tletField @"value" poolInputResolved
     poolInputConfig <- tlet $ extractPoolConfig # poolInputResolved
 
@@ -59,10 +54,6 @@ poolStakeChangeMintPolicyValidatorT poolNft adminPkh = plam $ \_ ctx -> unTermCo
     prevCred <- tletField @"credential" selfAddr
     newCred  <- tletField @"credential" succAddr
 
-    feeInputDatum <- tletField @"datum" feeInputResolved
-
-    PNoOutputDatum _ <- pmatchC feeInputDatum
-
     prevConf <- pletFieldsC @'["poolNft", "poolX", "poolY", "poolLq", "feeNum", "lqBound"] poolInputConfig
     newConf  <- pletFieldsC @'["poolNft", "poolX", "poolY", "poolLq", "feeNum", "lqBound"] succPoolOutputDatum'
     let
@@ -85,15 +76,11 @@ poolStakeChangeMintPolicyValidatorT poolNft adminPkh = plam $ \_ ctx -> unTermCo
             prevPoolLq     #== newPoolLq     #&&
             prevPoolFeeNum #== newPoolFeeNum
 
-        strictInputs =
-          let inputsLength = plength # inputs
-          in inputsLength #== 2
-
         validDelta = poolInputValue #== poolOutputValue
         validCred  = prevCred #== newCred
 
         correctPoolInput = checkPoolNft # poolInputValue # poolNft
 
         validSignature = containsSignature # signatories # adminPkh
 
-    pure $ strictInputs #&& validDelta #&& validPoolParams #&& validCred #&& validSignature #&& correctPoolInput
+    pure $ validDelta #&& validPoolParams #&& validCred #&& validSignature #&& correctPoolInput

cardano-dex-contracts-onchain/test/Spec.hs

@@ -19,23 +19,23 @@ import Plutarch.Api.V2
 main :: IO ()
 main = do
   defaultMain tests
-  
+
 tests = testGroup "Contracts"
   [ checkStakeChangeMintingPolicy
-  -- , checkPool
-  -- , checkPoolRedeemer
-  -- , checkRedeem
-  -- , checkRedeemIdentity
-  -- , checkRedeemIsFair
-  -- , checkRedeemRedeemer
-  -- , checkDeposit 
-  -- , checkDepositChange
-  -- , checkDepositRedeemer
-  -- , checkDepositIdentity
-  -- , checkDepositLq
-  -- , checkDepositTokenReward
-  -- , checkSwap
-  -- , checkSwapRedeemer
-  -- , checkSwapIdentity
-  -- , checkPkhLockStaking
+  , checkPool
+  , checkPoolRedeemer
+  , checkRedeem
+  , checkRedeemIdentity
+  , checkRedeemIsFair
+  , checkRedeemRedeemer
+  , checkDeposit 
+  , checkDepositChange
+  , checkDepositRedeemer
+  , checkDepositIdentity
+  , checkDepositLq
+  , checkDepositTokenReward
+  , checkSwap
+  , checkSwapRedeemer
+  , checkSwapIdentity
+  , checkPkhLockStaking
   ]

cardano-dex-contracts-onchain/test/Tests/StakeMinting.hs

@@ -49,7 +49,7 @@ correctCurrencySymbol :: Property
 correctCurrencySymbol = withTests 1 $ property $ do
   let
     stakeAdminPkh  = (PubKeyHash $ BuiltinByteString . mkByteString $ T.pack "61616161616161616161616161616161616161616161616161616161")
-    correctCSValue = Plutus.CurrencySymbol $ BuiltinByteString . mkByteString $ T.pack "5115309ffa85b7ae1f6edd731f974b8b36083e2464a9347d76c0e697"
+    correctCSValue = Plutus.CurrencySymbol $ BuiltinByteString . mkByteString $ T.pack "518c79b04ec296af266171bb9551f917b69604fac9c7bc6b90db281e"
     (_, _, nft, _) = genAssetClasses
     origCurSymbol = Plutus.CurrencySymbol $ getScriptHash $ scriptHash (Plutus.unMintingPolicyScript (poolStakeChangeMintPolicyValidator nft stakeAdminPkh))
   origCurSymbol === correctCSValue
@@ -222,9 +222,8 @@ failedPoolChangeStakePartIncorrectFinalDatum = property $ do
 failedPoolChangeStakePartIncorrectInputsFakePool :: Property
 failedPoolChangeStakePartIncorrectInputsFakePool = property $ do
   let (x, y, nft, lq) = genAssetClasses
-  let (newX, newY, newNft, newLq) = genAssetClasses
 
-  (incorretX, incorrectY, incorrectNft, incorrectlq) <- forAll genRandomAssetClasses
+  (newX, newY, newNft, newLq) <- forAll genRandomAssetClasses
 
   stakeAdminPkh <- forAll genPkh
   newPkhForSC   <- forAll genPkh