cardano-foundation
diff --git a/‎default.nix‎
Lines changed: 57 additions & 45 deletions b/‎default.nix‎
Lines changed: 57 additions & 45 deletions
diff --git a/‎lib/core-integration/src/Test/Integration/Framework/DSL.hs‎
Lines changed: 45 additions & 0 deletions b/‎lib/core-integration/src/Test/Integration/Framework/DSL.hs‎
Lines changed: 45 additions & 0 deletions
@@ -69,11 +69,61 @@ let
   } // args);
   haskellPackages = buildHaskellPackages {};
   profiledHaskellPackages = buildHaskellPackages { profiling = true; };
+  coveredHaskellPackages = buildHaskellPackages { coverage = true; };
 
   getPackageChecks = mapAttrs (_: package: package.checks);
 
+  # Creates a development environment for Cabal builds or ghci
+  # sessions, with various build tools included.
+  mkShell = name: hp: hp.shellFor {
+    inherit name;
+    packages = ps: attrValues (selectProjectPackages ps);
+    buildInputs = (with self; [
+        jormungandr
+        jormungandr-cli
+        cardano-node
+        cardano-cli
+        cardano-address
+        cardano-tx
+        bech32
+      ]) ++ (with pkgs; [
+        niv
+        pkgconfig
+        python3Packages.openapi-spec-validator
+        ruby
+        sqlite-interactive
+        yq
+      ]) ++ attrValues hls;
+    tools = {
+      cabal = "3.2.0.0";
+      ghcid = "0.8.7";
+      hlint = "3.2";
+      lentil = "1.3.2.0";
+      stylish-haskell = "0.11.0.3";
+      weeder = "1.0.9";
+    };
+    CARDANO_NODE_CONFIGS = cardano-node.deployments;
+    meta.platforms = lib.platforms.unix;
+    shellHook = ''
+      setup_completion() {
+        local p
+        for p in $buildInputs; do
+          if [ -d "$p/share/bash-completion" ]; then
+            addToSearchPath XDG_DATA_DIRS "$p/share"
+          fi
+        done
+      }
+      setup_completion
+    '';
+  };
+
+  # Build latest release of haskell-language-server from github
+  hls = pkgs.callPackages ./nix/hls.nix {
+    compiler-nix-name = haskellPackages._config.compiler.nix-name;
+  };
+
   self = {
-    inherit pkgs commonLib src haskellPackages profiledHaskellPackages;
+    inherit pkgs commonLib src haskellPackages profiledHaskellPackages coveredHaskellPackages;
     # Jormungandr
     inherit (jmPkgs) jormungandr jormungandr-cli;
     # expose cardano-node, so daedalus can ship it without needing to pin cardano-node
@@ -101,9 +151,11 @@ let
     };
 
     # `tests` are the test suites which have been built.
-    tests = collectComponents "tests" isProjectPackage haskellPackages;
+    tests = collectComponents "tests" isProjectPackage coveredHaskellPackages;
     # `checks` are the result of executing the tests.
-    checks = pkgs.recurseIntoAttrs (getPackageChecks (selectProjectPackages haskellPackages));
+    checks = pkgs.recurseIntoAttrs (getPackageChecks (selectProjectPackages coveredHaskellPackages));
+    # Combined project coverage report
+    inherit (coveredHaskellPackages) testCoverageReport;
     # `benchmarks` are only built, not run.
     benchmarks = collectComponents "benchmarks" isProjectPackage haskellPackages;
 
@@ -114,48 +166,8 @@ let
       shelley = self.cardano-wallet;
     });
 
