Merge branch 'master' into dependabot/cargo/arbitrator/prover/fuzz/ev…

…m-0.41.1
OffchainLabs · Jul 30, 2024 · af8575c · af8575c
2 parents 642951c + 0a167b2
commit af8575c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/arbnode/dataposter/dbstorage/storage.go b/arbnode/dataposter/dbstorage/storage.go
@@ -7,14 +7,12 @@ import (
 	"bytes"
 	"context"
 	"encoding/hex"
-	"errors"
 	"fmt"
 	"strconv"
 
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/offchainlabs/nitro/arbnode/dataposter/storage"
 	"github.com/offchainlabs/nitro/util/dbutil"
-	"github.com/syndtr/goleveldb/leveldb"
 )
 
 // Storage implements db based storage for batch poster.
@@ -61,7 +59,7 @@ func (s *Storage) Get(_ context.Context, index uint64) (*storage.QueuedTransacti
 	key := idxToKey(index)
 	value, err := s.db.Get(key)
 	if err != nil {
-		if errors.Is(err, leveldb.ErrNotFound) {
+		if dbutil.IsErrNotFound(err) {
 			return nil, nil
 		}
 		return nil, err

diff --git a/system_tests/full_challenge_mock_test.go b/system_tests/full_challenge_mock_test.go
@@ -7,15 +7,13 @@ package arbtest
 import "testing"
 
 func TestMockChallengeManagerAsserterIncorrect(t *testing.T) {
-	t.Parallel()
 	defaultWasmRootDir := ""
 	for i := int64(1); i <= makeBatch_MsgsPerBatch*3; i++ {
 		RunChallengeTest(t, false, true, i, defaultWasmRootDir)
 	}
 }
 
 func TestMockChallengeManagerAsserterCorrect(t *testing.T) {
-	t.Parallel()
 	defaultWasmRootDir := ""
 	for i := int64(1); i <= makeBatch_MsgsPerBatch*3; i++ {
 		RunChallengeTest(t, true, true, i, defaultWasmRootDir)

diff --git a/system_tests/program_test.go b/system_tests/program_test.go
@@ -397,7 +397,6 @@ func storageTest(t *testing.T, jit bool) {
 }
 
 func TestProgramTransientStorage(t *testing.T) {
-	t.Parallel()
 	transientStorageTest(t, true)
 }