Skip to content
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.

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

fix: map delete #2017

Merged
merged 4 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions examples/gno.land/r/x/map_delete/map_delete.gno
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package mapdelete

var mapus map[uint64]string = make(map[uint64]string)

func init() {
mapus[3] = "three"
mapus[5] = "five"
mapus[9] = "nine"
}

func DeleteMap(k uint64) {
delete(mapus, k)
}

func GetMap(k uint64) bool {
_, exist := mapus[k]
return exist
}
21 changes: 21 additions & 0 deletions examples/gno.land/r/x/map_delete/map_delete_test.gno
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package mapdelete

import (
"testing"
)

func TestGetMap(t *testing.T) {
if !(GetMap(3)) {
t.Error("Expected true, got ", GetMap(3))
}
}

func TestDeleteMap(t *testing.T) {
DeleteMap(3)
}

func TestGetMapAfterDelete(t *testing.T) {
if GetMap(3) {
t.Error("Expected false, got ", GetMap(3))
}
}
41 changes: 41 additions & 0 deletions gno.land/cmd/gnoland/testdata/map-delete.txtar
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
gnoland start

# add contract
gnokey maketx addpkg -pkgdir $WORK -pkgpath gno.land/r/demo/mapdelete -gas-fee 1000000ugnot -gas-wanted 2000000 -broadcast -chainid=tendermint_test test1
stdout OK!

# delete map
gnokey maketx call -pkgpath gno.land/r/demo/mapdelete -func DeleteMap -args 3 -gas-fee 1000000ugnot -gas-wanted 2000000 -broadcast -chainid=tendermint_test test1
stdout OK!

# check deletion
gnokey maketx call -pkgpath gno.land/r/demo/mapdelete -func GetMap -args 3 -gas-fee 1000000ugnot -gas-wanted 2000000 -broadcast -chainid=tendermint_test test1
stdout OK!
stdout 'false bool'
# XXX without patching uverse.go, expected stdout is
# stdout 'true bool'



-- gno.mod --
module gno.land/r/demo/mapdelete

-- realm.gno --
package mapdelete

var mapus map[uint64]string = make(map[uint64]string)

func init() {
mapus[3] = "three"
mapus[5] = "five"
mapus[9] = "nine"
}

func DeleteMap(k uint64) {
delete(mapus, k)
}

func GetMap(k uint64) bool {
_, exist := mapus[k]
return exist
}
17 changes: 17 additions & 0 deletions gnovm/pkg/gnolang/uverse.go
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,24 @@ func UverseNode() *PackageNode {
switch cbt := baseOf(arg0.TV.T).(type) {
case *MapType:
mv := arg0.TV.V.(*MapValue)
val, ok := mv.GetValueForKey(m.Store, &itv)
if !ok {
return
}

// delete
mv.DeleteForKey(m.Store, &itv)

if m.Realm != nil {
// mark key as deleted
keyObj := itv.GetFirstObject(m.Store)
m.Realm.DidUpdate(mv, keyObj, nil)

// mark value as deleted
valObj := val.GetFirstObject(m.Store)
m.Realm.DidUpdate(mv, valObj, nil)
}

return
case *NativeType:
krv := reflect.New(cbt.Type.Key()).Elem()
Expand Down
Loading