Skip to content

Commit

Permalink
Update packages (#8064)
Browse files Browse the repository at this point in the history
  • Loading branch information
rubo authored Jan 16, 2025
1 parent 7112d2d commit 7db8192
Show file tree
Hide file tree
Showing 14 changed files with 49 additions and 64 deletions.
64 changes: 32 additions & 32 deletions src/Nethermind/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,32 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AspNetCore.HealthChecks.UI" Version="8.0.2" />
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
<PackageVersion Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
<PackageVersion Include="Autofac" Version="8.1.1" />
<PackageVersion Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
<PackageVersion Include="Autofac" Version="8.2.0" />
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
<PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.14.0" />
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0" />
<PackageVersion Include="Ckzg.Bindings" Version="2.0.1.1236" />
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.5.0" />
<PackageVersion Include="Ckzg.Bindings" Version="2.0.1.1258" />
<PackageVersion Include="Colorful.Console" Version="1.2.15" />
<PackageVersion Include="ConcurrentHashSet" Version="1.3.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.3" />
<PackageVersion Include="Crc32.NET" Version="1.2.0" />
<PackageVersion Include="DnsClient" Version="1.8.0" />
<PackageVersion Include="FastEnum" Version="2.0.2" />
<PackageVersion Include="FluentAssertions" Version="6.12.2" />
<PackageVersion Include="FastEnum" Version="2.0.5" />
<PackageVersion Include="FluentAssertions" Version="[7.0.0, 8)" />
<PackageVersion Include="FluentAssertions.Json" Version="6.1.0" />
<PackageVersion Include="Google.Protobuf" Version="3.28.3" />
<PackageVersion Include="Google.Protobuf.Tools" Version="3.28.3" />
<PackageVersion Include="Google.Protobuf" Version="3.29.3" />
<PackageVersion Include="Google.Protobuf.Tools" Version="3.29.3" />
<PackageVersion Include="Grpc" Version="2.46.6" />
<PackageVersion Include="Grpc.Tools" Version="2.67.0" />
<PackageVersion Include="Grpc.Tools" Version="2.69.0" />
<PackageVersion Include="HexMate" Version="0.0.3" />
<PackageVersion Include="Jint" Version="2.11.58" />
<PackageVersion Include="MathNet.Numerics.FSharp" Version="5.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="9.0.1" />
<PackageVersion Include="Microsoft.Build.Tasks.Git" Version="8.0.0" />
<PackageVersion Include="Microsoft.ClearScript.V8" Version="7.4.5" />
<PackageVersion Include="Microsoft.ClearScript.V8.Native.linux-arm64" Version="7.4.5" />
Expand All @@ -38,14 +38,14 @@
<PackageVersion Include="Microsoft.ClearScript.V8.Native.win-x64" Version="7.4.5" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
<PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageVersion Include="Nethermind.Crypto.Bls" Version="1.0.4" />
<PackageVersion Include="Nethermind.Crypto.Pairings" Version="1.1.1" />
Expand All @@ -56,33 +56,33 @@
<PackageVersion Include="Nethermind.Gmp" Version="1.0.1" />
<PackageVersion Include="Nethermind.Libp2p" Version="1.0.0-preview.34" />
<PackageVersion Include="Nethermind.Libp2p.Protocols.PubsubPeerDiscovery" Version="1.0.0-preview.34" />
<PackageVersion Include="Nethermind.Numerics.Int256" Version="1.3.2" />
<PackageVersion Include="Nethermind.Numerics.Int256" Version="1.3.3" />
<PackageVersion Include="Nito.Collections.Deque" Version="1.2.1" />
<PackageVersion Include="NLog" Version="5.3.4" />
<PackageVersion Include="NLog.Targets.Seq" Version="4.0.1" />
<PackageVersion Include="NonBlocking" Version="2.1.2" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NUnit" Version="4.2.2" />
<PackageVersion Include="NUnit.Analyzers" Version="4.4.0" />
<PackageVersion Include="NUnit" Version="4.3.2" />
<PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageVersion Include="Open.NAT.Core" Version="2.1.0.5" />
<PackageVersion Include="PierTwo.Lantern.Discv5.WireProtocol" Version="1.0.0-preview.4" />
<PackageVersion Include="Polly" Version="8.5.0" />
<PackageVersion Include="Polly" Version="8.5.1" />
<PackageVersion Include="prometheus-net.AspNetCore" Version="8.2.1" />
<PackageVersion Include="Pyroscope" Version="0.9.0" />
<PackageVersion Include="Pyroscope" Version="0.9.2" />
<PackageVersion Include="ReadLine" Version="2.0.1" />
<PackageVersion Include="RichardSzalay.MockHttp" Version="7.0.0" />
<PackageVersion Include="RocksDB" Version="9.4.0.50294" />
<PackageVersion Include="RocksDB" Version="[9.7.3.54622]" />
<PackageVersion Include="SCrypt" Version="2.0.0.2" />
<PackageVersion Include="Shouldly" Version="4.2.1" />
<PackageVersion Include="Snappier" Version="1.1.6" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24517.1" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageVersion Include="System.IO.Pipelines" Version="9.0.0" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24528.1" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.1" />
<PackageVersion Include="System.IO.Pipelines" Version="9.0.1" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="9.0.0" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="21.1.3" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.1.3" />
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="9.0.1" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="21.2.1" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.2.1" />
<PackageVersion Include="Websocket.Client" Version="5.1.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public async Task should_cancel_block_production_trigger_on_next_step_if_not_fin

bool[] allButLastCancellations = args.Skip(1).SkipLast(1).Select(e => e.CancellationToken.IsCancellationRequested).ToArray();
allButLastCancellations.Should().AllBeEquivalentTo(true);
allButLastCancellations.Should().HaveCountGreaterOrEqualTo(2);
allButLastCancellations.Should().HaveCountGreaterThanOrEqualTo(2);
}

