From ce19466f4798497ae8a53361a945dc0d9803ea0c Mon Sep 17 00:00:00 2001
From: "jonathan@vulcanize.io" <jface@woodmere.vulc.ch2.20c.com>
Date: Thu, 14 Mar 2024 02:06:26 +0000
Subject: [PATCH] test version rebased off upstream

---
 cmd/geth/les_test.go            | 16 ++++++++--------
 cmd/geth/logging_test.go        |  2 +-
 cmd/geth/logtestcmd_active.go   |  2 +-
 cmd/geth/logtestcmd_inactive.go |  2 +-
 cmd/geth/main.go                |  2 +-
 plugins/test-plugin/engine.go   |  9 +++++----
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/cmd/geth/les_test.go b/cmd/geth/les_test.go
index b5dea4ab8..96456de17 100644
--- a/cmd/geth/les_test.go
+++ b/cmd/geth/les_test.go
@@ -132,14 +132,14 @@ func startGethWithIpc(t *testing.T, name string, args ...string) *gethrpc {
 	return nil
 }
 
-func initGeth(t *testing.T) string {
-	args := []string{"--networkid=42", "init", "./testdata/clique.json"}
-	t.Logf("Initializing geth: %v ", args)
-	g := runGeth(t, args...)
-	datadir := g.Datadir
-	g.WaitExit()
-	return datadir
-}
+// func initGeth(t *testing.T) string {
+// 	args := []string{"--networkid=42", "init", "./testdata/clique.json"}
+// 	t.Logf("Initializing geth: %v ", args)
+// 	g := runGeth(t, args...)
+// 	datadir := g.Datadir
+// 	g.WaitExit()
+// 	return datadir
+// }
 
 func startLightServer(t *testing.T) *gethrpc {
 	datadir := initGeth(t)
diff --git a/cmd/geth/logging_test.go b/cmd/geth/logging_test.go
index b5ce03f4b..1fc432ea1 100644
--- a/cmd/geth/logging_test.go
+++ b/cmd/geth/logging_test.go
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package geth
 
 import (
 	"bufio"
diff --git a/cmd/geth/logtestcmd_active.go b/cmd/geth/logtestcmd_active.go
index f2a2c5ded..95fc19420 100644
--- a/cmd/geth/logtestcmd_active.go
+++ b/cmd/geth/logtestcmd_active.go
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package geth
 
 import (
 	"errors"
diff --git a/cmd/geth/logtestcmd_inactive.go b/cmd/geth/logtestcmd_inactive.go
index 691ab5bcd..4763c3fb1 100644
--- a/cmd/geth/logtestcmd_inactive.go
+++ b/cmd/geth/logtestcmd_inactive.go
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package geth
 
 import "github.com/urfave/cli/v2"
 
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 657801e3c..52f51ce68 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -15,7 +15,7 @@
 // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
 // geth is the official command-line client for Ethereum.
-package main
+package geth
 
 import (
 	"fmt"
diff --git a/plugins/test-plugin/engine.go b/plugins/test-plugin/engine.go
index fac7cd505..698fbcde6 100644
--- a/plugins/test-plugin/engine.go
+++ b/plugins/test-plugin/engine.go
@@ -1,15 +1,14 @@
 package main
 
-import(
+import (
 	"errors"
 	"math/big"
 
 	"github.com/openrelayxyz/plugeth-utils/core"
 	"github.com/openrelayxyz/plugeth-utils/restricted"
-	"github.com/openrelayxyz/plugeth-utils/restricted/types"
-	"github.com/openrelayxyz/plugeth-utils/restricted/hasher"
 	"github.com/openrelayxyz/plugeth-utils/restricted/consensus"
 	"github.com/openrelayxyz/plugeth-utils/restricted/params"
+	"github.com/openrelayxyz/plugeth-utils/restricted/types"
 )
 
 var (
@@ -78,7 +77,9 @@ func (e *engine) FinalizeAndAssemble(chain consensus.ChainHeaderReader, header *
 
 	}
 	header.Root = state.IntermediateRoot(false)
-	hasher := hasher.NewStackTrie(nil)
+
+	//hasher := hasher.NewStackTrie(nil)
+	hasher := types.TrieHasher(nil)
 	block := types.NewBlockWithWithdrawals(header, txs, uncles, receipts, withdrawals, hasher)
 	return block, nil