fmt

Author: notJoon

gov/governance/api.gno

@@ -13,8 +13,8 @@ import (
 
 func createProposalJsonNode(id uint64, proposal ProposalInfo) *json.Node {
 	return json.Builder().
-		WriteString("id", strconv.FormatUint(id, 10)).
-		WriteString("configVersion", strconv.FormatUint(proposal.ConfigVersion, 10)).
+		WriteString("id", formatUint64(id)).
+		WriteString("configVersion", formatUint64(proposal.ConfigVersion)).
 		WriteString("proposer", proposal.Proposer.String()).
 		WriteString("status", b64Encode(getProposalStatus(id))).
 		WriteString("type", proposal.ProposalType.String()).
@@ -53,7 +53,7 @@ func GetProposalById(id uint64) string {
 	en.MintAndDistributeGns()
 	updateProposalsState()
 
-	_, exists := proposals.Get(strconv.FormatUint(id, 10))
+	_, exists := proposals.Get(formatUint64(id))
 	if !exists {
 		return ""
 	}
@@ -78,13 +78,13 @@ func GetVoteStatusFromProposalById(id uint64) string {
 	en.MintAndDistributeGns()
 	updateProposalsState()
 
-	_, exists := proposals.Get(strconv.FormatUint(id, 10))
+	_, exists := proposals.Get(formatUint64(id))
 	if !exists {
 		return ""
 	}
 
 	votesObj := metaNode()
-	votesObj.AppendObject("proposalId", json.StringNode("proposalId", strconv.FormatUint(id, 10)))
+	votesObj.AppendObject("proposalId", json.StringNode("proposalId", formatUint64(id)))
 	votesObj.AppendObject("votes", json.StringNode("votes", b64Encode(getProposalVotes(id)))) // max, yes, no
 
 	return marshal(votesObj)
@@ -139,17 +139,17 @@ func GetVoteByAddressFromProposalById(addr std.Address, id uint64) string {
 
 func createVoteJsonNode(addr std.Address, id uint64, vote voteWithWeight) *json.Node {
 	return json.Builder().
-		WriteString("proposalId", strconv.FormatUint(id, 10)).
-		WriteString("voteYes", strconv.FormatBool(vote.Yes)).
-		WriteString("voteWeight", strconv.FormatUint(vote.Weight, 10)).
-		WriteString("voteHeight", strconv.FormatUint(vote.VotedHeight, 10)).
-		WriteString("voteTimestamp", strconv.FormatUint(vote.VotedAt, 10)).
+		WriteString("proposalId", formatUint64(id)).
+		WriteString("voteYes", formatBool(vote.Yes)).
+		WriteString("voteWeight", formatUint64(vote.Weight)).
+		WriteString("voteHeight", formatUint64(vote.VotedHeight)).
+		WriteString("voteTimestamp", formatUint64(vote.VotedAt)).
 		Node()
 }
 
 // getProposalExtraData returns the extra data of a proposal based on its type.
 func getProposalExtraData(proposalId uint64) string {
-	proposal, exist := proposals.Get(strconv.FormatUint(proposalId, 10))
+	proposal, exist := proposals.Get(formatUint64(proposalId))
 	if !exist {
 		return ""
 	}
@@ -176,7 +176,7 @@ func getCommunityPoolSpendProposalData(proposalId uint64) string {
 	proposalObj := json.Builder().
 		WriteString("to", proposal.CommunityPoolSpend.To.String()).
 		WriteString("tokenPath", proposal.CommunityPoolSpend.TokenPath).
-		WriteString("amount", strconv.FormatUint(proposal.CommunityPoolSpend.Amount, 10)).
+		WriteString("amount", formatUint64(proposal.CommunityPoolSpend.Amount)).
 		Node()
 
 	return marshal(proposalObj)
@@ -194,7 +194,7 @@ func getParameterChangeProposalData(proposalId uint64) string {
 
 // getProposalStatus returns the status of a proposal.
 func getProposalStatus(id uint64) string {
-	prop, exist := proposals.Get(strconv.Itoa(int(id)))
+	prop, exist := proposals.Get(formatUint64(id))
 	if !exist {
 		return ""
 	}
@@ -204,30 +204,31 @@ func getProposalStatus(id uint64) string {
 	votingStart := proposal.State.CreatedAt + config.VotingStartDelay
 	votingEnd := votingStart + config.VotingPeriod
 
+	state := proposal.State
 	proposalObj := json.Builder().
-		WriteString("CreatedAt", strconv.FormatUint(proposal.State.CreatedAt, 10)).
-		WriteString("Upcoming", strconv.FormatBool(proposal.State.Upcoming)).
-		WriteString("Active", strconv.FormatBool(proposal.State.Active)).
-		WriteString("VotingStart", strconv.FormatUint(votingStart, 10)).
-		WriteString("VotingEnd", strconv.FormatUint(votingEnd, 10)).
-		WriteString("Passed", strconv.FormatBool(proposal.State.Passed)).
-		WriteString("PassedAt", strconv.FormatUint(proposal.State.PassedAt, 10)).
-		WriteString("Rejected", strconv.FormatBool(proposal.State.Rejected)).
-		WriteString("RejectedAt", strconv.FormatUint(proposal.State.RejectedAt, 10)).
-		WriteString("Canceled", strconv.FormatBool(proposal.State.Canceled)).
-		WriteString("CanceledAt", strconv.FormatUint(proposal.State.CanceledAt, 10)).
-		WriteString("Executed", strconv.FormatBool(proposal.State.Executed)).
-		WriteString("ExecutedAt", strconv.FormatUint(proposal.State.ExecutedAt, 10)).
-		WriteString("Expired", strconv.FormatBool(proposal.State.Expired)).
-		WriteString("ExpiredAt", strconv.FormatUint(proposal.State.ExpiredAt, 10)).
+		WriteString("CreatedAt", formatUint64(state.CreatedAt)).
+		WriteString("Upcoming", formatBool(state.Upcoming)).
+		WriteString("Active", formatBool(state.Active)).
+		WriteString("VotingStart", formatUint64(votingStart)).
+		WriteString("VotingEnd", formatUint64(votingEnd)).
+		WriteString("Passed", formatBool(state.Passed)).
+		WriteString("PassedAt", formatUint64(state.PassedAt)).
+		WriteString("Rejected", formatBool(state.Rejected)).
+		WriteString("RejectedAt", formatUint64(state.RejectedAt)).
+		WriteString("Canceled", formatBool(state.Canceled)).
+		WriteString("CanceledAt", formatUint64(state.CanceledAt)).
+		WriteString("Executed", formatBool(state.Executed)).
+		WriteString("ExecutedAt", formatUint64(state.ExecutedAt)).
+		WriteString("Expired", formatBool(state.Expired)).
+		WriteString("ExpiredAt", formatUint64(state.ExpiredAt)).
 		Node()
 
 	return marshal(proposalObj)
 }
 
 // getProposalVotes returns the votes of a proposal.
 func getProposalVotes(id uint64) string {
-	prop, exist := proposals.Get(strconv.FormatUint(id, 10))
+	prop, exist := proposals.Get(formatUint64(id))
 	if !exist {
 		return ""
 	}
@@ -236,7 +237,7 @@ func getProposalVotes(id uint64) string {
 	maxVoting := proposal.MaxVotingWeight.ToString()
 
 	proposalObj := json.Builder().
-		WriteString("quorum", strconv.FormatUint(proposal.QuorumAmount, 10)).
+		WriteString("quorum", formatUint64(proposal.QuorumAmount)).
 		WriteString("max", maxVoting).
 		WriteString("yes", proposal.Yea.ToString()).
 		WriteString("no", proposal.Nay.ToString()).

gov/governance/config.gno

@@ -48,8 +48,7 @@ func getConfigByVersion(v uint64) (Config, bool) {
 func getLatestVersion() uint64 {
 	var maxVersion uint64
 	configVersions.ReverseIterate("", "", func(key string, value interface{}) bool {
-		version, _ := strconv.ParseUint(key, 10, 64)
-		maxVersion = version
+		maxVersion = parseUint64(key)
 		return true
 	})
 	return maxVersion
@@ -117,14 +116,14 @@ func reconfigure(
 		"Reconfigure",
 		"prevAddr", prevAddr,
 		"prevRealm", prevPkgPath,
-		"votingStartDelay", ufmt.Sprintf("%d", config.VotingStartDelay),
-		"votingPeriod", ufmt.Sprintf("%d", config.VotingPeriod),
-		"votingWeightSmoothingDuration", ufmt.Sprintf("%d", config.VotingWeightSmoothingDuration),
-		"quorum", ufmt.Sprintf("%d", config.Quorum),
-		"proposalCreationThreshold", ufmt.Sprintf("%d", config.ProposalCreationThreshold),
-		"executionDelay", ufmt.Sprintf("%d", config.ExecutionDelay),
-		"executionWindow", ufmt.Sprintf("%d", config.ExecutionWindow),
-		"newConfigVersion", ufmt.Sprintf("%d", newVersion),
+		"votingStartDelay", formatUint64(config.VotingStartDelay),
+		"votingPeriod", formatUint64(config.VotingPeriod),
+		"votingWeightSmoothingDuration", formatUint64(config.VotingWeightSmoothingDuration),
+		"quorum", formatUint64(config.Quorum),
+		"proposalCreationThreshold", formatUint64(config.ProposalCreationThreshold),
+		"executionDelay", formatUint64(config.ExecutionDelay),
+		"executionWindow", formatUint64(config.ExecutionWindow),
+		"newConfigVersion", formatUint64(newVersion),
 	)
 
 	return newVersion
@@ -134,7 +133,6 @@ func reconfigure(
 // If version is 0, it returns the current configuration.
 func GetConfigVersion(version uint64) Config {
 	en.MintAndDistributeGns()
-	// updateProposalsState() // do not call this function here, it will cause a init loop in updateProposal()
 
 	if version == 0 {
 		return config

gov/governance/config_test.gno

@@ -186,7 +186,6 @@ func TestGetConfigVersion(t *testing.T) {
 
 			expectedConfig := config
 			if tt.version != 0 {
-				// expectedConfig, _ = configVersions.Get(tt.version)
 				expectedConfig, _ = getConfigByVersion(tt.version)
 			}
 			uassert.Equal(t, result.VotingStartDelay, expectedConfig.VotingStartDelay)

gov/governance/execute_test.gno

@@ -3,11 +3,61 @@ package governance
 import (
 	"errors"
 	"testing"
+	"time"
 
+	"gno.land/p/demo/avl"
 	"gno.land/p/demo/uassert"
 	"gno.land/r/gnoswap/v1/consts"
+
+	u256 "gno.land/p/gnoswap/uint256"
 )
 
+func TestParameterRegistry_Register(t *testing.T) {
+	registry := NewParameterRegistry()
+
+	testHandler := func(params []string) error {
+		return nil
+	}
+
+	tests := []struct {
+		name     string
+		pkgPath  string
+		function string
+		handler  ParameterHandler
+	}{
+		{
+			name:     "pass",
+			pkgPath:  "test/pkg",
+			function: "testFunc",
+			handler:  testHandler,
+		},
+		{
+			name:     "empty pass",
+			pkgPath:  "",
+			function: "testFunc",
+			handler:  testHandler,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			registry.Register(tt.pkgPath, tt.function, tt.handler)
+
+			handler, err := registry.Handler(tt.pkgPath, tt.function)
+			uassert.NoError(t, err)
+
+			if handler == nil {
+				t.Errorf("handler is nil")
+			}
+
+			expectedKey := makeHandlerKey(tt.pkgPath, tt.function)
+			if _, exists := registry.handlers.Get(expectedKey); !exists {
+				t.Errorf("expected key %s not found", expectedKey)
+			}
+		})
+	}
+}
+
 func TestParameterRegistry(t *testing.T) {
 	tests := []struct {
 		name       string
@@ -110,8 +160,10 @@ func TestExecuteParameterChange(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			err := executeParameterChange(tt.msgs, registry)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("executeParameterChange2() error = %v, wantErr %v", err, tt.wantErr)
+			if !tt.wantErr {
+				uassert.NoError(t, err)
+			} else {
+				uassert.Error(t, err)
 			}
 		})
 	}