* use nethermind 1.29.1

aboutcircles · Nov 4, 2024 · 4b12a80 · 4b12a80
1 parent 25f7922
commit 4b12a80
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 12 deletions.
diff --git a/Circles.Index.CirclesV1/Circles.Index.CirclesV1.csproj b/Circles.Index.CirclesV1/Circles.Index.CirclesV1.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
       <PackageReference Include="Nethermind.Numerics.Int256" Version="1.2.0" />
-      <PackageReference Include="Nethermind.ReferenceAssemblies" Version="1.28.0" />
+      <PackageReference Include="Nethermind.ReferenceAssemblies" Version="1.29.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Circles.Index.CirclesV2/Circles.Index.CirclesV2.csproj b/Circles.Index.CirclesV2/Circles.Index.CirclesV2.csproj
@@ -14,7 +14,7 @@
 
     <ItemGroup>
       <PackageReference Include="Nethermind.Numerics.Int256" Version="1.2.0" />
-      <PackageReference Include="Nethermind.ReferenceAssemblies" Version="1.28.0" />
+      <PackageReference Include="Nethermind.ReferenceAssemblies" Version="1.29.1" />
     </ItemGroup>
 
 </Project>
diff --git a/Circles.Index.Common/Circles.Index.Common.csproj b/Circles.Index.Common/Circles.Index.Common.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
       <PackageReference Include="Nethermind.Numerics.Int256" Version="1.2.0" />
-      <PackageReference Include="Nethermind.ReferenceAssemblies" Version="1.28.0" />
+      <PackageReference Include="Nethermind.ReferenceAssemblies" Version="1.29.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Circles.Index.Query.Tests/Circles.Index.Query.Tests.csproj b/Circles.Index.Query.Tests/Circles.Index.Query.Tests.csproj
@@ -14,8 +14,8 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-        <PackageReference Include="NUnit" Version="4.1.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="NUnit" Version="4.2.2" />
         <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Circles.Index.Rpc/Circles.Index.Rpc.csproj b/Circles.Index.Rpc/Circles.Index.Rpc.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-      <PackageReference Include="Nethermind.ReferenceAssemblies" Version="1.28.0" />
+      <PackageReference Include="Nethermind.ReferenceAssemblies" Version="1.29.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Circles.Index/Circles.Index.csproj b/Circles.Index/Circles.Index.csproj
@@ -21,9 +21,9 @@
 
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8" />
+      <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.10" />
       <PackageReference Include="Nethermind.Numerics.Int256" Version="1.2.0" />
-      <PackageReference Include="Nethermind.ReferenceAssemblies" Version="1.28.0" />
+      <PackageReference Include="Nethermind.ReferenceAssemblies" Version="1.29.1" />
     </ItemGroup>
 
 