-    shell = haskellPackages.shellFor {
-      name = "cardano-wallet-shell";
-      packages = ps: attrValues (selectProjectPackages ps);
-      buildInputs = (with self; [
-          jormungandr
-          jormungandr-cli
-          cardano-node
-          cardano-cli
-          cardano-address
-          cardano-tx
-          bech32
-        ]) ++ (with pkgs; [
-          niv
-          pkgconfig
-          python3Packages.openapi-spec-validator
-          ruby
-          sqlite-interactive
-          yq
-        ]);
-      tools = {
-        cabal = "3.2.0.0";
-        ghcid = "0.8.7";
-        ghcide = "0.2.0";
-        hlint = "3.1.6";
-        lentil = "1.3.2.0";
-        stylish-haskell = "0.11.0.0";
-        weeder = "1.0.9";
-      };
-      CARDANO_NODE_CONFIGS = cardano-node.deployments;
-      meta.platforms = lib.platforms.unix;
-      shellHook = ''
-        setup_completion() {
-          local p
-          for p in $buildInputs; do
-            if [ -d "$p/share/bash-completion" ]; then
-              addToSearchPath XDG_DATA_DIRS "$p/share"
-            fi
-          done
-        }
-        setup_completion
-      '';
-    };
+    shell = mkShell "cardano-wallet-shell" haskellPackages;
+    shell-prof = mkShell "cardano-wallet-shell-profiled" profiledHaskellPackages;
     cabalShell = import ./nix/cabal-shell.nix { inherit pkgs; walletPackages = self; };
     stackShell = import ./nix/stack-shell.nix { inherit pkgs; walletPackages = self; };
 
 
@@ -73,8 +73,10 @@ module Test.Integration.Framework.DSL
     , getFromResponseList
     , json
     , joinStakePool
+    , joinStakePoolUnsigned
     , delegationFee
     , quitStakePool
+    , quitStakePoolUnsigned
     , selectCoins
     , listAddresses
     , listTransactions
@@ -144,6 +146,9 @@ module Test.Integration.Framework.DSL
     , postExternalTransactionViaCLI
     , deleteTransactionViaCLI
     , getTransactionViaCLI
+
+    -- utilites
+    , getRetirementEpoch
     ) where
 
 import Cardano.CLI
@@ -171,6 +176,7 @@ import Cardano.Wallet.Api.Types
     , ApiFee
     , ApiNetworkInformation
     , ApiNetworkParameters (..)
+    , ApiStakePool
     , ApiT (..)
     , ApiTransaction
     , ApiTxId (ApiTxId)
@@ -1233,6 +1239,24 @@ joinStakePool ctx p (w, pass) = do
     request @(ApiTransaction n) ctx
         (Link.joinStakePool (Identity p) w) Default payload
 
+joinStakePoolUnsigned
+    :: forall n style t w.
+        ( HasType (ApiT WalletId) w
+        , DecodeAddress n
+        , EncodeAddress n
+        , Link.Discriminate style
+        )
+    => Context t
+    -> w
+    -> ApiT PoolId
+    -> IO (HTTP.Status, Either RequestException (ApiCoinSelection n))
+joinStakePoolUnsigned ctx w pid = do
+    let payload = Json [aesonQQ| {
+            "delegation_action": { "action": "join", "pool": #{pid} }
+        } |]
+    request @(ApiCoinSelection n) ctx
+        (Link.selectCoins @style w) Default payload
+
 quitStakePool
     :: forall n t w.
         ( HasType (ApiT WalletId) w
@@ -1249,6 +1273,23 @@ quitStakePool ctx (w, pass) = do
     request @(ApiTransaction n) ctx
         (Link.quitStakePool w) Default payload
 
+quitStakePoolUnsigned
+    :: forall n style t w.
+        ( HasType (ApiT WalletId) w
+        , DecodeAddress n
+        , EncodeAddress n
+        , Link.Discriminate style
+        )
+    => Context t
+    -> w
+    -> IO (HTTP.Status, Either RequestException (ApiCoinSelection n))
+quitStakePoolUnsigned ctx w = do
+    let payload = Json [aesonQQ| {
+            "delegation_action": { "action": "quit" }
+        } |]
+    request @(ApiCoinSelection n) ctx
+        (Link.selectCoins @style w) Default payload
+
 selectCoins
     :: forall n style t w.
         ( HasType (ApiT WalletId) w
@@ -1898,3 +1939,7 @@ delegating
 delegating pidActive nexts = (notDelegating nexts)
     { active = ApiWalletDelegationNext Delegating (Just pidActive) Nothing
     }
+
+
+getRetirementEpoch :: ApiStakePool -> Maybe EpochNo
+getRetirementEpoch = fmap (view (#epochNumber . #getApiT)) .  view #retirement