Enable build of CertifyingAndWithdrawingPlutus test #364

newhoggy · 2022-03-17T10:53:31Z

Changes

Enable CertifyingAndWithdrawingPlutus test.
Add necessary configuration, data, and script files for enabling the test.
Update cardano-node dependency.
Add cardano-node and cardano-cli as build-tool-depends.

Example output

$ cabal test plutus-example --enable-tests
Build profile: -w ghc-8.10.7 -O1
In order, the following will be built (use -v for more details):
 - plutus-example-1.33.0 (test:plutus-example-test) (first run)
Preprocessing test suite 'plutus-example-test' for plutus-example-1.33.0..
Building test suite 'plutus-example-test' for plutus-example-1.33.0..
Running 1 test suites...
Test suite plutus-example-test: RUNNING...
plutus-example
  Plutus.Direct.CertifyingAndWithdrawingPlutus: OK (102.33s)
      ✓ Plutus.Direct.CertifyingAndWithdrawingPlutus passed 1 test.
  prop_TxId_Api_Ledger_Plutus_Roundtrip:        OK (0.89s)
      ✓ prop_TxId_Api_Ledger_Plutus_Roundtrip passed 100 tests.
  prop_TxId_Api_Ledger_Roundtrip:               OK (0.92s)
      ✓ prop_TxId_Api_Ledger_Roundtrip passed 100 tests.
  prop_ScriptData_MyCustomRedeemer:             OK (0.38s)
      ✓ prop_ScriptData_MyCustomRedeemer passed 100 tests.
  prop_ScriptData_MyCustomRedeemer_JSON:        OK (0.47s)
      ✓ prop_ScriptData_MyCustomRedeemer_JSON passed 100 tests.

All 5 tests passed (104.99s)
Test suite plutus-example-test: PASS
Test suite logged to:
/Users/jky/wrk/iohk/plutus-apps/dist-newstyle/build/x86_64-osx/ghc-8.10.7/plutus-example-1.33.0/t/plutus-example-test/test/plutus-example-1.33.0-plutus-example-test.log
1 of 1 test suites (1 of 1 test cases) passed.

Work in progress

Currently this PR doesn't build in nix and it involves some dependency version changes that don't track the documented projects in cabal.project, so the PR is not ready for merging.

cabal.project

newhoggy · 2022-03-17T11:17:13Z

plutus-example/plutus-example.cabal

@@ -157,3 +158,7 @@ test-suite plutus-example-test
                        Test.PlutusExample.ScriptData

  ghc-options:          -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T
+
+  build-tool-depends:   cardano-node:cardano-node
+                      , cardano-cli:cardano-cli


This is required because cardano-node and cardano-cli need to be available for the tests to invoke.

newhoggy · 2022-03-17T11:17:25Z

plutus-example/test/plutus-example-test.hs

