Fix flag parsing for plugins

This commit is contained in:
Austin Roberts
2021-09-21 09:01:03 -05:00
parent 9249a67e45
commit 65f00aad1c
4 changed files with 31 additions and 20 deletions
+5 -5
View File
@@ -314,6 +314,11 @@ func prepare(ctx *cli.Context) {
func geth(ctx *cli.Context) error {
if err := plugins.Initialize(path.Join(ctx.GlobalString(utils.DataDirFlag.Name), "plugins"), ctx); err != nil { return err }
prepare(ctx)
if !plugins.ParseFlags(ctx.Args()) {
if args := ctx.Args(); len(args) > 0 {
return fmt.Errorf("invalid command: %q", args[0])
}
}
stack, backend := makeFullNode(ctx)
wrapperBackend := wrappers.NewBackend(backend)
pluginsInitializeNode(stack, wrapperBackend)
@@ -322,11 +327,6 @@ func geth(ctx *cli.Context) error {
return err
}
defer stack.Close()
if !plugins.ParseFlags(ctx.Args()) {
if args := ctx.Args(); len(args) > 0 {
return fmt.Errorf("invalid command: %q", args[0])
}
}
stack.RegisterAPIs(pluginGetAPIs(stack, wrapperBackend))
startNode(ctx, stack, backend)