Merge branch 'master' into pebble-sublevels-metric

magicxyyz · web-flow · commit 01a8e47145e9 · 2024-10-04T13:59:21.000+02:00
diff --git a/arbitrum/recordingdb.go b/arbitrum/recordingdb.go
@@ -21,7 +21,6 @@ import (
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/triedb"
 	"github.com/ethereum/go-ethereum/triedb/hashdb"
-	flag "github.com/spf13/pflag"
 )
 
 var (
@@ -159,18 +158,8 @@ func (r *RecordingChainContext) GetMinBlockNumberAccessed() uint64 {
 }
 
 type RecordingDatabaseConfig struct {
-	TrieDirtyCache int `koanf:"trie-dirty-cache"`
-	TrieCleanCache int `koanf:"trie-clean-cache"`
-}
-
-var DefaultRecordingDatabaseConfig = RecordingDatabaseConfig{
-	TrieDirtyCache: 1024,
-	TrieCleanCache: 16,
-}
-
-func RecordingDatabaseConfigAddOptions(prefix string, f *flag.FlagSet) {
-	f.Int(prefix+".trie-dirty-cache", DefaultRecordingDatabaseConfig.TrieDirtyCache, "like trie-dirty-cache for the separate, recording database (used for validation)")
-	f.Int(prefix+".trie-clean-cache", DefaultRecordingDatabaseConfig.TrieCleanCache, "like trie-clean-cache for the separate, recording database (used for validation)")
+	TrieDirtyCache int
+	TrieCleanCache int
 }
 
 type RecordingDatabase struct {
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -349,8 +349,6 @@ func geth(ctx *cli.Context) error {
 // it unlocks any requested accounts, and starts the RPC/IPC interfaces and the
 // miner.
 func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend, isConsole bool) {
-	debug.Memsize.Add("node", stack)
-
 	// Start up the node itself
 	utils.StartNode(ctx, stack, isConsole)
 
diff --git a/core/rawdb/accessors_snapshot.go b/core/rawdb/accessors_snapshot.go
@@ -73,9 +73,8 @@ func DeleteSnapshotRoot(db ethdb.KeyValueWriter) {
 }
 
 // ReadAccountSnapshot retrieves the snapshot entry of an account trie leaf.
-func ReadAccountSnapshot(db ethdb.KeyValueReader, hash common.Hash) []byte {
-	data, _ := db.Get(accountSnapshotKey(hash))
-	return data
+func ReadAccountSnapshot(db ethdb.KeyValueReader, hash common.Hash) ([]byte, error) {
+	return ignoreNotFound(db.Get(accountSnapshotKey(hash)))
 }
 
 // WriteAccountSnapshot stores the snapshot entry of an account trie leaf.
@@ -93,9 +92,8 @@ func DeleteAccountSnapshot(db ethdb.KeyValueWriter, hash common.Hash) {
 }
 
 // ReadStorageSnapshot retrieves the snapshot entry of an storage trie leaf.
-func ReadStorageSnapshot(db ethdb.KeyValueReader, accountHash, storageHash common.Hash) []byte {
-	data, _ := db.Get(storageSnapshotKey(accountHash, storageHash))
-	return data
+func ReadStorageSnapshot(db ethdb.KeyValueReader, accountHash, storageHash common.Hash) ([]byte, error) {
+	return ignoreNotFound(db.Get(storageSnapshotKey(accountHash, storageHash)))
 }
 
 // WriteStorageSnapshot stores the snapshot entry of an storage trie leaf.
diff --git a/core/rawdb/arbitrum_not_found.go b/core/rawdb/arbitrum_not_found.go
@@ -0,0 +1,26 @@
+// Copyright 2024 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+package rawdb
+
+// Arbitrum specific code to handle database errors
+
+func ignoreNotFound(blob []byte, err error) ([]byte, error) {
+	if isDbErrNotFound(err) {
+		return nil, nil
+	}
+	return blob, err
+}
diff --git a/core/rawdb/arbitrum_not_found_native.go b/core/rawdb/arbitrum_not_found_native.go
@@ -0,0 +1,32 @@
+// Copyright 2024 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+//go:build !wasm
+// +build !wasm
+
+package rawdb
+
+import (
+	"errors"
+
+	"github.com/cockroachdb/pebble"
+	"github.com/ethereum/go-ethereum/ethdb/memorydb"
+	"github.com/syndtr/goleveldb/leveldb"
+)
+
+func isDbErrNotFound(err error) bool {
+	return errors.Is(err, leveldb.ErrNotFound) || errors.Is(err, pebble.ErrNotFound) || errors.Is(err, memorydb.ErrMemorydbNotFound)
+}
diff --git a/core/rawdb/arbitrum_not_found_wasm.go b/core/rawdb/arbitrum_not_found_wasm.go
@@ -0,0 +1,30 @@
+// Copyright 2024 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+//go:build wasm
+// +build wasm
+
+package rawdb
+
+import (
+	"errors"
+
+	"github.com/ethereum/go-ethereum/ethdb/memorydb"
+)
+
+func isDbErrNotFound(err error) bool {
+	return errors.Is(err, memorydb.ErrMemorydbNotFound)
+}
diff --git a/core/state/snapshot/disklayer.go b/core/state/snapshot/disklayer.go
@@ -117,7 +117,10 @@ func (dl *diskLayer) AccountRLP(hash common.Hash) ([]byte, error) {
 		return blob, nil
 	}
 	// Cache doesn't contain account, pull from disk and cache for later
-	blob := rawdb.ReadAccountSnapshot(dl.diskdb, hash)
+	blob, err := rawdb.ReadAccountSnapshot(dl.diskdb, hash)
+	if err != nil {
+		return nil, err
+	}
 	dl.cache.Set(hash[:], blob)
 
 	snapshotCleanAccountMissMeter.Mark(1)
@@ -157,7 +160,10 @@ func (dl *diskLayer) Storage(accountHash, storageHash common.Hash) ([]byte, erro
 		return blob, nil
 	}
 	// Cache doesn't contain storage slot, pull from disk and cache for later
-	blob := rawdb.ReadStorageSnapshot(dl.diskdb, accountHash, storageHash)
+	blob, err := rawdb.ReadStorageSnapshot(dl.diskdb, accountHash, storageHash)
+	if err != nil {
+		return nil, err
+	}
 	dl.cache.Set(key, blob)
 
 	snapshotCleanStorageMissMeter.Mark(1)
diff --git a/core/state/snapshot/disklayer_test.go b/core/state/snapshot/disklayer_test.go
@@ -183,7 +183,7 @@ func TestDiskMerge(t *testing.T) {
 	// assertDatabaseAccount ensures that an account from the database matches the given blob.
 	assertDatabaseAccount := func(account common.Hash, data []byte) {
 		t.Helper()
-		if blob := rawdb.ReadAccountSnapshot(db, account); !bytes.Equal(blob, data) {
+		if blob, _ := rawdb.ReadAccountSnapshot(db, account); !bytes.Equal(blob, data) {
 			t.Errorf("account database access (%x) mismatch: have %x, want %x", account, blob, data)
 		}
 	}
@@ -197,7 +197,7 @@ func TestDiskMerge(t *testing.T) {
 	// assertDatabaseStorage ensures that a storage slot from the database matches the given blob.
 	assertDatabaseStorage := func(account common.Hash, slot common.Hash, data []byte) {
 		t.Helper()
-		if blob := rawdb.ReadStorageSnapshot(db, account, slot); !bytes.Equal(blob, data) {
+		if blob, _ := rawdb.ReadStorageSnapshot(db, account, slot); !bytes.Equal(blob, data) {
 			t.Errorf("storage database access (%x:%x) mismatch: have %x, want %x", account, slot, blob, data)
 		}
 	}
@@ -387,7 +387,7 @@ func TestDiskPartialMerge(t *testing.T) {
 		// exist otherwise.
 		assertDatabaseAccount := func(account common.Hash, data []byte) {
 			t.Helper()
-			blob := rawdb.ReadAccountSnapshot(db, account)
+			blob, _ := rawdb.ReadAccountSnapshot(db, account)
 			if bytes.Compare(account[:], genMarker) > 0 && blob != nil {
 				t.Fatalf("test %d: post-marker (%x) account database access (%x) succeeded: %x", i, genMarker, account, blob)
 			}
@@ -407,7 +407,7 @@ func TestDiskPartialMerge(t *testing.T) {
 		// and does not exist otherwise.
 		assertDatabaseStorage := func(account common.Hash, slot common.Hash, data []byte) {
 			t.Helper()
-			blob := rawdb.ReadStorageSnapshot(db, account, slot)
+			blob, _ := rawdb.ReadStorageSnapshot(db, account, slot)
 			if bytes.Compare(append(account[:], slot[:]...), genMarker) > 0 && blob != nil {
 				t.Fatalf("test %d: post-marker (%x) storage database access (%x:%x) succeeded: %x", i, genMarker, account, slot, blob)
 			}
diff --git a/core/state/snapshot/generate_test.go b/core/state/snapshot/generate_test.go
@@ -578,7 +578,7 @@ func testGenerateWithExtraAccounts(t *testing.T, scheme string) {
 	root := helper.Commit()
 
 	// To verify the test: If we now inspect the snap db, there should exist extraneous storage items
-	if data := rawdb.ReadStorageSnapshot(helper.diskdb, hashData([]byte("acc-2")), hashData([]byte("b-key-1"))); data == nil {
+	if data, _ := rawdb.ReadStorageSnapshot(helper.diskdb, hashData([]byte("acc-2")), hashData([]byte("b-key-1"))); data == nil {
 		t.Fatalf("expected snap storage to exist")
 	}
 	snap := generateSnapshot(helper.diskdb, helper.triedb, 16, root)
@@ -596,7 +596,7 @@ func testGenerateWithExtraAccounts(t *testing.T, scheme string) {
 	snap.genAbort <- stop
 	<-stop
 	// If we now inspect the snap db, there should exist no extraneous storage items
-	if data := rawdb.ReadStorageSnapshot(helper.diskdb, hashData([]byte("acc-2")), hashData([]byte("b-key-1"))); data != nil {
+	if data, _ := rawdb.ReadStorageSnapshot(helper.diskdb, hashData([]byte("acc-2")), hashData([]byte("b-key-1"))); data != nil {
 		t.Fatalf("expected slot to be removed, got %v", string(data))
 	}
 }
@@ -746,7 +746,7 @@ func testGenerateWithMalformedSnapdata(t *testing.T, scheme string) {
 	snap.genAbort <- stop
 	<-stop
 	// If we now inspect the snap db, there should exist no extraneous storage items
-	if data := rawdb.ReadStorageSnapshot(helper.diskdb, hashData([]byte("acc-2")), hashData([]byte("b-key-1"))); data != nil {
+	if data, _ := rawdb.ReadStorageSnapshot(helper.diskdb, hashData([]byte("acc-2")), hashData([]byte("b-key-1"))); data != nil {
 		t.Fatalf("expected slot to be removed, got %v", string(data))
 	}
 }
diff --git a/core/state/snapshot/utils.go b/core/state/snapshot/utils.go
@@ -61,7 +61,7 @@ func checkDanglingDiskStorage(chaindb ethdb.KeyValueStore) error {
 			log.Info("Iterating snap storage", "at", fmt.Sprintf("%#x", accKey), "elapsed", common.PrettyDuration(time.Since(start)))
 			lastReport = time.Now()
 		}
-		if data := rawdb.ReadAccountSnapshot(chaindb, common.BytesToHash(accKey)); len(data) == 0 {
+		if data, _ := rawdb.ReadAccountSnapshot(chaindb, common.BytesToHash(accKey)); len(data) == 0 {
 			log.Warn("Dangling storage - missing account", "account", fmt.Sprintf("%#x", accKey), "storagekey", fmt.Sprintf("%#x", k))
 			return fmt.Errorf("dangling snapshot storage account %#x", accKey)
 		}
@@ -97,7 +97,7 @@ func CheckJournalAccount(db ethdb.KeyValueStore, hash common.Hash) error {
 	// Look up the disk layer first
 	baseRoot := rawdb.ReadSnapshotRoot(db)
 	fmt.Printf("Disklayer: Root: %x\n", baseRoot)
-	if data := rawdb.ReadAccountSnapshot(db, hash); data != nil {
+	if data, _ := rawdb.ReadAccountSnapshot(db, hash); data != nil {
 		account, err := types.FullAccount(data)
 		if err != nil {
 			panic(err)
diff --git a/go.mod b/go.mod
@@ -24,7 +24,6 @@ require (
 	github.com/fatih/color v1.13.0
 	github.com/ferranbt/fastssz v0.1.2
 	github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e
-	github.com/fjl/memsize v0.0.2
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/gammazero/deque v0.2.1
 	github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff
diff --git a/go.sum b/go.sum
@@ -191,8 +191,6 @@ github.com/ferranbt/fastssz v0.1.2 h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNP
 github.com/ferranbt/fastssz v0.1.2/go.mod h1:X5UPrE2u1UJjxHA8X54u04SBwdAQjG2sFtWs39YxyWs=
 github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e h1:bBLctRc7kr01YGvaDfgLbTwjFNW5jdp5y5rj8XXBHfY=
 github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e/go.mod h1:AzA8Lj6YtixmJWL+wkKoBGsLWy9gFrAzi4g+5bCKwpY=
-github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA=
-github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
diff --git a/internal/debug/flags.go b/internal/debug/flags.go
@@ -30,16 +30,13 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/metrics/exp"
-	"github.com/fjl/memsize/memsizeui"
 	"github.com/mattn/go-colorable"
 	"github.com/mattn/go-isatty"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/exp/slog"
 	"gopkg.in/natefinch/lumberjack.v2"
 )
 
-var Memsize memsizeui.Handler
-
 var (
 	verbosityFlag = &cli.IntFlag{
 		Name:     "verbosity",
@@ -315,7 +312,6 @@ func StartPProf(address string, withMetrics bool) {
 	if withMetrics {
 		exp.Exp(metrics.DefaultRegistry)
 	}
-	http.Handle("/memsize/", http.StripPrefix("/memsize", &Memsize))
 	log.Info("Starting pprof server", "addr", fmt.Sprintf("http://%s/debug/pprof", address))
 	go func() {
 		if err := http.ListenAndServe(address, nil); err != nil {
diff --git a/params/config_arbitrum.go b/params/config_arbitrum.go
@@ -25,6 +25,7 @@ import (
 const ArbosVersion_FixRedeemGas = uint64(11)
 const ArbosVersion_Stylus = uint64(30)
 const ArbosVersion_StylusFixes = uint64(31)
+const ArbosVersion_StylusChargingFixes = uint64(32)
 
 type ArbitrumChainParams struct {
 	EnableArbOS               bool
@@ -114,7 +115,7 @@ func ArbitrumDevTestParams() ArbitrumChainParams {
 		EnableArbOS:               true,
 		AllowDebugPrecompiles:     true,
 		DataAvailabilityCommittee: false,
-		InitialArbOSVersion:       31,
+		InitialArbOSVersion:       32,
 		InitialChainOwner:         common.Address{},
 	}
 }
@@ -124,7 +125,7 @@ func ArbitrumDevTestDASParams() ArbitrumChainParams {
 		EnableArbOS:               true,
 		AllowDebugPrecompiles:     true,
 		DataAvailabilityCommittee: true,
-		InitialArbOSVersion:       31,
+		InitialArbOSVersion:       32,
 		InitialChainOwner:         common.Address{},
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,8 @@ func DeleteSnapshotRoot(db ethdb.KeyValueWriter) {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`// ReadAccountSnapshot retrieves the snapshot entry of an account trie leaf.`
`76`		`-func ReadAccountSnapshot(db ethdb.KeyValueReader, hash common.Hash) []byte {`
`77`		`- data, _ := db.Get(accountSnapshotKey(hash))`
`78`		`- return data`
	`76`	`+func ReadAccountSnapshot(db ethdb.KeyValueReader, hash common.Hash) ([]byte, error) {`
	`77`	`+ return ignoreNotFound(db.Get(accountSnapshotKey(hash)))`
`79`	`78`	`}`
`80`	`79`
`81`	`80`	`// WriteAccountSnapshot stores the snapshot entry of an account trie leaf.`
`@@ -93,9 +92,8 @@ func DeleteAccountSnapshot(db ethdb.KeyValueWriter, hash common.Hash) {`
`93`	`92`	`}`
`94`	`93`
`95`	`94`	`// ReadStorageSnapshot retrieves the snapshot entry of an storage trie leaf.`
`96`		`-func ReadStorageSnapshot(db ethdb.KeyValueReader, accountHash, storageHash common.Hash) []byte {`
`97`		`- data, _ := db.Get(storageSnapshotKey(accountHash, storageHash))`
`98`		`- return data`
	`95`	`+func ReadStorageSnapshot(db ethdb.KeyValueReader, accountHash, storageHash common.Hash) ([]byte, error) {`
	`96`	`+ return ignoreNotFound(db.Get(storageSnapshotKey(accountHash, storageHash)))`
`99`	`97`	`}`
`100`	`98`
`101`	`99`	`// WriteStorageSnapshot stores the snapshot entry of an storage trie leaf.`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ func TestDiskMerge(t *testing.T) {`
`183`	`183`	`// assertDatabaseAccount ensures that an account from the database matches the given blob.`
`184`	`184`	`assertDatabaseAccount := func(account common.Hash, data []byte) {`
`185`	`185`	`t.Helper()`
`186`		`- if blob := rawdb.ReadAccountSnapshot(db, account); !bytes.Equal(blob, data) {`
	`186`	`+ if blob, _ := rawdb.ReadAccountSnapshot(db, account); !bytes.Equal(blob, data) {`
`187`	`187`	`t.Errorf("account database access (%x) mismatch: have %x, want %x", account, blob, data)`
`188`	`188`	`}`
`189`	`189`	`}`
`@@ -197,7 +197,7 @@ func TestDiskMerge(t *testing.T) {`
`197`	`197`	`// assertDatabaseStorage ensures that a storage slot from the database matches the given blob.`
`198`	`198`	`assertDatabaseStorage := func(account common.Hash, slot common.Hash, data []byte) {`
`199`	`199`	`t.Helper()`
`200`		`- if blob := rawdb.ReadStorageSnapshot(db, account, slot); !bytes.Equal(blob, data) {`
	`200`	`+ if blob, _ := rawdb.ReadStorageSnapshot(db, account, slot); !bytes.Equal(blob, data) {`
`201`	`201`	`t.Errorf("storage database access (%x:%x) mismatch: have %x, want %x", account, slot, blob, data)`
`202`	`202`	`}`
`203`	`203`	`}`
`@@ -387,7 +387,7 @@ func TestDiskPartialMerge(t *testing.T) {`
`387`	`387`	`// exist otherwise.`
`388`	`388`	`assertDatabaseAccount := func(account common.Hash, data []byte) {`
`389`	`389`	`t.Helper()`
`390`		`- blob := rawdb.ReadAccountSnapshot(db, account)`
	`390`	`+ blob, _ := rawdb.ReadAccountSnapshot(db, account)`
`391`	`391`	`if bytes.Compare(account[:], genMarker) > 0 && blob != nil {`
`392`	`392`	`t.Fatalf("test %d: post-marker (%x) account database access (%x) succeeded: %x", i, genMarker, account, blob)`
`393`	`393`	`}`
`@@ -407,7 +407,7 @@ func TestDiskPartialMerge(t *testing.T) {`
`407`	`407`	`// and does not exist otherwise.`
`408`	`408`	`assertDatabaseStorage := func(account common.Hash, slot common.Hash, data []byte) {`
`409`	`409`	`t.Helper()`
`410`		`- blob := rawdb.ReadStorageSnapshot(db, account, slot)`
	`410`	`+ blob, _ := rawdb.ReadStorageSnapshot(db, account, slot)`
`411`	`411`	`if bytes.Compare(append(account[:], slot[:]...), genMarker) > 0 && blob != nil {`
`412`	`412`	`t.Fatalf("test %d: post-marker (%x) storage database access (%x:%x) succeeded: %x", i, genMarker, account, slot, blob)`
`413`	`413`	`}`
Original file line number	Diff line number	Diff line change
`@@ -578,7 +578,7 @@ func testGenerateWithExtraAccounts(t *testing.T, scheme string) {`
`578`	`578`	`root := helper.Commit()`
`579`	`579`
`580`	`580`	`// To verify the test: If we now inspect the snap db, there should exist extraneous storage items`
`581`		`- if data := rawdb.ReadStorageSnapshot(helper.diskdb, hashData([]byte("acc-2")), hashData([]byte("b-key-1"))); data == nil {`
	`581`	`+ if data, _ := rawdb.ReadStorageSnapshot(helper.diskdb, hashData([]byte("acc-2")), hashData([]byte("b-key-1"))); data == nil {`
`582`	`582`	`t.Fatalf("expected snap storage to exist")`
`583`	`583`	`}`
`584`	`584`	`snap := generateSnapshot(helper.diskdb, helper.triedb, 16, root)`
`@@ -596,7 +596,7 @@ func testGenerateWithExtraAccounts(t *testing.T, scheme string) {`
`596`	`596`	`snap.genAbort <- stop`
`597`	`597`	`<-stop`
`598`	`598`	`// If we now inspect the snap db, there should exist no extraneous storage items`
`599`		`- if data := rawdb.ReadStorageSnapshot(helper.diskdb, hashData([]byte("acc-2")), hashData([]byte("b-key-1"))); data != nil {`
	`599`	`+ if data, _ := rawdb.ReadStorageSnapshot(helper.diskdb, hashData([]byte("acc-2")), hashData([]byte("b-key-1"))); data != nil {`
`600`	`600`	`t.Fatalf("expected slot to be removed, got %v", string(data))`
`601`	`601`	`}`
`602`	`602`	`}`
`@@ -746,7 +746,7 @@ func testGenerateWithMalformedSnapdata(t *testing.T, scheme string) {`
`746`	`746`	`snap.genAbort <- stop`
`747`	`747`	`<-stop`
`748`	`748`	`// If we now inspect the snap db, there should exist no extraneous storage items`
`749`		`- if data := rawdb.ReadStorageSnapshot(helper.diskdb, hashData([]byte("acc-2")), hashData([]byte("b-key-1"))); data != nil {`
	`749`	`+ if data, _ := rawdb.ReadStorageSnapshot(helper.diskdb, hashData([]byte("acc-2")), hashData([]byte("b-key-1"))); data != nil {`
`750`	`750`	`t.Fatalf("expected slot to be removed, got %v", string(data))`
`751`	`751`	`}`
`752`	`752`	`}`