Revert "Change test-suites to executable and include in nix flake check"

v0d1ch · v0d1ch · commit 8cf434598319 · 2024-05-29T15:14:44.000+02:00
This reverts commit 9c57c78.
diff --git a/.github/workflows/ci-nix.yaml b/.github/workflows/ci-nix.yaml
@@ -45,16 +45,8 @@ jobs:
         name: cardano-scaling
         authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}'
 
-    - name: ❓ Test (Pure)
-      if: ${{ matrix.package == 'hydra-plutus'
-           || matrix.package == 'plutus-cbor'
-           || matrix.package == 'plutus-merkle-tree' }}
-      run: |
-        nix build .#checks.x86_64-linux.${{ matrix.package }}
-
-    - name: ❓ Test (Impure)
-      if: ${{ matrix.package == 'hydra-cluster'
-           || matrix.package == 'hydra-node' }}
+    - name: ❓ Test
+      if: ${{ matrix.package != 'hydra-tui' }}
       run: |
         cd ${{ matrix.package }}
         nix build .#${{ matrix.package }}-tests
diff --git a/flake.nix b/flake.nix
@@ -135,21 +135,6 @@
               ];
               treefmt = pkgs.treefmt;
             };
-            hydra-plutus = lu.tee-check {
-              name = "hydra-plutus";
-              src = self;
-              exe = "${packages.hydra-plutus-tests}/bin/tests";
-            };
-            plutus-cbor = lu.tee-check {
-              name = "plutus-cbor";
-              src = self;
-              exe = "${packages.plutus-cbor-tests}/bin/tests";
-            };
-            plutus-merkle-tree = lu.tee-check {
-              name = "plutus-merkle-tree";
-              src = self;
-              exe = "${packages.plutus-merkle-tree-tests}/bin/tests";
-            };
           } // lib.attrsets.mergeAttrsList (map (x: componentsToWerrors x hsPkgs.${x}) [
             "cardano-api-classy"
             "hydra-cardano-api"
@@ -176,8 +161,7 @@
           devShells = import ./nix/hydra/shell.nix {
             inherit inputs pkgs hsPkgs system compiler;
           };
