Merge pull request #98 from openrelayxyz/feature/etc-plugin

Removed injection in MakeDataDir()
This commit is contained in:
AusIV 2023-11-02 16:00:09 -05:00 committed by GitHub
commit 703c3b6b74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -979,13 +979,7 @@ var (
// if none (or the empty string) is specified. If the node is starting a testnet, // if none (or the empty string) is specified. If the node is starting a testnet,
// then a subdirectory of the specified datadir will be used. // then a subdirectory of the specified datadir will be used.
func MakeDataDir(ctx *cli.Context) string { func MakeDataDir(ctx *cli.Context) string {
if path := ctx.String(DataDirFlag.Name); path == "" { if path := ctx.String(DataDirFlag.Name); path != "" {
// begin PluGeth injection
if pluginPath := pluginDefaultDataDir(path); pluginPath != "" {
log.Error("Inside datdir injection number one")
return pluginPath
}
// end PluGeth injection
if ctx.Bool(GoerliFlag.Name) { if ctx.Bool(GoerliFlag.Name) {
return filepath.Join(path, "goerli") return filepath.Join(path, "goerli")
} }