diff --git a/Circles.Pathfinder.Tests/Circles.Pathfinder.Tests.csproj b/Circles.Pathfinder.Tests/Circles.Pathfinder.Tests.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="6.0.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="Moq" Version="4.20.72" />
+        <PackageReference Include="NUnit" Version="4.2.2" />
+        <PackageReference Include="NUnit.Analyzers" Version="3.9.0"/>
+        <PackageReference Include="NUnit3TestAdapter" Version="4.5.0"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Using Include="NUnit.Framework"/>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Circles.Index.Common\Circles.Index.Common.csproj" />
+      <ProjectReference Include="..\Circles.Pathfinder\Circles.Pathfinder.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/Circles.Pathfinder.Tests/Pathfinder.cs b/Circles.Pathfinder.Tests/Pathfinder.cs
@@ -0,0 +1,25 @@
+using Circles.Pathfinder.Data;
+using Circles.Pathfinder.DTOs;
+using Circles.Pathfinder.Graphs;
+
+namespace Circles.Pathfinder.Tests;
+
+[TestFixture]
+public class PathfinderTests
+{
+    [Test]
+    public async Task FindPath()
+    {
+        var loadGraph = new LoadGraph("Host=localhost;Port=5432;Database=postgres;Username=postgres;Password=postgres");
+        var graphFactory = new GraphFactory();
+        var pathfinder = new V2Pathfinder(loadGraph, graphFactory);
+        var flowRequest = new FlowRequest
+        {
+            Source = "0x32e69894af3a7d1124baa2d9f1fcd38d9d58fe4a",
+            Sink = "0x43e96201714514f9a1dd5bd9fbe3f01c329af95a",
+            TargetFlow = "9999999999999999999999999999999999999999"
+        };
+        var result = await pathfinder.ComputeMaxFlow(flowRequest);
+        Assert.That(result.MaxFlow, Is.Not.EqualTo("0"));
+    }
+}
diff --git a/Circles.sln b/Circles.sln
@@ -61,6 +61,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "protobuf-types", "protobuf-
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Circles.Pathfinder", "Circles.Pathfinder\Circles.Pathfinder.csproj", "{756580B1-2D2A-4FFE-9711-046A10853003}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Circles.Pathfinder.Tests", "Circles.Pathfinder.Tests\Circles.Pathfinder.Tests.csproj", "{62AB2354-6098-4C31-8C85-CFE07E704F93}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -119,6 +121,10 @@ Global
 		{756580B1-2D2A-4FFE-9711-046A10853003}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{756580B1-2D2A-4FFE-9711-046A10853003}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{756580B1-2D2A-4FFE-9711-046A10853003}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62AB2354-6098-4C31-8C85-CFE07E704F93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62AB2354-6098-4C31-8C85-CFE07E704F93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62AB2354-6098-4C31-8C85-CFE07E704F93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62AB2354-6098-4C31-8C85-CFE07E704F93}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{2B7D2126-6D6F-4A5B-81A1-3E5F1A9645F6} = {64189094-62E5-48CA-BD66-1A7B82263BA8}

diff --git a/arm64.Dockerfile b/arm64.Dockerfile
@@ -6,7 +6,7 @@ COPY . .
 RUN dotnet restore
 RUN dotnet publish -c Release -o /circles-nethermind-plugin
 
-FROM nethermind/nethermind:1.28.0 AS base
+FROM nethermind/nethermind:1.29.1 AS base
 
 # dotnet libs
 COPY --from=build /circles-nethermind-plugin/Circles.Index.deps.json /nethermind/plugins

diff --git a/x64.Dockerfile b/x64.Dockerfile
@@ -6,7 +6,7 @@ COPY . .
 RUN dotnet restore
 RUN dotnet publish -c Release -o /circles-nethermind-plugin
 
-FROM nethermind/nethermind:1.28.0 AS base
+FROM nethermind/nethermind:1.29.1 AS base
 
 # dotnet libs
 COPY --from=build /circles-nethermind-plugin/Circles.Index.deps.json /nethermind/plugins

diff --git a/x64.debug.Dockerfile b/x64.debug.Dockerfile
@@ -6,7 +6,7 @@ COPY . .
 RUN dotnet restore
 RUN dotnet publish -c Debug -o /circles-nethermind-plugin
 
-FROM nethermind/nethermind:1.28.0 AS base
+FROM nethermind/nethermind:1.29.1 AS base
 
 # dotnet libs
 COPY --from=build /circles-nethermind-plugin/Circles.Index.deps.json /nethermind/plugins

diff --git a/x64.debug.spaceneth.Dockerfile b/x64.debug.spaceneth.Dockerfile
@@ -6,7 +6,7 @@ COPY . .
 RUN dotnet restore
 RUN dotnet publish -c Debug -o /circles-nethermind-plugin
 
-FROM nethermind/nethermind:1.28.0 AS base
+FROM nethermind/nethermind:1.29.1 AS base
 
 # dotnet libs
 COPY --from=build /circles-nethermind-plugin/Circles.Index.deps.json /nethermind/plugins