Switch to System.CommandLine
#7653
Conversation
rubo
force-pushed
the
feature/system-commandline-2
branch
from
2f13e8e to
9c98998
Compare
|
Can you explain why? I thought Also why change |
|
@LukaszRozmej We had no particular issues with
|
|
|
||
| void Load(ILogManager logManager); | ||
| void Load(); |
There was a problem hiding this comment.
The ILogManager parameter has been removed from the Load() method. Implementations can require it in their constructors if needed. This was helpful in the context of Program.cs refactoring.
| namespace Nethermind.Api.Extensions | ||
| namespace Nethermind.Api.Extensions; | ||
|
|
||
| public class PluginLoader(string pluginPath, IFileSystem fileSystem, ILogger logger, params Type[] embedded) : IPluginLoader |
There was a problem hiding this comment.
Added ILogger to the constructor instead of taking ILogManager in the Load() method. That's it for this file.
|
|
||
| public void Load(ILogManager logManager) { } |
There was a problem hiding this comment.
Removed ILogManager from the Load() method. This implementation doesn't need it at all.
| public CancellationToken Token => _cancellationTokenSource!.Token; | ||
| public ProcessExitSource(CancellationToken cancellationToken) | ||
| { | ||
| _cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); |
There was a problem hiding this comment.
System.CommandLine provides a cancellation token for ctrl+c, so we don't need to handle it ourselves. Thus, ProcessExitSource now uses a linked cancellation token source to combine its own with the one of the CLI parser.
|
|
||
| foreach (var source in _configSource) | ||
| // Skip the validation for ArgsConfigSource items as they are already validated by the CLI parser | ||
| foreach (IConfigSource source in _configSource.Where(s => s is not ArgsConfigSource)) |
There was a problem hiding this comment.
Disabled validation for ArgsConfigSource (CLI arguments) since the CLI parser does the job now.
rubo
force-pushed
the
feature/system-commandline-2
branch
from
0a4d115 to
32e9120
Compare
Co-authored-by: Lautaro Emanuel <[email protected]>
rubo
requested review from
flcl42,
benaadams,
deffrian,
emlautarom1,
smartprogrammer93 and
asdacap
Fixes config file name for Nethermind: - All *.cfg files were renamed to *.json as part of this PR: NethermindEth/nethermind#7653 - Skipping file extension will automatically add a proper one Signed-off-by: Alex <[email protected]>
Replaces #4310
Changes
McMaster.Extensions.CommandLineUtilswithSystem.CommandLineas the CLI options parser.cfgto standard.json. The change is backward-compatible, i.e., the.cfgfiles are still handled if no.jsonequivalent is found. See Remarks below.Program.cshas been heavily refactored and changed to a top-level filenethermind --configsDirectory path/to/dir --JsonRpc.JwtSecretFile path/to/jwt.hex # or nethermind --configs-dir path/to/dir --jsonrpc-jwtsecretfile path/to/jwt.hexCommandLineParserwithSystem.CommandLineforNethermind.Test.RunnerTypes of changes
What types of changes does your code introduce?
Testing
Requires testing
If yes, did you write tests?
Notes on testing
Needs manual testing
Documentation
Requires documentation update
PR pending.
Requires explanation in Release Notes
Optionally. Pending.
Remarks
The large number of changed files is due to
.cfgto.jsonrename. I commented on the changes that need attention except forProgram.cs, which has too many changes. The rest are file scope namespace changes or extension changes.