Skip to content

test: fix after boxes and prefetcher remerge #4716

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

Merged
algorandskiy merged 2 commits into from
Nov 1, 2022
Merged

test: fix after boxes and prefetcher remerge #4716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f130d0
test: fix after boxes and prefetcher remerge
algorandskiy Nov 1, 2022
fe686b6
Fix linter
algorandskiy Nov 1, 2022
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
2 changes: 1 addition & 1 deletion ledger/internal/eval.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1558,7 +1558,7 @@ transactionGroupLoop:
if !ok {
break transactionGroupLoop
} else if txgroup.Err != nil {
logging.Base().Errorf("eval prefetcher error: %w", txgroup.Err)
logging.Base().Errorf("eval prefetcher error: %v", txgroup.Err)
}

if txgroup.Err == nil {
Expand Down
18 changes: 9 additions & 9 deletions test/e2e-go/features/transactions/accountv2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,31 +343,31 @@ func TestAccountInformationWithBadAssetIdx(t *testing.T) {
defer fixtures.ShutdownSynchronizedTest(t)

t.Parallel()
AccountInformationCheckWithOffendingFields(t, []basics.AssetIndex{12181853637140359511}, nil, nil)
accountInformationCheckWithOffendingFields(t, []basics.AssetIndex{12181853637140359511}, nil, nil)
}

// Add missing asset index
func TestAccountInformationWithMissingAssetIdx(t *testing.T) {
partitiontest.PartitionTest(t)
defer fixtures.ShutdownSynchronizedTest(t)

AccountInformationCheckWithOffendingFields(t, []basics.AssetIndex{121818}, nil, nil)
accountInformationCheckWithOffendingFields(t, []basics.AssetIndex{121818}, nil, nil)
}

// Add offending app index greater than uint64
func TestAccountInformationWithBadAppIdx(t *testing.T) {
partitiontest.PartitionTest(t)
defer fixtures.ShutdownSynchronizedTest(t)

AccountInformationCheckWithOffendingFields(t, nil, []basics.AppIndex{12181853637140359511}, nil)
accountInformationCheckWithOffendingFields(t, nil, []basics.AppIndex{12181853637140359511}, nil)
}

// Add missing app index
func TestAccountInformationWithMissingApp(t *testing.T) {
partitiontest.PartitionTest(t)
defer fixtures.ShutdownSynchronizedTest(t)

AccountInformationCheckWithOffendingFields(t, nil, []basics.AppIndex{121818}, nil)
accountInformationCheckWithOffendingFields(t, nil, []basics.AppIndex{121818}, nil)
}

// Add missing account address
Expand All @@ -377,10 +377,10 @@ func TestAccountInformationWithMissingAddress(t *testing.T) {

randAddr := basics.Address{}
crypto.RandBytes(randAddr[:])
AccountInformationCheckWithOffendingFields(t, nil, nil, []basics.Address{randAddr})
accountInformationCheckWithOffendingFields(t, nil, nil, []basics.Address{randAddr})
}

func AccountInformationCheckWithOffendingFields(t *testing.T,
func accountInformationCheckWithOffendingFields(t *testing.T,
foreignAssets []basics.AssetIndex,
foreignApps []basics.AppIndex,
accounts []basics.Address) {
Expand Down Expand Up @@ -464,7 +464,7 @@ int 1

// create the app
tx, err := client.MakeUnsignedAppCreateTx(
transactions.OptInOC, approvalOps.Program, clearstateOps.Program, schema, schema, nil, nil, nil, nil, 0)
transactions.OptInOC, approvalOps.Program, clearstateOps.Program, schema, schema, nil, nil, nil, nil, nil, 0)
a.NoError(err)
tx, err = client.FillUnsignedTxTemplate(creator, 0, 0, fee, tx)
a.NoError(err)
Expand Down Expand Up @@ -519,7 +519,7 @@ int 1
checkEvalDelta(t, &client, txnRound, txnRound+1, 1, 1)

// call the app
tx, err = client.MakeUnsignedAppOptInTx(uint64(appIdx), nil, nil, nil, nil)
tx, err = client.MakeUnsignedAppOptInTx(uint64(appIdx), nil, nil, nil, nil, nil)
a.NoError(err)
if foreignAssets != nil {
tx.ForeignAssets = foreignAssets
Expand Down Expand Up @@ -608,7 +608,7 @@ int 1
a.Equal(creator, app.Params.Creator)

// call the app
tx, err = client.MakeUnsignedAppNoOpTx(uint64(appIdx), nil, nil, nil, nil)
tx, err = client.MakeUnsignedAppNoOpTx(uint64(appIdx), nil, nil, nil, nil, nil)
a.NoError(err)
tx, err = client.FillUnsignedTxTemplate(user, 0, 0, fee, tx)
a.NoError(err)
Expand Down