-
-        };
+      };
     };
 
   nixConfig = {
diff --git a/hydra-plutus/hydra-plutus.cabal b/hydra-plutus/hydra-plutus.cabal
@@ -78,7 +78,7 @@ library
     , template-haskell
     , time
 
-executable tests
+test-suite tests
   import:             project-config
   ghc-options:        -threaded -rtsopts -with-rtsopts=-N
   hs-source-dirs:     test
diff --git a/hydra-plutus/scripts/mHead.plutus b/hydra-plutus/scripts/mHead.plutus
diff --git a/hydra-plutus/scripts/vCommit.plutus b/hydra-plutus/scripts/vCommit.plutus
@@ -1,5 +1,5 @@
 {
     "type": "PlutusScriptV2",
-    "description": "hydra-vCommit-0.15.0-181-g9e65bbf07",
-    "cborHex": "5907b45907b10100003232323322323233223232323232222533533223530060052225323233500713300249010343303100323301922533500110172213500222325335333573400203a038260280042600e00866e3c008028004d4c0040188888888888880204cc0092401034330320033018225335001101622135002223253353335734002038036260280042600e00866e3c008024d54cd4d4c0040188888888888880284c0592401035054380022100222220032350012200222533500110151335738004028646464a66a64666ae68004048044cdc3a400000422440022a66a64666ae68004048044cdc3a400400422440042602401e6aae78008d55ce8009baa0023232323253353335734002024022264646644246600200600464646464a66a666ae6800406005c4c8c8c8c8c8c8c8c8c8c8cc8ccccccc8ccc8ccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cc07c8c8c8c8c94cd4ccd5cd00081501489991091980080180118139aba10023006357426ae880084c0ac0a0cdc3a40000046aae78008d55ce8009baa0013574201e6ae84034cc07c004d5d0806119191919299a999ab9a001029028132323233332222123333001005004003002323232325335333573400206005e266442466002006004603c6ae84008cc014074d5d09aba20021303102e3370e90000011aab9e00235573a0026ea8d5d080298049aba1003323232325335333573400206005e22444006264a66a666ae680040c40c04c84888c004010dd71aba100313253353335734002064062264244460040086ae840104c0cc0c0cdc3a400800866e1d20020033370e90000011aab9e00235573a0026ea8d5d080119800bae357426ae8800888c8c8c8c94cd4ccd5cd0008188180891000899299a999ab9a00103203113212230020033007357420062606606066e1d20000033370e90010011aab9e00235573a0026ea8004d5d10009aba20021302a0273370e90000011aab9e00235573a0026ea8004c004d5d080518009aba10093001300175a6ae8401cd5d08031aba10053301d75c6ae84010d5d08019980090009aba1002232230023756002604c446666aae7c00480888c8cd4088cc8848cc00400c008dd71aab9d001300535573c00260086ae8800cd5d08010139aba1357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10010980c80b19b8748000008d55cf0011aab9d00137546ae84010c8c8c8c94cd4ccd5cd00080c00b8990911118018029bae35742004264a66a666ae680040640604c848888c004014c058d5d0801899299a999ab9a00101a019132122223002005300735742008264a66a666ae6800406c0684c848888c010014c8c8c8c94cd4ccd5cd00080f80f09909111111180280418061aba10021325335333573400204003e26424444444600e010601a6ae8400c4c94cd4ccd5cd00081081009991091111111980300480418071aba1004375c6ae84d5d1002099299a999ab9a001022021133221222222233002009008375c6ae84014dd71aba13574400a264a66a666ae6800408c0884cc8848888888cc004024020dd71aba1006375a6ae84d5d1003099299a999ab9a0010240231122222220041325335333573400204a0482244444440062604c04666e1d200c0083370e900500399b8748020018cdc3a400c00a66e1d20040043370e900100199b8748000008d55cf0011aab9d00137546ae840144c070064cdc3a400c00a66e1d20040043370e900100199b8748000008d55cf0011aab9d00137546ae84d5d1002119191919299a999ab9a0010180171321223002003300635742004264a66a666ae680040640604c8ccc888488ccc00401401000cdd69aba1004375a6ae84004dd69aba1357440026ae8800c4c06805ccdc3a400400666e1d200000235573c0046aae74004dd5000919191919299a999ab9a0010170161321223002003375c6ae840084c94cd4ccd5cd00080c00b89909118008019bae357420062603202c66e1d20020033370e90000011aab9e00235573a0026ea80044c04c040cdc3a40000046aae78008d55ce8009baa00110101300f49010350543500322323232325335333573400202001e264666444246660020080060046eb8d5d080198039aba1001375c6ae84d5d10009aba20021301100e3370e90000011aab9e00235573a0026ea8004c0108c8c8c94cd4c8ccd5cd00080780719b87480000084cc8848cc00400c008c02cd5d08009bae357426ae880044c03c030d55cf0011aab9d0013754002601844a66a00220144426a0044464a66a666ae6800404003c4c8c8ccd5cd00080900899b87003001337029000240042600e00866e3c008020c02c894cd40044024884d400888c94cd4ccd5cd000807807099199ab9a00101000f3370e00490010980380219b8f0020074890b4879647261486561645631002322300237580026014446666aae7c00480188cd4014c010d5d080118019aba200200b122002122122330010040032323232325335333573400201000e26644246600200600464646464a66a666ae6800403002c4dd71aba10021300d00a3370e90000011aab9e00235573a0026ea8d5d08011bad357426ae880084c024018cdc3a40000046aae78008d55ce8009baa00149010350543100122002122001232633573800200424002464600200244660066004004003"
+    "description": "hydra-vCommit-0.17.0-11-g449653fb9",
+    "cborHex": "59080a5908070100003232323322323322323232322225335332235300600522253232335007133002490103433031003233017225335001101522135002223253353335734002036034260280042600e00866e3c008028004d4c0040188888888888880204cc0092401034330320033016225335001101422135002223253353335734002034032260280042600e00866e3c008024d54cd4d4c0040188888888888880284c0512401035054380022100222220032350012200222533500110131335738004024646464a66a64666ae6800404003ccdc3a400000422440022a66a64666ae6800404003ccdc3a40040042244004260209201035054310035573c0046aae74004dd500119191919299a999ab9a00101000f1323233221233001003002323232325335333573400202c02a2646464646464646464646646666666466646664444444444442466666666666600201a01801601401201000e00c00a0080060046603c464646464a66a666ae680040a009c4cc8848cc00400c008c098d5d080118031aba1357440042605292103505431003370e90000011aab9e00235573a0026ea8004d5d08079aba100d3301e00135742018464646464a66a666ae6800409c0984c8c8c8cccc888848cccc00401401000c008c8c8c8c94cd4ccd5cd000817016899910919800801801180f1aba10023300501d357426ae880084c0bd240103505431003370e90000011aab9e00235573a0026ea8d5d080298049aba1003323232325335333573400205c05a22444006264a66a666ae680040bc0b84c84888c004010dd71aba10031325335333573400206005e264244460040086ae840104c0c524103505431003370e900200219b874800800ccdc3a40000046aae78008d55ce8009baa3574200466002eb8d5d09aba200222323232325335333573400205e05c2244002264a66a666ae680040c00bc4c8488c00800cc01cd5d080189818a4903505431003370e900000199b8748008008d55cf0011aab9d00137540026ae88004d5d10010981424903505431003370e90000011aab9e00235573a0026ea8004c004d5d080518009aba10093001300175a6ae8401cd5d08031aba10053301c75c6ae84010d5d08019980090009aba10022322300237560026048446666aae7c00480848c8cd4084cc8848cc00400c008dd71aab9d001300535573c00260086ae8800cd5d08010129aba1357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10010980ba4903505431003370e90000011aab9e00235573a0026ea8d5d080219191919299a999ab9a001016015132122223003005375c6ae840084c94cd4ccd5cd00080b80b099091111800802980a9aba10031325335333573400203002e26424444600400a600e6ae840104c94cd4ccd5cd00080c80c09909111180200299191919299a999ab9a00101d01c132122222223005008300c35742004264a66a666ae680040780744c848888888c01c020c034d5d0801899299a999ab9a00101f01e133221222222233006009008300e357420086eb8d5d09aba20041325335333573400204003e2664424444444660040120106eb8d5d08029bae357426ae880144c94cd4ccd5cd0008108100999109111111198008048041bae3574200c6eb4d5d09aba200613253353335734002044042224444444008264a66a666ae6800408c08844888888800c4c09124103505431003370e900600419b874802801ccdc3a401000c66e1d20060053370e900200219b874800800ccdc3a40000046aae78008d55ce8009baa3574200a26034920103505431003370e900300299b8748010010cdc3a400400666e1d200000235573c0046aae74004dd51aba135744008464646464a66a666ae680040580544c8488c00800cc018d5d0801099299a999ab9a001017016132333222122333001005004003375a6ae84010dd69aba1001375a6ae84d5d10009aba200313018490103505431003370e900100199b8748000008d55cf0011aab9d0013754002464646464a66a666ae680040540504c8488c00800cdd71aba10021325335333573400202c02a26424460020066eb8d5d08018980ba48103505431003370e900100199b8748000008d55cf0011aab9d001375400226022920103505431003370e90000011aab9e00235573a0026ea800440384c03524010350543500322323232325335333573400201c01a264666444246660020080060046eb8d5d080198039aba1001375c6ae84d5d10009aba20021300f49103505431003370e90000011aab9e00235573a0026ea8004c00c8c8c8c94cd4c8ccd5cd00080680619b87480000084cc8848cc00400c008c028d5d08009bae357426ae880044c035241035054310035573c0046aae74004dd5000980511299a80088041109a8011119299a999ab9a00100e00d132333573400201e01c66e1c008cdc0a400090010980380219b8f0024890b487964726148656164563100300922533500110072213500222325335333573400201a018264666ae68004038034cdc3801240042600e00866e3c00922010b4879647261486561645631002322300237580026012446666aae7c00480188cd4014c010d5d080118019aba200200a122002122122330010040032323232325335333573400200e00c26644246600200600464646464a66a666ae6800402c0284dd71aba10021300c49103505431003370e90000011aab9e00235573a0026ea8d5d08011bad357426ae880084c02124103505431003370e90000011aab9e00235573a0026ea80044880084880048c98cd5ce0008010900091918008009119801980100100081"
 }
diff --git a/hydra-plutus/scripts/vHead.plutus b/hydra-plutus/scripts/vHead.plutus
diff --git a/hydra-plutus/scripts/vInitial.plutus b/hydra-plutus/scripts/vInitial.plutus
diff --git a/nix/hydra/packages.nix b/nix/hydra/packages.nix
@@ -121,10 +121,18 @@ rec {
 
   hydraw-static = musl64Pkgs.hydraw.components.exes.hydraw;
 
-  plutus-cbor-tests = nativePkgs.plutus-cbor.components.exes.tests;
-
-  plutus-merkle-tree-tests = nativePkgs.plutus-merkle-tree.components.exes.tests;
-  hydra-plutus-tests = nativePkgs.hydra-plutus.components.exes.tests;
+  plutus-cbor-tests = pkgs.mkShellNoCC {
+    name = "plutus-cbor-tests";
+    buildInputs = [ nativePkgs.plutus-cbor.components.tests.tests ];
+  };
+  plutus-merkle-tree-tests = pkgs.mkShellNoCC {
+    name = "plutus-merkle-tree-tests";
+    buildInputs = [ nativePkgs.plutus-merkle-tree.components.tests.tests ];
+  };
+  hydra-plutus-tests = pkgs.mkShellNoCC {
+    name = "hydra-plutus-tests";
+    buildInputs = [ nativePkgs.hydra-plutus.components.tests.tests ];
+  };
   hydra-node-tests = pkgs.mkShellNoCC {
     name = "hydra-node-tests";
     buildInputs = [
diff --git a/plutus-cbor/plutus-cbor.cabal b/plutus-cbor/plutus-cbor.cabal
@@ -46,7 +46,7 @@ library
 
   exposed-modules: Plutus.Codec.CBOR.Encoding
 
-executable tests
+test-suite tests
   import:             project-config
   type:               exitcode-stdio-1.0
   hs-source-dirs:     test
diff --git a/plutus-merkle-tree/plutus-merkle-tree.cabal b/plutus-merkle-tree/plutus-merkle-tree.cabal
@@ -48,7 +48,7 @@ library
     , plutus-tx
     , text
 
-executable tests
+test-suite tests
   import:             project-config
   type:               exitcode-stdio-1.0
   hs-source-dirs:     test

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "PlutusScriptV2",`
`3`		`- "description": "hydra-vCommit-0.15.0-181-g9e65bbf07",`
`4`		- "cborHex": "5907b45907b10100003232323322323233223232323232222533533223530060052225323233500713300249010343303100323301922533500110172213500222325335333573400203a038260280042600e00866e3c008028004d4c0040188888888888880204cc0092401034330320033018225335001101622135002223253353335734002038036260280042600e00866e3c008024d54cd4d4c0040188888888888880284c0592401035054380022100222220032350012200222533500110151335738004028646464a66a64666ae68004048044cdc3a400000422440022a66a64666ae68004048044cdc3a400400422440042602401e6aae78008d55ce8009baa0023232323253353335734002024022264646644246600200600464646464a66a666ae6800406005c4c8c8c8c8c8c8c8c8c8c8cc8ccccccc8ccc8ccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cc07c8c8c8c8c94cd4ccd5cd00081501489991091980080180118139aba10023006357426ae880084c0ac0a0cdc3a40000046aae78008d55ce8009baa0013574201e6ae84034cc07c004d5d0806119191919299a999ab9a001029028132323233332222123333001005004003002323232325335333573400206005e266442466002006004603c6ae84008cc014074d5d09aba20021303102e3370e90000011aab9e00235573a0026ea8d5d080298049aba1003323232325335333573400206005e22444006264a66a666ae680040c40c04c84888c004010dd71aba100313253353335734002064062264244460040086ae840104c0cc0c0cdc3a400800866e1d20020033370e90000011aab9e00235573a0026ea8d5d080119800bae357426ae8800888c8c8c8c94cd4ccd5cd0008188180891000899299a999ab9a00103203113212230020033007357420062606606066e1d20000033370e90010011aab9e00235573a0026ea8004d5d10009aba20021302a0273370e90000011aab9e00235573a0026ea8004c004d5d080518009aba10093001300175a6ae8401cd5d08031aba10053301d75c6ae84010d5d08019980090009aba1002232230023756002604c446666aae7c00480888c8cd4088cc8848cc00400c008dd71aab9d001300535573c00260086ae8800cd5d08010139aba1357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10010980c80b19b8748000008d55cf0011aab9d00137546ae84010c8c8c8c94cd4ccd5cd00080c00b8990911118018029bae35742004264a66a666ae680040640604c848888c004014c058d5d0801899299a999ab9a00101a019132122223002005300735742008264a66a666ae6800406c0684c848888c010014c8c8c8c94cd4ccd5cd00080f80f09909111111180280418061aba10021325335333573400204003e26424444444600e010601a6ae8400c4c94cd4ccd5cd00081081009991091111111980300480418071aba1004375c6ae84d5d1002099299a999ab9a001022021133221222222233002009008375c6ae84014dd71aba13574400a264a66a666ae6800408c0884cc8848888888cc004024020dd71aba1006375a6ae84d5d1003099299a999ab9a0010240231122222220041325335333573400204a0482244444440062604c04666e1d200c0083370e900500399b8748020018cdc3a400c00a66e1d20040043370e900100199b8748000008d55cf0011aab9d00137546ae840144c070064cdc3a400c00a66e1d20040043370e900100199b8748000008d55cf0011aab9d00137546ae84d5d1002119191919299a999ab9a0010180171321223002003300635742004264a66a666ae680040640604c8ccc888488ccc00401401000cdd69aba1004375a6ae84004dd69aba1357440026ae8800c4c06805ccdc3a400400666e1d200000235573c0046aae74004dd5000919191919299a999ab9a0010170161321223002003375c6ae840084c94cd4ccd5cd00080c00b89909118008019bae357420062603202c66e1d20020033370e90000011aab9e00235573a0026ea80044c04c040cdc3a40000046aae78008d55ce8009baa00110101300f49010350543500322323232325335333573400202001e264666444246660020080060046eb8d5d080198039aba1001375c6ae84d5d10009aba20021301100e3370e90000011aab9e00235573a0026ea8004c0108c8c8c94cd4c8ccd5cd00080780719b87480000084cc8848cc00400c008c02cd5d08009bae357426ae880044c03c030d55cf0011aab9d0013754002601844a66a00220144426a0044464a66a666ae6800404003c4c8c8ccd5cd00080900899b87003001337029000240042600e00866e3c008020c02c894cd40044024884d400888c94cd4ccd5cd000807807099199ab9a00101000f3370e00490010980380219b8f0020074890b4879647261486561645631002322300237580026014446666aae7c00480188cd4014c010d5d080118019aba200200b122002122122330010040032323232325335333573400201000e26644246600200600464646464a66a666ae6800403002c4dd71aba10021300d00a3370e90000011aab9e00235573a0026ea8d5d08011bad357426ae880084c024018cdc3a40000046aae78008d55ce8009baa00149010350543100122002122001232633573800200424002464600200244660066004004003"
	`3`	`+ "description": "hydra-vCommit-0.17.0-11-g449653fb9",`
	`4`	+ "cborHex": "59080a5908070100003232323322323322323232322225335332235300600522253232335007133002490103433031003233017225335001101522135002223253353335734002036034260280042600e00866e3c008028004d4c0040188888888888880204cc0092401034330320033016225335001101422135002223253353335734002034032260280042600e00866e3c008024d54cd4d4c0040188888888888880284c0512401035054380022100222220032350012200222533500110131335738004024646464a66a64666ae6800404003ccdc3a400000422440022a66a64666ae6800404003ccdc3a40040042244004260209201035054310035573c0046aae74004dd500119191919299a999ab9a00101000f1323233221233001003002323232325335333573400202c02a2646464646464646464646646666666466646664444444444442466666666666600201a01801601401201000e00c00a0080060046603c464646464a66a666ae680040a009c4cc8848cc00400c008c098d5d080118031aba1357440042605292103505431003370e90000011aab9e00235573a0026ea8004d5d08079aba100d3301e00135742018464646464a66a666ae6800409c0984c8c8c8cccc888848cccc00401401000c008c8c8c8c94cd4ccd5cd000817016899910919800801801180f1aba10023300501d357426ae880084c0bd240103505431003370e90000011aab9e00235573a0026ea8d5d080298049aba1003323232325335333573400205c05a22444006264a66a666ae680040bc0b84c84888c004010dd71aba10031325335333573400206005e264244460040086ae840104c0c524103505431003370e900200219b874800800ccdc3a40000046aae78008d55ce8009baa3574200466002eb8d5d09aba200222323232325335333573400205e05c2244002264a66a666ae680040c00bc4c8488c00800cc01cd5d080189818a4903505431003370e900000199b8748008008d55cf0011aab9d00137540026ae88004d5d10010981424903505431003370e90000011aab9e00235573a0026ea8004c004d5d080518009aba10093001300175a6ae8401cd5d08031aba10053301c75c6ae84010d5d08019980090009aba10022322300237560026048446666aae7c00480848c8cd4084cc8848cc00400c008dd71aab9d001300535573c00260086ae8800cd5d08010129aba1357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10010980ba4903505431003370e90000011aab9e00235573a0026ea8d5d080219191919299a999ab9a001016015132122223003005375c6ae840084c94cd4ccd5cd00080b80b099091111800802980a9aba10031325335333573400203002e26424444600400a600e6ae840104c94cd4ccd5cd00080c80c09909111180200299191919299a999ab9a00101d01c132122222223005008300c35742004264a66a666ae680040780744c848888888c01c020c034d5d0801899299a999ab9a00101f01e133221222222233006009008300e357420086eb8d5d09aba20041325335333573400204003e2664424444444660040120106eb8d5d08029bae357426ae880144c94cd4ccd5cd0008108100999109111111198008048041bae3574200c6eb4d5d09aba200613253353335734002044042224444444008264a66a666ae6800408c08844888888800c4c09124103505431003370e900600419b874802801ccdc3a401000c66e1d20060053370e900200219b874800800ccdc3a40000046aae78008d55ce8009baa3574200a26034920103505431003370e900300299b8748010010cdc3a400400666e1d200000235573c0046aae74004dd51aba135744008464646464a66a666ae680040580544c8488c00800cc018d5d0801099299a999ab9a001017016132333222122333001005004003375a6ae84010dd69aba1001375a6ae84d5d10009aba200313018490103505431003370e900100199b8748000008d55cf0011aab9d0013754002464646464a66a666ae680040540504c8488c00800cdd71aba10021325335333573400202c02a26424460020066eb8d5d08018980ba48103505431003370e900100199b8748000008d55cf0011aab9d001375400226022920103505431003370e90000011aab9e00235573a0026ea800440384c03524010350543500322323232325335333573400201c01a264666444246660020080060046eb8d5d080198039aba1001375c6ae84d5d10009aba20021300f49103505431003370e90000011aab9e00235573a0026ea8004c00c8c8c8c94cd4c8ccd5cd00080680619b87480000084cc8848cc00400c008c028d5d08009bae357426ae880044c035241035054310035573c0046aae74004dd5000980511299a80088041109a8011119299a999ab9a00100e00d132333573400201e01c66e1c008cdc0a400090010980380219b8f0024890b487964726148656164563100300922533500110072213500222325335333573400201a018264666ae68004038034cdc3801240042600e00866e3c00922010b4879647261486561645631002322300237580026012446666aae7c00480188cd4014c010d5d080118019aba200200a122002122122330010040032323232325335333573400200e00c26644246600200600464646464a66a666ae6800402c0284dd71aba10021300c49103505431003370e90000011aab9e00235573a0026ea8d5d08011bad357426ae880084c02124103505431003370e90000011aab9e00235573a0026ea80044880084880048c98cd5ce0008010900091918008009119801980100100081"
`5`	`5`	`}`