Skip to content

Remove unused logManager parameter from SyncProgressResolver constructor #10452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukaszRozmej merged 2 commits into from
Feb 8, 2026
Merged

Remove unused logManager parameter from SyncProgressResolver constructor #10452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04c139b
Initial plan
Copilot Feb 8, 2026
62a057c
refactor: remove unused logManager parameter from SyncProgressResolver
Copilot Feb 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.Synchronization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,8 +1054,7 @@ private MultiSyncModeSelector CreateMultiSyncModeSelector(MergeTestBlockchain ch
Substitute.For<ISyncFeed<HeadersSyncBatch?>>(),
Substitute.For<ISyncFeed<BodiesSyncBatch?>>(),
Substitute.For<ISyncFeed<ReceiptsSyncBatch?>>(),
Substitute.For<ISyncFeed<SnapSyncBatch?>>(),
LimboLogs.Instance);
Substitute.For<ISyncFeed<SnapSyncBatch?>>());

MultiSyncModeSelector multiSyncModeSelector = new(syncProgressResolver,
syncPeerPool, new SyncConfig(), No.BeaconSync,
Expand Down
22 changes: 10 additions & 12 deletions src/Nethermind/Nethermind.Synchronization.Test/SyncProgressResolverTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using Nethermind.Core;
using Nethermind.Core.Crypto;
using Nethermind.Core.Test.Builders;
using Nethermind.Logging;
using Nethermind.State;
using Nethermind.Synchronization.FastBlocks;
using Nethermind.Synchronization.ParallelSync;
Expand All @@ -31,7 +30,7 @@ public void Header_block_is_0_when_no_header_was_suggested()
PivotNumber = 1,
};

SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig, LimboLogs.Instance);
SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig);
blockTree.BestSuggestedHeader.ReturnsNull();
Assert.That(syncProgressResolver.FindBestHeader(), Is.EqualTo(0));
}
Expand All @@ -46,7 +45,7 @@ public void Best_block_is_0_when_no_block_was_suggested()
PivotNumber = 1,
};

SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig, LimboLogs.Instance);
SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig);
blockTree.BestSuggestedBody.ReturnsNull();
Assert.That(syncProgressResolver.FindBestFullBlock(), Is.EqualTo(0));
}
Expand All @@ -61,7 +60,7 @@ public void Best_state_is_head_when_there_are_no_suggested_blocks()
PivotNumber = 1,
};

SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig, LimboLogs.Instance);
SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig);
Block head = Build.A.Block.WithHeader(Build.A.BlockHeader.WithNumber(5).WithStateRoot(TestItem.KeccakA).TestObject).TestObject;
blockTree.Head.Returns(head);
blockTree.BestSuggestedHeader.Returns(head.Header);
Expand All @@ -79,7 +78,7 @@ public void Best_state_is_suggested_if_there_is_suggested_block_with_state()
PivotNumber = 1,
};

SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig, LimboLogs.Instance);
SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig);
Block head = Build.A.Block.WithHeader(Build.A.BlockHeader.WithNumber(5).WithStateRoot(TestItem.KeccakA).TestObject).TestObject;
BlockHeader suggested = Build.A.BlockHeader.WithNumber(6).WithStateRoot(TestItem.KeccakB).TestObject;
blockTree.Head.Returns(head);
Expand All @@ -101,7 +100,7 @@ public void Best_state_is_head_if_there_is_suggested_block_without_state()
PivotNumber = 1,
};

SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig, LimboLogs.Instance);
SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig);
Block head = Build.A.Block.WithHeader(Build.A.BlockHeader.WithNumber(5).WithStateRoot(TestItem.KeccakA).TestObject).TestObject;
BlockHeader suggested = Build.A.BlockHeader.WithNumber(6).WithStateRoot(TestItem.KeccakB).TestObject;
blockTree.Head.Returns(head);
Expand All @@ -123,7 +122,7 @@ public void Is_fast_block_finished_returns_true_when_no_fast_sync_is_used()
PivotNumber = 1,
};

SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig, LimboLogs.Instance);
SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig);
Assert.That(syncProgressResolver.IsFastBlocksHeadersFinished(), Is.True);
Assert.That(syncProgressResolver.IsFastBlocksBodiesFinished(), Is.True);
Assert.That(syncProgressResolver.IsFastBlocksReceiptsFinished(), Is.True);
Expand All @@ -145,7 +144,7 @@ public void Is_fast_block_bodies_finished_returns_false_when_blocks_not_download

blockTree.LowestInsertedHeader.Returns(Build.A.BlockHeader.WithNumber(1).WithStateRoot(TestItem.KeccakA).TestObject);

SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig, LimboLogs.Instance);
SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, false, syncConfig);
Assert.That(syncProgressResolver.IsFastBlocksBodiesFinished(), Is.False);
}

Expand All @@ -164,12 +163,12 @@ public void Is_fast_block_receipts_finished_returns_true_when_receipts_not_downl

blockTree.LowestInsertedHeader.Returns(Build.A.BlockHeader.WithNumber(1).WithStateRoot(TestItem.KeccakA).TestObject);

SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, true, syncConfig, LimboLogs.Instance);
SyncProgressResolver syncProgressResolver = CreateProgressResolver(blockTree, stateReader, true, syncConfig);
Assert.That(syncProgressResolver.IsFastBlocksReceiptsFinished(), Is.True);
}


private SyncProgressResolver CreateProgressResolver(IBlockTree blockTree, IStateReader stateReader, bool isReceiptFinished, SyncConfig syncConfig, LimboLogs limboLogs)
private SyncProgressResolver CreateProgressResolver(IBlockTree blockTree, IStateReader stateReader, bool isReceiptFinished, SyncConfig syncConfig)
{
ISyncFeed<ReceiptsSyncBatch?> receiptFeed = Substitute.For<ISyncFeed<ReceiptsSyncBatch?>>();
receiptFeed.IsFinished.Returns(isReceiptFinished);
Expand All @@ -181,8 +180,7 @@ private SyncProgressResolver CreateProgressResolver(IBlockTree blockTree, IState
Substitute.For<ISyncFeed<HeadersSyncBatch?>>(),
Substitute.For<ISyncFeed<BodiesSyncBatch?>>(),
receiptFeed,
Substitute.For<ISyncFeed<SnapSyncBatch?>>(),
limboLogs
Substitute.For<ISyncFeed<SnapSyncBatch?>>()
);
}
}
Expand Down
5 changes: 1 addition & 4 deletions src/Nethermind/Nethermind.Synchronization/ParallelSync/SyncProgressResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using Nethermind.Core;
using Nethermind.Core.Crypto;
using Nethermind.Int256;
using Nethermind.Logging;
using Nethermind.Synchronization.FastBlocks;
using Nethermind.Synchronization.SnapSync;

Expand All @@ -33,10 +32,8 @@ public SyncProgressResolver(
[KeyFilter(nameof(HeadersSyncFeed))] ISyncFeed<HeadersSyncBatch?> headersSyncFeed,
ISyncFeed<BodiesSyncBatch?> bodiesSyncFeed,
ISyncFeed<ReceiptsSyncBatch?> receiptsSyncFeed,
ISyncFeed<SnapSyncBatch?> snapSyncFeed,
ILogManager logManager)
ISyncFeed<SnapSyncBatch?> snapSyncFeed)
{
ArgumentNullException.ThrowIfNull(logManager);
_blockTree = blockTree ?? throw new ArgumentNullException(nameof(blockTree));
_fullStateFinder = fullStateFinder ?? throw new ArgumentNullException(nameof(fullStateFinder));
_syncConfig = syncConfig ?? throw new ArgumentNullException(nameof(syncConfig));
Expand Down