[Test]
Expand Down
15 changes: 0 additions & 15 deletions src/Nethermind/Nethermind.Db.Test/RocksDbTests.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public async Task Eth_create_access_list_calculates_proper_gas(bool optimize, lo

var gasUsedAccessList = (long)Bytes.FromHexString(gasUsedCreateAccessList!).ToUInt256();
var gasUsedEstimate = (long)Bytes.FromHexString(gasUsedEstimateGas!).ToUInt256();
Assert.That(gasUsedEstimate, Is.EqualTo(gasUsedAccessList).Within(1.5).Percent);
Assert.That(gasUsedEstimate, Is.EqualTo((double)gasUsedAccessList).Within(1.5).Percent);
}

[TestCase(true, 0xeee7, 0xf71b)]
Expand Down
4 changes: 2 additions & 2 deletions src/Nethermind/Nethermind.Mining.Test/EthashTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ public void Test_data_size()
for (int i = 0; i < _dataSizes.Length; i++)
{
ulong size = Ethash.GetDataSize((uint)i);
Assert.That(_dataSizes[i], Is.EqualTo(size).Within(i), $"failed at epoch: {i}");
Assert.That(_dataSizes[i], Is.EqualTo(size).Within((uint)i), $"failed at epoch: {i}");
}
}

Expand All @@ -852,7 +852,7 @@ public void Test_cache_size()
for (int i = 0; i < _cacheSizes.Length; i++)
{
ulong size = Ethash.GetCacheSize((uint)i);
Assert.That(_cacheSizes[i], Is.EqualTo(size).Within(i));
Assert.That(_cacheSizes[i], Is.EqualTo(size).Within((uint)i));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public async Task RateLimitOutgoingMessage()
await _discoveryManager.SendMessageAsync(msg);
await _discoveryManager.SendMessageAsync(msg);
await _discoveryManager.SendMessageAsync(msg);
Stopwatch.GetElapsedTime(startTime).Should().BeGreaterOrEqualTo(TimeSpan.FromSeconds(0.9));
Stopwatch.GetElapsedTime(startTime).Should().BeGreaterThanOrEqualTo(TimeSpan.FromSeconds(0.9));
}
}
}
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Overseer.Test/AuRaTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public async Task Multiple_validators()

