From 129ff7b963dc730b268d82645afbf2d83f9004f8 Mon Sep 17 00:00:00 2001 From: benaadams Date: Wed, 8 Feb 2023 14:05:21 +0000 Subject: [PATCH] Other Lru keys types --- .../Transactions/TxPermissionFilterTest.cs | 6 +++--- src/Nethermind/Nethermind.Blockchain/BlockTree.cs | 4 ++-- .../AuRaContractGasLimitOverride.cs | 2 +- .../Contracts/VersionedContract.cs | 4 ++-- .../Contracts/VersionedTransactionPermissionContract.cs | 2 +- .../InitializationSteps/AuRaNethermindApi.cs | 4 ++-- .../InvalidChainTracker/InvalidChainTracker.cs | 4 ++-- .../Nethermind.State/Witnesses/WitnessCollector.cs | 2 +- src/Nethermind/Nethermind.TxPool/TxPool.cs | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs b/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs index 67d9aa92947..98d6d5ec497 100644 --- a/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs +++ b/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs @@ -250,7 +250,7 @@ public bool allows_transactions_before_transitions(long blockNumber) VersionedTransactionPermissionContract transactionPermissionContract = new(AbiEncoder.Instance, TestItem.AddressA, 5, - Substitute.For(), new LruCache(100, "TestCache"), + Substitute.For(), new LruCache(100, "TestCache"), LimboLogs.Instance, Substitute.For()); @@ -263,7 +263,7 @@ public class TestTxPermissionsBlockchain : TestContractBlockchain public PermissionBasedTxFilter PermissionBasedTxFilter { get; private set; } public PermissionBasedTxFilter.Cache TxPermissionFilterCache { get; private set; } - public LruCache TransactionPermissionContractVersions { get; private set; } + public LruCache TransactionPermissionContractVersions { get; private set; } protected override BlockProcessor CreateBlockProcessor() { @@ -274,7 +274,7 @@ protected override BlockProcessor CreateBlockProcessor() }; TransactionPermissionContractVersions = - new LruCache(PermissionBasedTxFilter.Cache.MaxCacheSize, nameof(TransactionPermissionContract)); + new LruCache(PermissionBasedTxFilter.Cache.MaxCacheSize, nameof(TransactionPermissionContract)); IReadOnlyTrieStore trieStore = new TrieStore(DbProvider.StateDb, LimboLogs.Instance).AsReadOnly(); IReadOnlyTxProcessorSource txProcessorSource = new ReadOnlyTxProcessingEnv( diff --git a/src/Nethermind/Nethermind.Blockchain/BlockTree.cs b/src/Nethermind/Nethermind.Blockchain/BlockTree.cs index 30bf2249da0..2a01b9dbc30 100644 --- a/src/Nethermind/Nethermind.Blockchain/BlockTree.cs +++ b/src/Nethermind/Nethermind.Blockchain/BlockTree.cs @@ -53,8 +53,8 @@ private readonly LruCache private readonly IDb _blockInfoDb; private readonly IDb _metadataDb; - private readonly LruCache _invalidBlocks = - new LruCache(128, 128, "invalid blocks"); + private readonly LruCache _invalidBlocks = + new(128, 128, "invalid blocks"); private readonly BlockDecoder _blockDecoder = new(); private readonly HeaderDecoder _headerDecoder = new(); diff --git a/src/Nethermind/Nethermind.Consensus.AuRa/AuRaContractGasLimitOverride.cs b/src/Nethermind/Nethermind.Consensus.AuRa/AuRaContractGasLimitOverride.cs index f457b6b3add..2c488327c50 100644 --- a/src/Nethermind/Nethermind.Consensus.AuRa/AuRaContractGasLimitOverride.cs +++ b/src/Nethermind/Nethermind.Consensus.AuRa/AuRaContractGasLimitOverride.cs @@ -98,7 +98,7 @@ public class Cache { private const int MaxCacheSize = 10; - internal LruCache GasLimitCache { get; } = new LruCache(MaxCacheSize, "BlockGasLimit"); + internal LruCache GasLimitCache { get; } = new(MaxCacheSize, "BlockGasLimit"); } public bool IsGasLimitValid(BlockHeader parentHeader, in long gasLimit, out long? expectedGasLimit) diff --git a/src/Nethermind/Nethermind.Consensus.AuRa/Contracts/VersionedContract.cs b/src/Nethermind/Nethermind.Consensus.AuRa/Contracts/VersionedContract.cs index e8280261535..c38c9d7a07d 100644 --- a/src/Nethermind/Nethermind.Consensus.AuRa/Contracts/VersionedContract.cs +++ b/src/Nethermind/Nethermind.Consensus.AuRa/Contracts/VersionedContract.cs @@ -20,10 +20,10 @@ public abstract class VersionedContract : IActivatedAtBlock where T : IVersio private readonly IDictionary _versions; private readonly IVersionedContract _versionSelectorContract; - private readonly LruCache _versionsCache; + private readonly LruCache _versionsCache; private readonly ILogger _logger; - protected VersionedContract(IDictionary versions, LruCache cache, long activation, ILogManager logManager) + protected VersionedContract(IDictionary versions, LruCache cache, long activation, ILogManager logManager) { _versions = versions ?? throw new ArgumentNullException(nameof(versions)); _versionSelectorContract = versions.Values.Last(); diff --git a/src/Nethermind/Nethermind.Consensus.AuRa/Contracts/VersionedTransactionPermissionContract.cs b/src/Nethermind/Nethermind.Consensus.AuRa/Contracts/VersionedTransactionPermissionContract.cs index 4ccee21f90c..5f6420af316 100644 --- a/src/Nethermind/Nethermind.Consensus.AuRa/Contracts/VersionedTransactionPermissionContract.cs +++ b/src/Nethermind/Nethermind.Consensus.AuRa/Contracts/VersionedTransactionPermissionContract.cs @@ -21,7 +21,7 @@ public VersionedTransactionPermissionContract(IAbiEncoder abiEncoder, Address contractAddress, long activation, IReadOnlyTxProcessorSource readOnlyTxProcessorSource, - LruCache cache, + LruCache cache, ILogManager logManager, ISpecProvider specProvider) : base( diff --git a/src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/AuRaNethermindApi.cs b/src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/AuRaNethermindApi.cs index 7c4ec8e909c..f6bd4af1f15 100644 --- a/src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/AuRaNethermindApi.cs +++ b/src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/AuRaNethermindApi.cs @@ -26,8 +26,8 @@ public class AuRaNethermindApi : NethermindApi public IValidatorStore? ValidatorStore { get; set; } - public LruCache TransactionPermissionContractVersions { get; } - = new LruCache( + public LruCache TransactionPermissionContractVersions { get; } + = new( PermissionBasedTxFilter.Cache.MaxCacheSize, nameof(TransactionPermissionContract)); diff --git a/src/Nethermind/Nethermind.Merge.Plugin/InvalidChainTracker/InvalidChainTracker.cs b/src/Nethermind/Nethermind.Merge.Plugin/InvalidChainTracker/InvalidChainTracker.cs index e359fca7c24..9a775a70437 100644 --- a/src/Nethermind/Nethermind.Merge.Plugin/InvalidChainTracker/InvalidChainTracker.cs +++ b/src/Nethermind/Nethermind.Merge.Plugin/InvalidChainTracker/InvalidChainTracker.cs @@ -25,7 +25,7 @@ public class InvalidChainTracker : IInvalidChainTracker private readonly IBlockFinder _blockFinder; private readonly IBlockCacheService _blockCacheService; private readonly ILogger _logger; - private readonly LruCache _tree; + private readonly LruCache _tree; // CompositeDisposable only available on System.Reactive. So this will do for now. private readonly List _disposables = new(); @@ -38,7 +38,7 @@ public InvalidChainTracker( { _poSSwitcher = poSSwitcher; _blockFinder = blockFinder; - _tree = new LruCache(1024, nameof(InvalidChainTracker)); + _tree = new(1024, nameof(InvalidChainTracker)); _logger = logManager.GetClassLogger(); _blockCacheService = blockCacheService; } diff --git a/src/Nethermind/Nethermind.State/Witnesses/WitnessCollector.cs b/src/Nethermind/Nethermind.State/Witnesses/WitnessCollector.cs index ff0ba5c337c..8ab8fe53180 100644 --- a/src/Nethermind/Nethermind.State/Witnesses/WitnessCollector.cs +++ b/src/Nethermind/Nethermind.State/Witnesses/WitnessCollector.cs @@ -22,7 +22,7 @@ public class WitnessCollector : IWitnessCollector, IWitnessRepository [ThreadStatic] private static bool _collectWitness; - private readonly LruCache _witnessCache = new(256, "Witnesses"); + private readonly LruCache _witnessCache = new(256, "Witnesses"); public IReadOnlyCollection Collected => _collected; diff --git a/src/Nethermind/Nethermind.TxPool/TxPool.cs b/src/Nethermind/Nethermind.TxPool/TxPool.cs index 8aeb2ed697b..69b0536aa95 100644 --- a/src/Nethermind/Nethermind.TxPool/TxPool.cs +++ b/src/Nethermind/Nethermind.TxPool/TxPool.cs @@ -579,7 +579,7 @@ public void Dispose() private static void AddNodeInfoEntryForTxPool() { ThisNodeInfo.AddInfo("Mem est tx :", - $"{(LruCache.CalculateMemorySize(32, MemoryAllowance.TxHashCacheSize) + LruCache.CalculateMemorySize(4096, MemoryAllowance.MemPoolSize)) / 1000 / 1000}MB" + $"{(LruCache.CalculateMemorySize(32, MemoryAllowance.TxHashCacheSize) + LruCache.CalculateMemorySize(4096, MemoryAllowance.MemPoolSize)) / 1000 / 1000}MB" .PadLeft(8)); } }