Skip to content
Merged
Changes from all commits
Commits
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
18 changes: 7 additions & 11 deletions src/Nethermind/Nethermind.Runner/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@
ILogger logger = new(SimpleConsoleLogger.Instance);
ProcessExitSource? processExitSource = default;
var unhandledError = "A critical error has occurred";
Option<string>[] deprecatedOptions =
[
BasicOptions.ConfigurationDirectory,
BasicOptions.DatabasePath,
BasicOptions.LoggerConfigurationSource,
BasicOptions.PluginsDirectory
];

AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
{
Expand Down Expand Up @@ -230,9 +237,6 @@ static Option CreateOption<T>(Type configType, string name, string? alias)
foreach (Type configType in
configTypes.Where(ct => !ct.IsAssignableTo(typeof(INoCategoryConfig))).OrderBy(c => c.Name))
{
if (configType is null)
continue;

ConfigCategoryAttribute? typeLevel = configType.GetCustomAttribute<ConfigCategoryAttribute>();

if (typeLevel is not null && typeLevel.DisabledForCli)
Expand Down Expand Up @@ -277,14 +281,6 @@ static Option CreateOption<T>(Type configType, string name, string? alias)

void CheckForDeprecatedOptions(ParseResult parseResult)
{
Option<string>[] deprecatedOptions =
[
BasicOptions.ConfigurationDirectory,
BasicOptions.DatabasePath,
BasicOptions.LoggerConfigurationSource,
BasicOptions.PluginsDirectory
];

foreach (Token token in parseResult.Tokens)
{
foreach (Option option in deprecatedOptions)
Expand Down