chore: go improvements (#106)

Makefile

@@ -1,3 +1,5 @@
+default: help
+
 help: ## Display this help message.
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[0-9a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST)
 
@@ -90,3 +92,12 @@ z_use_local_gno: ## Use the local '../gno' directory instead of the remote 'gith
 z_use_remote_gno: ## Use the remote 'github.com/gnolang/gno' module and remove any replacements.
 	@echo "Switching to remote gno module..."
 	@go mod edit -dropreplace github.com/gnolang/gno
+
+z_test_realm: ## Test the realm.
+	go run github.com/gnolang/gno/gnovm/cmd/gno test --verbose ./realm
+
+z_build_realm: ## Precompile and build the generated Go files. Assumes a working clone of gno in ../gno.
+	mkdir -p ../gno/examples/gno.land/r/gnochess
+	cp -rf realm/*.gno ../gno/examples/gno.land/r/gnochess
+	go run github.com/gnolang/gno/gnovm/cmd/gno precompile --verbose ../gno/examples/gno.land
+	go run github.com/gnolang/gno/gnovm/cmd/gno build --verbose ../gno/examples/gno.land/r/gnochess

realm/chess.gno

@@ -42,9 +42,7 @@ type Game struct {
 
 func (g Game) json() string {
 	s, err := g.MarshalJSON()
-	if err != nil {
-		panic(err)
-	}
+	checkErr(err)
 	return string(s)
 }
 
@@ -237,7 +235,7 @@ func assertGamesFinished(games []*Game) {
 		if g.State.IsFinished() {
 			continue
 		}
-		err := claimTimeout(g)
+		err := g.claimTimeout()
 		if err != nil {
 			panic("can't start new game: game " + g.ID + " is not yet finished")
 		}
@@ -379,7 +377,7 @@ func MakeMove(gameID, from, to string, promote Piece) string {
 			} else {
 				g.Winner = WinnerWhite
 			}
-			saveGameResult(g)
+			g.saveResult()
 			return g.json()
 		}
 	}
@@ -432,12 +430,12 @@ func MakeMove(gameID, from, to string, promote Piece) string {
 		g.Winner = WinnerDraw
 	}
 	g.DrawOfferer = nil
-	saveGameResult(g)
+	g.saveResult()
 
 	return g.json()
 }
 
-func claimTimeout(g *Game) error {
+func (g *Game) claimTimeout() error {
 	// no assert origin call or caller check: anyone can claim a game to have
 	// finished in timeout.
 
@@ -469,7 +467,7 @@ func claimTimeout(g *Game) error {
 		g.Winner = WinnerWhite
 	}
 	g.DrawOfferer = nil
-	saveGameResult(g)
+	g.saveResult()
 
 	return nil
 }
@@ -479,10 +477,8 @@ func claimTimeout(g *Game) error {
 func ClaimTimeout(gameID string) string {
 	g := getGame(gameID, true)
 
-	err := claimTimeout(g)
-	if err != nil {
-		panic(err.Error())
-	}
+	err := g.claimTimeout()
+	checkErr(err)
 
 	return g.json()
 }
@@ -525,7 +521,7 @@ func Resign(gameID string) string {
 		panic("you are not involved in this game")
 	}
 	g.DrawOfferer = nil
-	saveGameResult(g)
+	g.saveResult()
 
 	return g.json()
 }
@@ -590,7 +586,7 @@ func Draw(gameID string) string {
 		g.Winner = WinnerDraw
 		g.Concluder = &caller
 
-		saveGameResult(g)
+		g.saveResult()
 
 		return g.json()
 	}
@@ -610,7 +606,7 @@ func Draw(gameID string) string {
 	g.Winner = WinnerDraw
 	g.DrawOfferer = nil
 
-	saveGameResult(g)
+	g.saveResult()
 
 	return g.json()
 }

realm/chess_test.gno

@@ -350,9 +350,7 @@ func parseCommandTest(t *testing.T, command string) (funcs []testCommandRunner,
 	lines := strings.Split(command, "\n")
 	atoi := func(s string) int {
 		n, err := strconv.Atoi(s)
-		if err != nil {
-			panic(err)
-		}
+		checkErr(err)
 		return n
 	}
 	// used to detect whether to auto-add a panic checker

realm/discovery.gno

@@ -81,9 +81,7 @@ func GetPlayer(player string) string {
 		panic("player not found")
 	}
 	b, err := v.(*Player).MarshalJSON()
-	if err != nil {
-		panic(err)
-	}
+	checkErr(err)
 	return string(b)
 }
 
@@ -150,7 +148,7 @@ func (p Player) MarshalJSON() ([]byte, error) {
 	return buf.Bytes(), nil
 }
 
-func saveGameResult(g *Game) {
+func (g *Game) saveResult() {
 	w, b := getPlayer(g.White), getPlayer(g.Black)
 
 	cat := g.Time.Category()
@@ -282,9 +280,7 @@ func Leaderboard(category string) string {
 	for idx, entry := range leaderboard[cat] {
 		p, _ := playerStore.Get(entry.addr.String())
 		d, err := p.(Player).MarshalJSON()
-		if err != nil {
-			panic(err)
-		}
+		checkErr(err)
 		buf.Write(d)
 		if idx != len(leaderboard[cat])-1 {
 			buf.WriteByte(',')
@@ -420,9 +416,7 @@ func parseFilters(filters string) (r listGamesFilters) {
 			r.minID = pred
 		case "limit:":
 			n, err := strconv.Atoi(pred)
-			if err != nil {
-				panic(err)
-			}
+			checkErr(err)
 			r.limit = n
 		case "sort:":
 			r.reverse = pred == "desc"

realm/util.gno

@@ -0,0 +1,7 @@
+package chess
+
+func checkErr(err error) {
+	if err != nil {
+		panic(err.Error())
+	}
+}