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.

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

Jump to bottom

refactor!: split r/demo/users #1433

Merged
merged 16 commits into from
Feb 29, 2024
Merged

refactor!: split r/demo/users #1433

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
eca0147
feat: split `r/demo/users`
harry-hov Dec 12, 2023
793aa89
chore: fixups
harry-hov Jan 14, 2024
d8da934
fix failing `gno.land/test`
harry-hov Jan 14, 2024
337ede8
Fix tests
harry-hov Jan 15, 2024
ecb18dd
s/rusers.Resolve()/std.Address()
harry-hov Jan 15, 2024
40f29f5
gno mod tidy
harry-hov Jan 15, 2024
a4794ea
Merge branch 'master' into hariom/split-users-realm
harry-hov Jan 15, 2024
ee91546
Merge branch 'master' into hariom/split-users-realm
harry-hov Jan 17, 2024
9ee009b
remove redundant `users.AddressOrName` casting
harry-hov Feb 15, 2024
8ea3f37
s/Render/String
harry-hov Feb 15, 2024
67db397
Merge branch 'master' into hariom/split-users-realm
harry-hov Feb 15, 2024
80e121b
Merge branch 'master' into hariom/split-users-realm
harry-hov Feb 19, 2024
f9af53e
Merge branch 'master' into hariom/split-users-realm
harry-hov Feb 23, 2024
ff711ca
Merge branch 'master' into hariom/split-users-realm
harry-hov Feb 28, 2024
c894748
`s/String()/Render()`
harry-hov Feb 29, 2024
362b39f
Merge branch 'master' into hariom/split-users-realm
harry-hov Feb 29, 2024
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: 16 additions & 16 deletions examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token_test.gno
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"std"
"testing"

"gno.land/r/demo/users"
"gno.land/p/demo/users"
)

const dummyURI = "ipfs://xyz"
Expand Down Expand Up @@ -35,8 +35,8 @@ func TestBalanceOf(t *testing.T) {
t.Errorf("should not be nil")
}

addr1 := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm").Resolve()
addr2 := users.AddressOrName("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj").Resolve()
addr1 := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
addr2 := std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj")

tid1 := TokenID("1")
tid2 := TokenID("2")
Expand Down Expand Up @@ -86,8 +86,8 @@ func TestBalanceOfBatch(t *testing.T) {
t.Errorf("should not be nil")
}

addr1 := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm").Resolve()
addr2 := users.AddressOrName("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj").Resolve()
addr1 := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
addr2 := std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj")

tid1 := TokenID("1")
tid2 := TokenID("2")
Expand Down Expand Up @@ -126,8 +126,8 @@ func TestIsApprovedForAll(t *testing.T) {
t.Errorf("should not be nil")
}

addr1 := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm").Resolve()
addr2 := users.AddressOrName("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj").Resolve()
addr1 := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
addr2 := std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj")

isApprovedForAll := dummy.IsApprovedForAll(addr1, addr2)
if isApprovedForAll != false {
Expand All @@ -142,7 +142,7 @@ func TestSetApprovalForAll(t *testing.T) {
}

caller := std.GetOrigCaller()
addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm").Resolve()
addr := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")

isApprovedForAll := dummy.IsApprovedForAll(caller, addr)
if isApprovedForAll != false {
Expand Down Expand Up @@ -177,7 +177,7 @@ func TestSafeTransferFrom(t *testing.T) {
}

caller := std.GetOrigCaller()
addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm").Resolve()
addr := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")

tid := TokenID("1")

Expand Down Expand Up @@ -224,7 +224,7 @@ func TestSafeBatchTransferFrom(t *testing.T) {
}

caller := std.GetOrigCaller()
addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm").Resolve()
addr := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")

tid1 := TokenID("1")
tid2 := TokenID("2")
Expand Down Expand Up @@ -280,8 +280,8 @@ func TestSafeMint(t *testing.T) {
t.Errorf("should not be nil")
}

addr1 := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm").Resolve()
addr2 := users.AddressOrName("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj").Resolve()
addr1 := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
addr2 := std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj")

tid1 := TokenID("1")
tid2 := TokenID("2")
Expand Down Expand Up @@ -327,8 +327,8 @@ func TestSafeBatchMint(t *testing.T) {
t.Errorf("should not be nil")
}

addr1 := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm").Resolve()
addr2 := users.AddressOrName("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj").Resolve()
addr1 := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
addr2 := std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj")

tid1 := TokenID("1")
tid2 := TokenID("2")
Expand Down Expand Up @@ -374,7 +374,7 @@ func TestBurn(t *testing.T) {
t.Errorf("should not be nil")
}

addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm").Resolve()
addr := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")

tid1 := TokenID("1")
tid2 := TokenID("2")
Expand Down Expand Up @@ -417,7 +417,7 @@ func TestBatchBurn(t *testing.T) {
t.Errorf("should not be nil")
}

addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm").Resolve()
addr := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")

tid1 := TokenID("1")
tid2 := TokenID("2")
Expand Down
2 changes: 1 addition & 1 deletion examples/gno.land/p/demo/grc/grc1155/gno.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ module gno.land/p/demo/grc/grc1155
require (
gno.land/p/demo/avl v0.0.0-latest
gno.land/p/demo/ufmt v0.0.0-latest
gno.land/r/demo/users v0.0.0-latest
moul marked this conversation as resolved.
Show resolved Hide resolved
gno.land/p/demo/users v0.0.0-latest
)
Loading
Loading