feat: use std.Address (rather then users.AddressOrName) (#481)

* feat: use std.Address (rather then users.AddressOrName)
gnoswap-labs · Jan 24, 2025 · 863095e · 863095e
1 parent 72e7d6d
commit 863095e
Show file tree

Hide file tree

Showing 94 changed files with 961 additions and 1,840 deletions.
diff --git a/contract/r/gnoswap/community_pool/community_pool_test.gno b/contract/r/gnoswap/community_pool/community_pool_test.gno
@@ -62,7 +62,7 @@ func TestTransferTokenByAdmin(t *testing.T) {
 			name: "panic if not enough balance",
 			setup: func() {
 				std.TestSetRealm(adminRealm)
-				gns.Transfer(common.AddrToUser(consts.COMMUNITY_POOL_ADDR), 10_000)
+				gns.Transfer(consts.COMMUNITY_POOL_ADDR, 10_000)
 			},
 			caller:      adminRealm,
 			tokenPath:   consts.GNS_PATH,
@@ -95,9 +95,9 @@ func TestTransferTokenByAdmin(t *testing.T) {
 					TransferTokenByAdmin(tt.tokenPath, tt.to, tt.amount)
 				})
 			} else {
-				receiverOldBalance := gns.BalanceOf(common.AddrToUser(tt.to))
+				receiverOldBalance := gns.BalanceOf(tt.to)
 				TransferTokenByAdmin(tt.tokenPath, tt.to, tt.amount)
-				receiverNewBalance := gns.BalanceOf(common.AddrToUser(tt.to))
+				receiverNewBalance := gns.BalanceOf(tt.to)
 				uassert.Equal(t, receiverNewBalance-receiverOldBalance, tt.amount)
 			}
 		})
@@ -175,9 +175,9 @@ func TestTransferToken(t *testing.T) {
 					TransferToken(tt.tokenPath, tt.to, tt.amount)
 				})
 			} else {
-				receiverOldBalance := gns.BalanceOf(common.AddrToUser(tt.to))
+				receiverOldBalance := gns.BalanceOf(tt.to)
 				TransferToken(tt.tokenPath, tt.to, tt.amount)
-				receiverNewBalance := gns.BalanceOf(common.AddrToUser(tt.to))
+				receiverNewBalance := gns.BalanceOf(tt.to)
 				uassert.Equal(t, receiverNewBalance-receiverOldBalance, tt.amount)
 			}
 		})

