Skip to content

testing: fix bug in TestRekeyUpgrade #3026

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
tsachiherman merged 1 commit into from
Oct 8, 2021
Merged

testing: fix bug in TestRekeyUpgrade #3026

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
32 changes: 25 additions & 7 deletions test/e2e-go/upgrades/rekey_support_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,29 @@ func TestRekeyUpgrade(t *testing.T) {
addrB, err := basics.UnmarshalChecksumAddress(accountB)
a.NoError(err)

accountC, err := client.GenerateAddress(wh)
a.NoError(err)

accountD, err := client.GenerateAddress(wh)
a.NoError(err)

addrD, err := basics.UnmarshalChecksumAddress(accountD)
a.NoError(err)

fee := uint64(1000)
amount := uint64(1000000)
lease := [32]byte{}

// move some money from accountA -> accountC
tx, err := client.ConstructPayment(accountA, accountC, fee, amount*10, nil, "", lease, basics.Round(0), basics.Round(0))
a.NoError(err)

fundAccountC, err := client.SignTransactionWithWallet(wh, nil, tx)
a.NoError(err)

_, err = client.BroadcastTransaction(fundAccountC)
a.NoError(err)

curStatus, err := client.Status()
a.NoError(err)
initialStatus := curStatus
Expand All @@ -79,11 +98,11 @@ func TestRekeyUpgrade(t *testing.T) {
a.Equal(basics.Address{}, ad.AuthAddr)

// rekey A -> B (RekeyTo check)
tx, err := client.ConstructPayment(accountA, accountB, fee, amount, nil, "", lease, basics.Round(round), basics.Round(initialStatus.NextVersionRound).SubSaturate(1))
tx, err = client.ConstructPayment(accountA, accountB, fee, amount, nil, "", lease, basics.Round(round), basics.Round(initialStatus.NextVersionRound).SubSaturate(1))
a.NoError(err)

tx.RekeyTo = addrB
rekey, err := client.SignTransactionWithWalletAndSigner(wh, nil, "", tx)
rekey, err := client.SignTransactionWithWallet(wh, nil, tx)
a.NoError(err)

_, err = client.BroadcastTransaction(rekey)
Expand Down Expand Up @@ -137,12 +156,11 @@ func TestRekeyUpgrade(t *testing.T) {
}

// now that the network already upgraded:

tx, err = client.ConstructPayment(accountA, accountB, fee, amount, nil, "", lease, basics.Round(round), basics.Round(round+1000))
tx, err = client.ConstructPayment(accountC, accountD, fee, amount, nil, "", lease, basics.Round(round), basics.Round(round+1000))
a.NoError(err)
tx.RekeyTo = addrB
tx.RekeyTo = addrD

rekey, err = client.SignTransactionWithWalletAndSigner(wh, nil, "", tx)
rekey, err = client.SignTransactionWithWallet(wh, nil, tx)
a.NoError(err)

// now, that we have upgraded to the new protocol which supports rekey, try again.
Expand All @@ -155,7 +173,7 @@ func TestRekeyUpgrade(t *testing.T) {

// use rekeyed key to authorize (AuthAddr check)
tx.RekeyTo = basics.Address{}
rekeyed, err = client.SignTransactionWithWalletAndSigner(wh, nil, accountB, tx)
rekeyed, err = client.SignTransactionWithWalletAndSigner(wh, nil, accountD, tx)
a.NoError(err)

_, err = client.BroadcastTransaction(rekeyed)
Expand Down