Merge pull request #190 from knocte/formattingFixup

Add Release build to CI lane & fix Core warnings
joemphilips · Apr 26, 2022 · 88599a0 · 88599a0
2 parents c813b77 + b71b08d
commit 88599a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,6 +27,10 @@ jobs:
         dotnet build tests/DotNetLightning.Core.Tests -p:Portability=True --framework=${{ matrix.framework }}
         dotnet run --no-build --project tests/DotNetLightning.Core.Tests --framework=${{ matrix.framework }}
 
+    - name: Build/pack in release mode
+      run: |
+        dotnet pack -p:Configuration=Release src/DotNetLightning.Core -p:Portability=True
+
     - name: Clean to prepare for NSec build
       run: |
         dotnet clean

diff --git a/src/DotNetLightning.Core/Utils/Primitives.fs b/src/DotNetLightning.Core/Utils/Primitives.fs
@@ -619,18 +619,13 @@ module Primitives =
             (scriptPubKey: Script)
             : Result<ShutdownScriptPubKey, string> =
             let isValidFinalScriptPubKey =
-                (PayToPubkeyHashTemplate.Instance.CheckScriptPubKey(
-                    scriptPubKey
-                ))
-                || (PayToScriptHashTemplate.Instance.CheckScriptPubKey(
-                    scriptPubKey
-                ))
-                || (PayToWitPubKeyHashTemplate.Instance.CheckScriptPubKey(
-                    scriptPubKey
-                ))
-                || (PayToWitScriptHashTemplate.Instance.CheckScriptPubKey(
-                    scriptPubKey
-                ))
+                (PayToPubkeyHashTemplate.Instance.CheckScriptPubKey scriptPubKey)
+                || (PayToScriptHashTemplate.Instance.CheckScriptPubKey
+                        scriptPubKey)
+                || (PayToWitPubKeyHashTemplate.Instance.CheckScriptPubKey
+                        scriptPubKey)
+                || (PayToWitScriptHashTemplate.Instance.CheckScriptPubKey
+                        scriptPubKey)
 
             if isValidFinalScriptPubKey then
                 Ok