-   [ testProperty "prop_TxId_Api_Ledger_Plutus_Roundtrip" Test.PlutusExample.Plutus.prop_TxId_Api_Ledger_Plutus_Roundtrip
-   , testProperty "prop_TxId_Api_Ledger_Roundtrip" Test.PlutusExample.Plutus.prop_TxId_Api_Ledger_Roundtrip
+  [ -- Fails to meet deadline on MacOS for an unknown reason
+    testProperty "Plutus.Direct.CertifyingAndWithdrawingPlutus" Test.PlutusExample.Direct.CertifyingAndWithdrawingPlutus.hprop_plutus_certifying_withdrawing


This is the test being enabled.

configuration/defaults/byron-mainnet/configuration.yaml

catch-21 · 2022-03-22T14:36:07Z

It would be good to keep all compiled plutus scripts (and script data I guess) in plutus-example/example-scripts, ideally with corresponding plutus code in plutus-example/src.

Jimbo4350

LGTM! Just one comment about redeemers, datums and the configuration file.

Jimbo4350 · 2022-03-29T13:56:51Z

.github/workflows/test.yml

@@ -29,8 +29,11 @@ jobs:
      - uses: actions/checkout@v3
      - uses: nixbuild/nix-quick-install-action@v12
      - run: |
+          echo "=== 1 ==="


What does the 1 symbolize?

Left over debugging. Not sure why it still shows up here, but it's not in the diff.

Jimbo4350 · 2022-03-29T13:58:58Z

configuration/defaults/byron-mainnet/configuration.yaml

@@ -0,0 +1,287 @@
+##########################################################
+###############          Mainnet                 #########


Is it possible to move this file into the plutus-example folder? Likewise for any datums and redeemers the library uses.

The path is specified in cardano-testnet from the cardano-node repo. Will have to change that to make it configurable.

koslambrou · 2022-03-30T09:50:51Z

Does this PR subsume #378?

newhoggy · 2022-03-30T10:26:24Z

I have closed #378

3727: Make configuration template in cardano-testnet configurable r=newhoggy a=newhoggy The change is for this: IntersectMBO/plutus-apps#364 (comment) Co-authored-by: John Ky <john.ky@iohk.io>

michaelpj · 2022-04-01T10:26:24Z

shell.nix

-    { };
+  cardano-wallet = (import sources.flake-compat {
+    inherit pkgs;
+    src = builtins.fetchTree


This broke everything for people not using the flakes experimental feature.

3727: Make configuration template in cardano-testnet configurable r=newhoggy a=newhoggy The change is for this: IntersectMBO/plutus-apps#364 (comment) Co-authored-by: John Ky <john.ky@iohk.io>

newhoggy force-pushed the newhoggy/enable-CertifyingAndWithdrawingPlutus-test branch from 683b368 to 723f69a Compare March 17, 2022 11:10

newhoggy requested a review from Jimbo4350 March 17, 2022 11:11

newhoggy commented Mar 17, 2022

View reviewed changes

cabal.project Outdated Show resolved Hide resolved

newhoggy commented Mar 17, 2022

View reviewed changes

newhoggy changed the title ~~Enable build of CertifyingAndWithdrawingPlutus test~~ WIP Enable build of CertifyingAndWithdrawingPlutus test Mar 17, 2022

newhoggy added the WIP The issue is currently being worked on label Mar 17, 2022

newhoggy mentioned this pull request Mar 17, 2022

JSON format for leadership schedule IntersectMBO/cardano-node#3687

Merged

Jimbo4350 reviewed Mar 17, 2022

View reviewed changes

configuration/defaults/byron-mainnet/configuration.yaml Show resolved Hide resolved

newhoggy force-pushed the newhoggy/enable-CertifyingAndWithdrawingPlutus-test branch 7 times, most recently from 243d249 to f0af84b Compare March 29, 2022 09:50

newhoggy marked this pull request as ready for review March 29, 2022 11:24

newhoggy and others added 4 commits March 29, 2022 22:25

Use builtins.getFlake instead of import for cardano-wallet

adbf378

Enable build of CertifyingAndWithdrawingPlutus test

f8b8f5c

Materialise nix

77675bb

shell.nix: use flake-compat to import cardano-wallet

f91adc7

newhoggy force-pushed the newhoggy/enable-CertifyingAndWithdrawingPlutus-test branch from 5e2becb to dfbd396 Compare March 29, 2022 11:34

newhoggy requested a review from Jimbo4350 March 29, 2022 12:41

newhoggy removed the WIP The issue is currently being worked on label Mar 29, 2022

newhoggy force-pushed the newhoggy/enable-CertifyingAndWithdrawingPlutus-test branch from c775159 to 9f75b3b Compare March 29, 2022 12:44

newhoggy and others added 3 commits March 29, 2022 23:44

Export some environment variables

900ecb0

fix CARDANO_NODE_SRC export

1d46c3a

nixpkgs-fmt nix/pkgs/haskell/haskell.nix

5e8fd82

newhoggy force-pushed the newhoggy/enable-CertifyingAndWithdrawingPlutus-test branch from 9f75b3b to 5e8fd82 Compare March 29, 2022 12:44

newhoggy changed the title ~~WIP Enable build of CertifyingAndWithdrawingPlutus test~~ Enable build of CertifyingAndWithdrawingPlutus test Mar 29, 2022

Move scripts and data to under plutus-example directory

f6defac

newhoggy force-pushed the newhoggy/enable-CertifyingAndWithdrawingPlutus-test branch from 1db03d1 to f6defac Compare March 29, 2022 12:51

Jimbo4350 approved these changes Mar 29, 2022

View reviewed changes

newhoggy requested a review from koslambrou March 30, 2022 05:43

koslambrou approved these changes Mar 30, 2022

View reviewed changes

newhoggy merged commit b86ee21 into main Mar 30, 2022

newhoggy deleted the newhoggy/enable-CertifyingAndWithdrawingPlutus-test branch March 30, 2022 10:25

newhoggy mentioned this pull request Mar 30, 2022

Make configuration template in cardano-testnet configurable IntersectMBO/cardano-node#3727

Merged

Jimbo4350 mentioned this pull request Mar 31, 2022

Move plutus-example to plutus-apps IntersectMBO/cardano-node#3675

Closed

7 tasks

michaelpj reviewed Apr 1, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable build of CertifyingAndWithdrawingPlutus test #364

Enable build of CertifyingAndWithdrawingPlutus test #364

newhoggy commented Mar 17, 2022 •

edited

Loading

newhoggy Mar 17, 2022

newhoggy Mar 17, 2022

catch-21 commented Mar 22, 2022 •

edited

Loading

Jimbo4350 left a comment

Jimbo4350 Mar 29, 2022

newhoggy Mar 30, 2022 •

edited

Loading

Jimbo4350 Mar 29, 2022

newhoggy Mar 30, 2022

koslambrou commented Mar 30, 2022

newhoggy commented Mar 30, 2022 •

edited

Loading

michaelpj Apr 1, 2022

		@@ -0,0 +1,287 @@
		##########################################################
		############### Mainnet #########

Enable build of CertifyingAndWithdrawingPlutus test #364

Enable build of CertifyingAndWithdrawingPlutus test #364

Conversation

newhoggy commented Mar 17, 2022 • edited Loading

Changes

Example output

Work in progress

newhoggy Mar 17, 2022

Choose a reason for hiding this comment

newhoggy Mar 17, 2022

Choose a reason for hiding this comment

catch-21 commented Mar 22, 2022 • edited Loading

Jimbo4350 left a comment

Choose a reason for hiding this comment

Jimbo4350 Mar 29, 2022

Choose a reason for hiding this comment

newhoggy Mar 30, 2022 • edited Loading

Choose a reason for hiding this comment

Jimbo4350 Mar 29, 2022

Choose a reason for hiding this comment

newhoggy Mar 30, 2022

Choose a reason for hiding this comment

koslambrou commented Mar 30, 2022

newhoggy commented Mar 30, 2022 • edited Loading

michaelpj Apr 1, 2022

Choose a reason for hiding this comment

newhoggy commented Mar 17, 2022 •

edited

Loading

catch-21 commented Mar 22, 2022 •

edited

Loading

newhoggy Mar 30, 2022 •

edited

Loading

newhoggy commented Mar 30, 2022 •

edited

Loading