From 70d531dc1ef8418d1f03341891fbd06d20a7a93a Mon Sep 17 00:00:00 2001
From: Elizabeth Engelman <emengelman@gmail.com>
Date: Thu, 29 Nov 2018 11:05:00 -0600
Subject: [PATCH] Move statediff on/off check to geth cmd config

---
 cmd/geth/config.go |  4 ++++
 cmd/utils/flags.go | 11 -----------
 eth/config.go      |  4 ----
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/cmd/geth/config.go b/cmd/geth/config.go
index b0749d232..a05e78b11 100644
--- a/cmd/geth/config.go
+++ b/cmd/geth/config.go
@@ -178,6 +178,10 @@ func makeFullNode(ctx *cli.Context) *node.Node {
 	if cfg.Ethstats.URL != "" {
 		utils.RegisterEthStatsService(stack, cfg.Ethstats.URL)
 	}
+
+	if ctx.GlobalBool(utils.StateDiffFlag.Name) {
+		utils.RegisterStateDiffService(stack)
+	}
 	return stack
 }
 
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index b16f9cdca..54e3dd83d 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -1134,13 +1134,6 @@ func SetShhConfig(ctx *cli.Context, stack *node.Node, cfg *whisper.Config) {
 	}
 }
 
-// Check if state diff flags are on and applies them to eth context
-func setStateDiff(ctx *cli.Context, cfg *eth.Config) {
-	if ctx.GlobalBool(StateDiffFlag.Name) && cfg.NoPruning && cfg.SyncMode == downloader.FullSync {
-		cfg.StateDiff.On = true
-	}
-}
-
 // SetEthConfig applies eth-related command line flags to the config.
 func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 	// Avoid conflicting network flags
@@ -1176,10 +1169,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 	}
 	cfg.NoPruning = ctx.GlobalString(GCModeFlag.Name) == "archive"
 
-	if ctx.GlobalIsSet(StateDiffFlag.Name) {
-		setStateDiff(ctx, cfg)
-	}
-
 	if ctx.GlobalIsSet(CacheFlag.Name) || ctx.GlobalIsSet(CacheTrieFlag.Name) {
 		cfg.TrieCleanCache = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheTrieFlag.Name) / 100
 	}
diff --git a/eth/config.go b/eth/config.go
index c675b6d08..601f4735e 100644
--- a/eth/config.go
+++ b/eth/config.go
@@ -17,7 +17,6 @@
 package eth
 
 import (
-	"github.com/ethereum/go-ethereum/statediff"
 	"math/big"
 	"os"
 	"os/user"
@@ -129,9 +128,6 @@ type Config struct {
 	EWASMInterpreter string
 	// Type of the EVM interpreter ("" for default)
 	EVMInterpreter string
-
-	// Config for state diff building
-	StateDiff statediff.Config
 }
 
 type configMarshaling struct {