Skip to content

Commit 84f7a5d

Browse files
committed
fix warning + make hashdb tests not run pathdb
1 parent 6eef58d commit 84f7a5d

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

execution/gethexec/blockchain.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func (c *CachingConfig) validateStateScheme() error {
126126
switch c.StateScheme {
127127
case rawdb.HashScheme:
128128
case rawdb.PathScheme:
129-
if c.StateHistory != 0 {
129+
if c.Archive && c.StateHistory != 0 {
130130
log.Warn("Path scheme archive mode enabled, but state-history is not zero - the persisted state history will be limited to recent blocks", "StateHistory", c.StateHistory)
131131
}
132132
default:

system_tests/recreatestate_rpc_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ func TestRecreateStateForRPCNoDepthLimit(t *testing.T) {
9797
ctx, cancel := context.WithCancel(context.Background())
9898
defer cancel()
9999
builder := NewNodeBuilder(ctx).DefaultConfig(t, true)
100+
builder.RequireScheme(t, rawdb.HashScheme)
100101
builder.execConfig.RPC.MaxRecreateStateDepth = arbitrum.InfiniteMaxRecreateStateDepth
101102
builder.execConfig.Sequencer.MaxBlockSpeed = 0
102103
builder.execConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
@@ -204,6 +205,7 @@ func TestRecreateStateForRPCMissingBlockParent(t *testing.T) {
204205
ctx, cancel := context.WithCancel(context.Background())
205206
defer cancel()
206207
builder := NewNodeBuilder(ctx).DefaultConfig(t, true)
208+
builder.RequireScheme(t, rawdb.HashScheme)
207209

208210
builder.execConfig.RPC.MaxRecreateStateDepth = arbitrum.InfiniteMaxRecreateStateDepth
209211
builder.execConfig.Sequencer.MaxBlockSpeed = 0
@@ -287,6 +289,7 @@ func TestRecreateStateForRPCBlockNotFoundWhileRecreating(t *testing.T) {
287289
ctx, cancel := context.WithCancel(context.Background())
288290
defer cancel()
289291
builder := NewNodeBuilder(ctx).DefaultConfig(t, true)
292+
builder.RequireScheme(t, rawdb.HashScheme)
290293

291294
builder.execConfig.RPC.MaxRecreateStateDepth = arbitrum.InfiniteMaxRecreateStateDepth
292295
builder.execConfig.Sequencer.MaxBlockSpeed = 0

system_tests/staterecovery_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ import (
1616
"github.com/offchainlabs/nitro/execution/gethexec"
1717
)
1818

19-
func TestRectreateMissingStates(t *testing.T) {
19+
func TestRecreateMissingStates(t *testing.T) {
2020
ctx, cancel := context.WithCancel(context.Background())
2121
defer cancel()
2222
builder := NewNodeBuilder(ctx).DefaultConfig(t, true)
23+
builder.RequireScheme(t, rawdb.HashScheme)
2324
builder.execConfig.Caching.Archive = true
2425
builder.execConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 16
2526
builder.execConfig.Caching.SnapshotCache = 0 // disable snapshots

0 commit comments

Comments
 (0)