Merge branch 'main' into importer

NethermindEth · Mar 6, 2024 · f77097d · f77097d
2 parents 77f701c + 3506723
commit f77097d
Show file tree

Hide file tree

Showing 121 changed files with 672 additions and 498 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Set default behavior to automatically normalize line endings.
+* text=auto eol=lf
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ env:
 
 jobs:
   tests:
-    timeout-minutes: 10
+    timeout-minutes: 15
     name: "Run Paprika tests"
     runs-on: ubuntu-latest
     permissions:

diff --git a/src/Paprika.Benchmarks/MerkleBenchmarks.cs b/src/Paprika.Benchmarks/MerkleBenchmarks.cs
@@ -1,4 +1,4 @@
-using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Attributes;
 using Paprika.Crypto;
 using Paprika.Data;
 using Paprika.Merkle;
@@ -52,4 +52,4 @@ public byte Storage_short_path()
         // prevent not used result elimination
         return result.Span[0];
     }
-}
+}
diff --git a/src/Paprika.Benchmarks/NibblePathBenchmarks.cs b/src/Paprika.Benchmarks/NibblePathBenchmarks.cs
@@ -1,4 +1,4 @@
-using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Attributes;
 using Paprika.Crypto;
 using Paprika.Data;
 
@@ -24,4 +24,4 @@ public int Hash()
                path.GetHashCode() ^
                path.GetHashCode();
     }
-}
+}
diff --git a/src/Paprika.Benchmarks/PooledSpanDictionaryBenchmarks.cs b/src/Paprika.Benchmarks/PooledSpanDictionaryBenchmarks.cs
@@ -1,4 +1,4 @@
-using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Attributes;
 using Paprika.Chain;
 
 namespace Paprika.Benchmarks;
@@ -31,4 +31,4 @@ public int Read_write_small()
 
         return count;
     }
-}
+}
diff --git a/src/Paprika.Benchmarks/Program.cs b/src/Paprika.Benchmarks/Program.cs
@@ -1,4 +1,4 @@
-// See https://aka.ms/new-console-template for more information
+// See https://aka.ms/new-console-template for more information
 
 using System.Diagnostics.CodeAnalysis;
 using BenchmarkDotNet.Running;
@@ -13,4 +13,4 @@ public static void Main(string[] args)
     {
         BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
     }
-}
+}
diff --git a/src/Paprika.Benchmarks/SlottedArrayBenchmarks.cs b/src/Paprika.Benchmarks/SlottedArrayBenchmarks.cs
@@ -1,4 +1,4 @@
-using System.Buffers.Binary;
+using System.Buffers.Binary;
 using BenchmarkDotNet.Attributes;
 using Paprika.Data;
 using Paprika.Store;
@@ -95,4 +95,4 @@ public int Read_nonexistent_keys()
 
         return result;
     }
-}
+}
diff --git a/src/Paprika.Benchmarks/XorBenchmarks.cs b/src/Paprika.Benchmarks/XorBenchmarks.cs
@@ -1,4 +1,4 @@
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using BenchmarkDotNet.Attributes;
 using Paprika.Utils;
 
@@ -18,7 +18,7 @@ public void Setup()
 
         _keys = new ulong[Size];
         random.NextBytes(MemoryMarshal.Cast<ulong, byte>(_keys));
-        _xor8 = new Xor8(_keys);
+        _xor8 = new Xor8(_keys.ToHashSet());
     }
 
     [Benchmark]
@@ -32,4 +32,4 @@ public bool MayContain()
 
         return accumulator;
     }
-}
+}
diff --git a/src/Paprika.Cli/Program.cs b/src/Paprika.Cli/Program.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using Paprika.Chain;
 using Paprika.Merkle;
 using Paprika.Store;
@@ -66,4 +66,4 @@ public override async Task<int> ExecuteAsync(CommandContext context, ValidateRoo
 
         return -1;
     }
-}
+}
diff --git a/src/Paprika.Importer/PaprikaAccountValidatingVisitor.cs b/src/Paprika.Importer/PaprikaAccountValidatingVisitor.cs
@@ -1,4 +1,4 @@
-// using System.Runtime.CompilerServices;
+// using System.Runtime.CompilerServices;
 // using System.Text;
 // using System.Threading.Channels;
 // using Nethermind.Core.Crypto;
@@ -173,4 +173,4 @@
 //     public void Dispose()
 //     {
 //     }
-// }
+// }
diff --git a/src/Paprika.Importer/PaprikaCopyingVisitor.cs b/src/Paprika.Importer/PaprikaCopyingVisitor.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.Metrics;
+using System.Diagnostics.Metrics;
 using System.Runtime.CompilerServices;
 using System.Threading.Channels;
 using Nethermind.Core.Crypto;
@@ -243,4 +243,4 @@ public void VisitLeaf(in PathContext nodeContext, TrieNode node, TrieVisitContex
     public void VisitCode(in PathContext nodeContext, Hash256 codeHash, TrieVisitContext trieVisitContext)
     {
     }
-}
+}
diff --git a/src/Paprika.Importer/PaprikaRootValidatingVisitor.cs b/src/Paprika.Importer/PaprikaRootValidatingVisitor.cs
@@ -1,4 +1,4 @@
-// using System.Diagnostics.Metrics;
+// using System.Diagnostics.Metrics;
 // using System.Runtime.CompilerServices;
 // using System.Threading.Channels;
 // using Nethermind.Core.Crypto;
@@ -164,4 +164,4 @@
 //     {
 //         _meter.Dispose();
 //     }
-// }
+// }
diff --git a/src/Paprika.Importer/PaprikaStorageCapturingVisitor.cs b/src/Paprika.Importer/PaprikaStorageCapturingVisitor.cs
@@ -1,4 +1,4 @@
-// using System.Diagnostics.Metrics;
+// using System.Diagnostics.Metrics;
 // using System.Runtime.CompilerServices;
 // using System.Runtime.InteropServices;
 // using System.Text;
@@ -42,4 +42,4 @@
 //     }
 //
 //     public string Payload => _sb.ToString();
-// }
+// }
diff --git a/src/Paprika.Importer/PathContext.cs b/src/Paprika.Importer/PathContext.cs
@@ -1,4 +1,4 @@
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using Nethermind.Trie;
 using Paprika.Data;
 
@@ -47,4 +47,4 @@ public PathContext Add(byte nibble)
     }
 
     public NibblePath AsNibblePath => NibblePath.FromKey(Span).SliceTo(Length);
-}
+}
diff --git a/src/Paprika.Importer/Program.cs b/src/Paprika.Importer/Program.cs
@@ -1,4 +1,4 @@
-// See https://aka.ms/new-console-template for more information
+// See https://aka.ms/new-console-template for more information
 
 using System;
 using System.Diagnostics;
@@ -233,4 +233,4 @@ static TrieNode MoveDownInTree(byte[] nibbles, PatriciaTree trie, ITrieNodeResol
     root.ResolveNode(store, ReadFlags.HintCacheMiss);
 
     return root;
-}
+}
diff --git a/src/Paprika.Runner.Pareto/Program.cs b/src/Paprika.Runner.Pareto/Program.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Metrics;
 using System.Runtime.InteropServices;
 using Paprika.Chain;
@@ -221,4 +221,4 @@ private static int RandomPareto(Random random, int maxValue)
             (int)(maxValue *
                   Math.Pow(u, 1.0 / alpha)); // Inverse of the CDF (Cumulative Distribution Function) for Pareto
     }
-}
+}
diff --git a/src/Paprika.Runner.Pareto/SingleAsyncGate.cs b/src/Paprika.Runner.Pareto/SingleAsyncGate.cs
@@ -1,4 +1,4 @@
-namespace Paprika.Runner.Pareto;
+namespace Paprika.Runner.Pareto;
 
 public sealed class SingleAsyncGate
 {
@@ -50,4 +50,4 @@ public void Signal(uint value)
 
         wait?.TrySetResult();
     }
-}
+}
diff --git a/src/Paprika.Runner/Measurement.cs b/src/Paprika.Runner/Measurement.cs
@@ -1,4 +1,4 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using System.Diagnostics.Metrics;
 using HdrHistogram;
 using Spectre.Console;
