Merge pull request joemphilips#93 from joemphilips/fix_ci

use dotnet run to run expecto tests

Author: joemphilips

.github/workflows/ci.yml

@@ -19,16 +19,24 @@ jobs:
       # we want to run only once.
       if: startsWith(matrix.os, 'ubuntu-18')
       run: |
-        dotnet test tests/DotNetLightning.Core.Tests -p:BouncyCastle=True
+        dotnet build tests/DotNetLightning.Core.Tests -p:BouncyCastle=True
+        dotnet run --project tests/DotNetLightning.Core.Tests
     - name: Run Infrastructure tests on BouncyCastle
       # we want to run only once.
       if: startsWith(matrix.os, 'ubuntu-18')
       run: |
-        dotnet test tests/DotNetLightning.Infrastructure.Tests -p:BouncyCastle=True
+        dotnet build tests/DotNetLightning.Infrastructure.Tests -p:BouncyCastle=True
+        dotnet run --project tests/DotNetLightning.Infrastructure.Tests
 
     - name: Clean to prepare for NSec build
       run: |
         dotnet clean
-    - name: Run tests
+    - name: Run core tests
+      run: |
+        dotnet run --project tests/DotNetLightning.Core.Tests
+    - name: Run Infrastructure tests
+      run: |
+        dotnet run --project tests/DotNetLightning.Infrastructure.Tests
+    - name: Run other tests
       run: |
         dotnet test

src/DotNetLightning.Core/Serialize/Msgs/Msgs.fs

@@ -390,25 +390,10 @@ type Init =
                 this.Features <- oredFeatures |> FeatureBit.CreateUnsafe
                 this.TLVStream <- ls.ReadTLVStream() |> Array.map(InitTLV.FromGenericTLV)
             member this.Serialize(ls) =
-                // Trim any leading zero bytes from the from of the local features
-                let localFeatures =
-                    let features = this.Features.ToByteArray()
-                    let startIndex =
-                        match Array.tryFindIndex (fun (b: byte) -> b <> 0uy) features with
-                        | Some index -> index
-                        | None -> features.Length
-                    features.[startIndex..]
-                // For legacy compatibility, the last (lowest) 13 bits get
-                // duplicated in the globalFeatures array.
-                let globalFeatures =
-                    if localFeatures.Length < 2 then
-                        localFeatures
-                    else
-                        let features = localFeatures.[(localFeatures.Length - 2)..]
-                        features.[0] <- features.[0] &&& 0b00111111uy
-                        features
-                ls.WriteWithLen(globalFeatures)
-                ls.WriteWithLen(localFeatures)
+                // For backwards compatibility reason, we must consider legacy `global features` section. (see bolt 1)
+                let g: byte[] = [||]
+                ls.WriteWithLen(g)
+                ls.WriteWithLen(this.Features.ToByteArray())
                 ls.WriteTLVStream(this.TLVStream |> Array.map(fun tlv -> tlv.ToGenericTLV()))
 
 [<CLIMutable>]

tests/DotNetLightning.Core.Tests/DotNetLightning.Core.Tests.fsproj

@@ -36,7 +36,6 @@
     <PackageReference Include="Expecto.FsCheck" Version="8.10.1" />
     <PackageReference Update="FSharp.Core" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />
-    <PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.*" />
   </ItemGroup>
   <ItemGroup>

tests/DotNetLightning.Infrastructure.Tests/DotNetLightning.Infrastructure.Tests.fsproj

@@ -24,7 +24,6 @@
     <PackageReference Update="FSharp.Core" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0" />
-    <PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.*" />
   </ItemGroup>