Skip to content

test(daprovider/das): replace local min/max with arbmath helpers #3865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −21
Open

test(daprovider/das): replace local min/max with arbmath helpers #3865

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 10 additions & 21 deletions daprovider/das/aggregator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (

"github.com/offchainlabs/nitro/blsSignatures"
"github.com/offchainlabs/nitro/daprovider/das/dasutil"
"github.com/offchainlabs/nitro/util/arbmath"
"github.com/offchainlabs/nitro/util/testhelpers/flag"
)

Expand Down Expand Up @@ -147,19 +148,7 @@ func (w *WrapStore) Store(ctx context.Context, message []byte, timeout uint64) (
return nil, nil
}

func max(a, b int) int {
if a > b {
return a
}
return b
}

func min(a, b int) int {
if a < b {
return a
}
return b
}
// Use shared math helpers to avoid duplicating min/max logic in tests.

func enableLogging() {
glogger := log.NewGlogHandler(
Expand All @@ -175,11 +164,11 @@ func testConfigurableStorageFailures(t *testing.T, shouldFailAggregation bool) {
numBackendDAS := (rand.Int() % 20) + 1
assumedHonest := (rand.Int() % numBackendDAS) + 1
var nFailures int
if shouldFailAggregation {
nFailures = max(assumedHonest, rand.Int()%(numBackendDAS+1))
} else {
nFailures = min(assumedHonest-1, rand.Int()%(numBackendDAS+1))
}
if shouldFailAggregation {
nFailures = int(arbmath.MaxInt(assumedHonest, rand.Int()%(numBackendDAS+1)))
} else {
nFailures = int(arbmath.MinInt(assumedHonest-1, rand.Int()%(numBackendDAS+1)))
}
nSuccesses := numBackendDAS - nFailures
log.Trace(fmt.Sprintf("Testing aggregator with K:%d with K=N+1-H, N:%d, H:%d, and %d successes", numBackendDAS+1-assumedHonest, numBackendDAS, assumedHonest, nSuccesses))

Expand Down Expand Up @@ -256,7 +245,7 @@ func initTest(t *testing.T) int {
}
rand.Seed(seed)

runs := 2 ^ 32
runs := 1 << 32
if len(*testflag.RunsFlag) > 0 {
var err error
runs, err = strconv.Atoi(*testflag.RunsFlag)
Expand All @@ -275,7 +264,7 @@ func initTest(t *testing.T) int {
func TestDAS_LessThanHStorageFailures(t *testing.T) {
runs := initTest(t)

for i := 0; i < min(runs, 20); i++ {
for i := 0; i < int(arbmath.MinInt(runs, 20)); i++ {
t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
t.Parallel()
testConfigurableStorageFailures(t, false)
Expand All @@ -285,7 +274,7 @@ func TestDAS_LessThanHStorageFailures(t *testing.T) {

func TestDAS_AtLeastHStorageFailures(t *testing.T) {
runs := initTest(t)
for i := 0; i < min(runs, 10); i++ {
for i := 0; i < int(arbmath.MinInt(runs, 10)); i++ {
t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
t.Parallel()
testConfigurableStorageFailures(t, true)
Expand Down