Skip to content

Algod: Fix issue with nil accounts in local-deltas array #3790

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
jannotti merged 3 commits into from
Apr 2, 2022
Merged

Algod: Fix issue with nil accounts in local-deltas array #3790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
628f086
dont make array with length if we're just appending to it
barnjamin Mar 17, 2022
2b08b6c
make it ahead of time like other slice init in the same file
barnjamin Mar 17, 2022
dcc35c0
tweaking unit tests to be less forgiving to local deltas slice
barnjamin Mar 17, 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 daemon/algod/api/server/v2/dryrun.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ func doDryrunRequest(dr *DryrunRequest, response *generated.DryrunResponse) {
result.AppCallTrace = &debug.history
result.GlobalDelta = StateDeltaToStateDelta(delta.GlobalDelta)
if len(delta.LocalDeltas) > 0 {
localDeltas := make([]generated.AccountStateDelta, len(delta.LocalDeltas))
localDeltas := make([]generated.AccountStateDelta, 0, len(delta.LocalDeltas))
for k, v := range delta.LocalDeltas {
ldaddr, err2 := stxn.Txn.AddressByIndex(k, stxn.Txn.Sender)
if err2 != nil {
Expand Down
54 changes: 26 additions & 28 deletions daemon/algod/api/server/v2/dryrun_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,27 +563,27 @@ func TestDryrunLocal1(t *testing.T) {
if response.Txns[0].LocalDeltas == nil {
t.Fatal("empty local delta")
}
addrFound := false

// Should be a single account
assert.Len(t, *response.Txns[0].LocalDeltas, 1)

lds := (*response.Txns[0].LocalDeltas)[0]
assert.Equal(t, lds.Address, "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ")

valueFound := false
for _, lds := range *response.Txns[0].LocalDeltas {
if lds.Address == "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ" {
addrFound = true
for _, ld := range lds.Delta {
if ld.Key == b64("foo") {
valueFound = true
assert.Equal(t, ld.Value.Action, uint64(basics.SetBytesAction))
assert.Equal(t, *ld.Value.Bytes, b64("bar"))
for _, ld := range lds.Delta {
if ld.Key == b64("foo") {
valueFound = true
assert.Equal(t, ld.Value.Action, uint64(basics.SetBytesAction))
assert.Equal(t, *ld.Value.Bytes, b64("bar"))

}
}
}
}
if !addrFound {
t.Error("no local delta for AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ")
}

if !valueFound {
t.Error("no local delta for value foo")
}

if t.Failed() {
logResponse(t, &response)
}
Expand Down Expand Up @@ -644,24 +644,22 @@ func TestDryrunLocal1A(t *testing.T) {
if response.Txns[0].LocalDeltas == nil {
t.Fatal("empty local delta")
}
addrFound := false

assert.Len(t, *response.Txns[0].LocalDeltas, 1)

lds := (*response.Txns[0].LocalDeltas)[0]
assert.Equal(t, lds.Address, "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ")

valueFound := false
for _, lds := range *response.Txns[0].LocalDeltas {
if lds.Address == "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ" {
addrFound = true
for _, ld := range lds.Delta {
if ld.Key == b64("foo") {
valueFound = true
assert.Equal(t, ld.Value.Action, uint64(basics.SetBytesAction))
assert.Equal(t, *ld.Value.Bytes, b64("bar"))
for _, ld := range lds.Delta {
if ld.Key == b64("foo") {
valueFound = true
assert.Equal(t, ld.Value.Action, uint64(basics.SetBytesAction))
assert.Equal(t, *ld.Value.Bytes, b64("bar"))

}
}
}
}
if !addrFound {
t.Error("no local delta for AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ")
}

if !valueFound {
t.Error("no local delta for value foo")
}
Expand Down