fix lnd-client tests

Author: functora

pub/lnd-client/.ignore

@@ -1 +1,2 @@
 .stack-work
+src/Proto

pub/lnd-client/lnd-client.cabal

@@ -444,6 +444,7 @@ test-suite lnd-client-test
       async
     , base >=4.7 && <5
     , containers
+    , functora
     , hspec
     , unliftio
   default-language: Haskell2010

pub/lnd-client/nix/proto-lens-protoc.nix

@@ -1,13 +1,8 @@
 let
-  header = import ./header.nix;
-  proto-lens-src = fetchGit {
-    url = "https://github.com/coingaming/proto-lens.git";
-    ref = "master";
-    rev = "7e75e2c95d9bf608965ff8335ee618978181034a";
-  };
-  proto-lens-protoc = header.pkgs.haskell-nix.project {
-    src = "${proto-lens-src}/proto-lens-protoc";
-    compiler-nix-name = "ghc902";
+  src = fetchTarball {
+    url = "https://github.com/functora/functora.github.io/archive/53356131206ffdc2eae2f1a18f55333ef3465639.tar.gz";
+    sha256 = "1qsg53kakcjpk1qn2vwj90ypwynqw6zvj224664498a6mxl6j868";
   };
+  prj = import "${src}/nix/project.nix" {};
 in
-  proto-lens-protoc.hsPkgs.proto-lens-protoc.components.exes.proto-lens-protoc
+  prj.proto-lens-protoc.components.exes.proto-lens-protoc

pub/lnd-client/package.yaml

@@ -185,4 +185,5 @@ tests:
       - unliftio
       - containers
       - hspec
+      - functora
     <<: *ghcid

pub/lnd-client/shell.nix

@@ -1,6 +1,6 @@
 {
   extraBuildInputs ? [],
-  withShellHook ? false,
+  withShellHook ? true,
   profile ? false,
 }: let
   # project = import ./default.nix {inherit profile;};
@@ -9,7 +9,7 @@
   # pkgs = header.pkgs;
   # nixPkgsLegacy = header.nixPkgsLegacy;
   # lnd = import ./nix/lnd.nix {inherit pkgs;};
-  # proto-lens-protoc = import ./nix/proto-lens-protoc.nix;
+  proto-lens-protoc = import ./nix/proto-lens-protoc.nix;
   project = import ../../nix/project.nix {};
   pkgs = project.pkgs;
 in
@@ -23,17 +23,16 @@ in
         # haskellPackages.hpack
         # haskellPackages.stack
         # haskellPackages.hp2pretty
-        # pkgs.bitcoin
-        # pkgs.openssl
-        # pkgs.expect
-        # pkgs.ps
-        # pkgs.jq
         # pkgs.ormolu
         # pkgs.niv
-        # lnd
+        pkgs.bitcoin
+        pkgs.openssl
+        pkgs.expect
+        pkgs.ps
+        pkgs.jq
+        pkgs.lnd
         pkgs.protobuf
-        # proto-lens-protoc
-        project.proto-lens-protoc.components.exes.proto-lens-protoc
+        proto-lens-protoc
       ]
       ++ extraBuildInputs;
     tools = {

pub/lnd-client/src/LndClient/Data/ChannelPoint.hs

@@ -59,14 +59,25 @@ channelPointParser x =
         Right txidHex -> do
           idxTS <-
             first
-              ( const
-                  $ FromGrpcError "Invalid ChannelPoint outputIndex"
+              ( \e ->
+                  FromGrpcError
+                    $ "Invalid ChannelPoint outputIndex BS "
+                    <> inspect idxBS
+                    <> " "
+                    <> show e
               )
               $ decodeUtf8' idxBS
           ChannelPoint (TxId $ BS.reverse txidHex)
-            <$> maybeToRight
-              (FromGrpcError "Invalid ChannelPoint outputIndex")
-              (readMaybe $ TS.unpack idxTS)
+            <$> maybe
+              ( Left
+                  . FromGrpcError
+                  $ "Invalid ChannelPoint outputIndex TS "
+                  <> inspect idxTS
+              )
+              ( Right . Vout
+              )
+              ( readMaybe $ TS.unpack idxTS
+              )
         Left {} ->
           Left $ FromGrpcError "Invalid ChannelPoint fundingTxidBytes"
     _ ->