var expectedCount = 14;

auRaState.BlocksCount.Should().BeGreaterOrEqualTo(expectedCount, $"at least {expectedCount} steps.");
auRaState.BlocksCount.Should().BeGreaterThanOrEqualTo(expectedCount, $"at least {expectedCount} steps.");

var blockNumbers = auRaState.Blocks.Take(expectedCount).Select(v => v.Key);
blockNumbers.Should().BeEquivalentTo(Enumerable.Range(1, expectedCount), "block numbers sequential from 1.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ public void Memory_with_two_times_two_nodes_is_correct()

// depending on whether the node gets resolved it gives different values here in debugging and run
// needs some attention
fullTrieStore.MemoryUsedByDirtyCache.Should().BeLessOrEqualTo(
fullTrieStore.MemoryUsedByDirtyCache.Should().BeLessThanOrEqualTo(
trieNode1.GetMemorySize(false) + ExpectedPerNodeKeyMemorySize +
trieNode2.GetMemorySize(false) + ExpectedPerNodeKeyMemorySize);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public void Capacity_is_never_exceeded()
CollectAndFinalize();

_allCount.Should().Be(expectedAllCount);
_finalizedCount.Should().BeLessOrEqualTo(expectedAllCount - Capacity);
_finalizedCount.Should().BeLessThanOrEqualTo(expectedAllCount - Capacity);
pool.Count.Should().Be(Capacity);
}

Expand Down Expand Up @@ -249,7 +249,7 @@ public void Capacity_is_never_exceeded_when_there_are_duplicates()

CollectAndFinalize();

_finalizedCount.Should().BeLessOrEqualTo(Capacity * (capacityMultiplier - 1));
_finalizedCount.Should().BeLessThanOrEqualTo(Capacity * (capacityMultiplier - 1));
_allCount.Should().Be(Capacity * capacityMultiplier);
pool.Count.Should().Be(Capacity);
}
Expand Down Expand Up @@ -295,7 +295,7 @@ void KeepGoing(int iterations)

int expectedAllCount = Capacity * capacityMultiplier * 3;
_allCount.Should().Be(expectedAllCount);
_finalizedCount.Should().BeGreaterOrEqualTo(expectedAllCount - Capacity);
_finalizedCount.Should().BeGreaterThanOrEqualTo(expectedAllCount - Capacity);
}

private static void CollectAndFinalize()
Expand Down
4 changes: 2 additions & 2 deletions src/Nethermind/nuget.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="system.commandline" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<!--<add key="nugettest.org" value="https://apiint.nugettest.org/v3/index.json" />-->
</packageSources>
<packageSourceMapping>
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
<packageSource key="system.commandline">
<packageSource key="dotnet-libraries">
<package pattern="System.CommandLine*" />
</packageSource>
<!--<packageSource key="nugettest.org">
Expand Down
2 changes: 1 addition & 1 deletion tools/DocGen/DocGen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="Spectre.Console" Version="0.49.1" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.24517.1" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.24528.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tools/Nethermind.Tools.Kute/Nethermind.Tools.Kute.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PackageReference Include="App.Metrics" Version="4.3.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.0.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.24517.1" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.24528.1" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion tools/SendBlobs/SendBlobs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.24517.1" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.24528.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tools/nuget.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="system.commandline" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<!--<add key="nugettest.org" value="https://apiint.nugettest.org/v3/index.json" />-->
</packageSources>
<packageSourceMapping>
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
<packageSource key="system.commandline">
<packageSource key="dotnet-libraries">
<package pattern="System.CommandLine*" />
</packageSource>
<!--<packageSource key="nugettest.org">
Expand Down

0 comments on commit 7db8192

Please sign in to comment.