@@ -70,40 +70,23 @@ public static IMeasurement Build(Instrument instrument)
         throw new NotImplementedException($"Not implemented for type {type}");
     }
 
-    private class GaugeMeasurement : Measurement
+    private class GaugeMeasurement(Instrument instrument) : Measurement(instrument)
     {
-        public GaugeMeasurement(Instrument instrument) : base(instrument)
-        {
-        }
-
         protected override long Update(double measurement) => (long)measurement;
     }
 
-    // for now use the last value
-    private class HistogramLastMeasurement : Measurement
+    private class HistogramLastMeasurement(Instrument instrument) : Measurement(instrument)
     {
         protected override long Update(double measurement)
         {
             return (long)measurement;
         }
-
-        public HistogramLastMeasurement(Instrument instrument) : base(instrument)
-        {
-        }
     }
 
-    private class HistogramHdrMeasurement : JustInTimeRenderable, IMeasurement
+    private class HistogramHdrMeasurement(Instrument instrument) : JustInTimeRenderable, IMeasurement
     {
-        private readonly Instrument _instrument;
-        private readonly ConcurrentQueue<long> _measurements;
-        private readonly LongHistogram _histogram;
-
-        public HistogramHdrMeasurement(Instrument instrument)
-        {
-            _instrument = instrument;
-            _measurements = new ConcurrentQueue<long>();
-            _histogram = new LongHistogram(1, 1, int.MaxValue, 4);
-        }
+        private readonly ConcurrentQueue<long> _measurements = new();
+        private readonly LongHistogram _histogram = new(1, 1, int.MaxValue, 4);
 
         protected override IRenderable Build()
         {
@@ -136,17 +119,13 @@ public void Update(double measurement, ReadOnlySpan<KeyValuePair<string, object?
             MarkAsDirty();
         }
 
-        public override string ToString() => $"{nameof(Instrument)}: {_instrument.Name}, Histogram";
+        public override string ToString() => $"{nameof(Instrument)}: {instrument.Name}, Histogram";
     }
 
-    private class CounterMeasurement : Measurement
+    private class CounterMeasurement(Instrument instrument) : Measurement(instrument)
     {
         private long _sum;
 
         protected override long Update(double measurement) => Interlocked.Add(ref _sum, (long)measurement);
-
-        public CounterMeasurement(Instrument instrument) : base(instrument)
-        {
-        }
     }
-}
+}
diff --git a/src/Paprika.Runner/MetricsReporter.cs b/src/Paprika.Runner/MetricsReporter.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.Metrics;
+using System.Diagnostics.Metrics;
 using System.Runtime.InteropServices;
 using Spectre.Console;
 using Spectre.Console.Rendering;
@@ -82,4 +82,4 @@ public void Dispose()
     {
         _listener.Dispose();
     }
-}
+}
diff --git a/src/Paprika.Runner/Program.cs b/src/Paprika.Runner/Program.cs
@@ -1,4 +1,4 @@
-using System.Buffers.Binary;
+using System.Buffers.Binary;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
@@ -375,4 +375,4 @@ private static Keccak GetStorageAddress(int counter)
     }
 
     private static byte[] GetBigAccountValue(int counter) => new UInt256(1, (ulong)counter).ToBigEndian();
-}
+}
diff --git a/src/Paprika.Runner/StatisticsForPagedDb.cs b/src/Paprika.Runner/StatisticsForPagedDb.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 using HdrHistogram;
 using Paprika.Store;
 using Spectre.Console;
@@ -134,4 +134,4 @@ private static readonly (int value, string color)[] Percentiles =
         new(90, "yellow"),
         new(95, "red"),
     };
-}
+}
diff --git a/src/Paprika.Tests/Categories.cs b/src/Paprika.Tests/Categories.cs
@@ -1,4 +1,4 @@
-namespace Paprika.Tests;
+namespace Paprika.Tests;
 
 public static class Categories
 {
@@ -11,4 +11,4 @@ public static class Categories
     /// The test asserts the memory using <see cref="JetBrains.dotMemoryUnit"/> capabilities.
     /// </summary>
     public const string Memory = nameof(Memory);
-}
+}