diff --git a/contract/r/gnoswap/community_pool/tests/init_token_register_test.gno b/contract/r/gnoswap/community_pool/tests/init_token_register_test.gno
diff --git a/contract/r/gnoswap/community_pool/tests/init_variable_and_helper_test.gno b/contract/r/gnoswap/community_pool/tests/init_variable_and_helper_test.gno
diff --git a/contract/r/gnoswap/emission/_helper_test.gno b/contract/r/gnoswap/emission/_helper_test.gno
@@ -40,5 +40,5 @@ func resetObject(t *testing.T) {
 func gnsBalance(t *testing.T, addr std.Address) uint64 {
 	t.Helper()
 
-	return gns.BalanceOf(a2u(addr))
+	return gns.BalanceOf(addr)
 }
diff --git a/contract/r/gnoswap/emission/distribution.gno b/contract/r/gnoswap/emission/distribution.gno
@@ -4,11 +4,11 @@ import (
 	"std"
 	"strconv"
 
-	"gno.land/r/gnoswap/v1/consts"
-	"gno.land/r/gnoswap/v1/gns"
-
 	"gno.land/p/demo/avl"
 	"gno.land/p/demo/ufmt"
+
+	"gno.land/r/gnoswap/v1/consts"
+	"gno.land/r/gnoswap/v1/gns"
 )
 
 const (
@@ -176,22 +176,22 @@ func calculateAmount(amount, bptPct uint64) uint64 {
 func transferToTarget(target int, amount uint64) {
 	switch target {
 	case LIQUIDITY_STAKER:
-		gns.Transfer(a2u(consts.STAKER_ADDR), amount)
+		gns.Transfer(consts.STAKER_ADDR, amount)
 		distributedToStaker += amount
 		accuDistributedToStaker += amount
 
 	case DEVOPS:
-		gns.Transfer(a2u(consts.DEV_OPS), amount)
+		gns.Transfer(consts.DEV_OPS, amount)
 		distributedToDevOps += amount
 		accuDistributedToDevOps += amount
 
 	case COMMUNITY_POOL:
-		gns.Transfer(a2u(consts.COMMUNITY_POOL_ADDR), amount)
+		gns.Transfer(consts.COMMUNITY_POOL_ADDR, amount)
 		distributedToCommunityPool += amount
 		accuDistributedToCommunityPool += amount
 
 	case GOV_STAKER:
-		gns.Transfer(a2u(consts.GOV_STAKER_ADDR), amount)
+		gns.Transfer(consts.GOV_STAKER_ADDR, amount)
 		distributedToGovStaker += amount
 		accuDistributedToGovStaker += amount
 

diff --git a/contract/r/gnoswap/emission/distribution_test.gno b/contract/r/gnoswap/emission/distribution_test.gno
@@ -264,7 +264,7 @@ func TestTransferToTarget(t *testing.T) {
 			target: LIQUIDITY_STAKER,
 			setup: func() {
 				std.TestSetRealm(adminRealm)
-				gns.Transfer(a2u(consts.EMISSION_ADDR), 100000) // give enough balance for emission
+				gns.Transfer(consts.EMISSION_ADDR, 100000) // give enough balance for emission
 			},
 			amount: 100,
 			verify: func() {

diff --git a/contract/r/gnoswap/emission/emission.gno b/contract/r/gnoswap/emission/emission.gno
@@ -27,7 +27,7 @@ func MintAndDistributeGns() uint64 {
 		return 0
 	}
 	// Mint new tokens and add any leftover amounts from previous distribution
-	mintedEmissionRewardAmount := gns.MintGns(a2u(consts.EMISSION_ADDR))
+	mintedEmissionRewardAmount := gns.MintGns(consts.EMISSION_ADDR)
 	if hasLeftGNSAmount() {
 		mintedEmissionRewardAmount += GetLeftGNSAmount()
 		setLeftGNSAmount(0)

diff --git a/contract/r/gnoswap/emission/utils.gno b/contract/r/gnoswap/emission/utils.gno
@@ -5,18 +5,12 @@ import (
 	"strconv"
 
 	"gno.land/p/demo/ufmt"
-	pusers "gno.land/p/demo/users"
 
 	"gno.land/r/gnoswap/v1/common"
 )
 
 const MAX_BPS_PCT uint64 = 10000
 
-// a2u converts std.Address to pusers.AddressOrName.
-func a2u(addr std.Address) pusers.AddressOrName {
-	return pusers.AddressOrName(addr)
-}
-
 // getPrevRealm returns object of the previous realm.
 func getPrevRealm() std.Realm {
 	return std.PrevRealm()

diff --git a/contract/r/gnoswap/gnft/utils.gno b/contract/r/gnoswap/gnft/utils.gno
@@ -5,7 +5,6 @@ import (
 
 	"gno.land/p/demo/grc/grc721"
 	"gno.land/p/demo/ufmt"
-	pusers "gno.land/p/demo/users"
 )
 
 // getPrevAsString returns the address and package path of the previous realm.
@@ -19,18 +18,6 @@ func getPrevAddr() std.Address {
 	return std.PrevRealm().Addr()
 }
 
-// a2u converts std.Address to pusers.AddressOrName.
-// pusers is a package that contains the user-related functions.
-//
-// Input:
-//   - addr: the address to convert
-//
-// Output:
-//   - pusers.AddressOrName: the converted address
-func a2u(addr std.Address) pusers.AddressOrName {
-	return pusers.AddressOrName(addr)
-}
-
 // tid converts uint64 to grc721.TokenID.
 //
 // Input: