refactor: router

router/comptue_routes.gno

@@ -19,6 +19,11 @@ type PoolWithMeta struct {
 	tokenPair  string
 	liquidity  *u256.Uint
 }
+
+func (pm PoolWithMeta) hasToken(token string) bool {
+	return pm.token0Path == token || pm.token1Path == token
+}
+
 type ByLiquidity []PoolWithMeta
 
 func (p ByLiquidity) Len() int           { return len(p) }
@@ -80,6 +85,7 @@ func _computeAllRoutes(
 	return routes
 }
 
+// TOOD: overcomplicated parameters
 func computeRoutes(
 	inputTokenPath string,
 	outputTokenPath string,
@@ -163,10 +169,6 @@ func computeRoutes(
 	return routes
 }
 
-func (pool PoolWithMeta) hasToken(token string) bool {
-	return pool.token0Path == token || pool.token1Path == token
-}
-
 func findCandidatePools() []PoolWithMeta {
 	poolList := pl.PoolGetPoolList()
 

router/gno.mod

@@ -1,14 +1 @@
 module gno.land/r/gnoswap/v1/router
-
-require (
-	gno.land/p/demo/ufmt v0.0.0-latest
-	gno.land/p/demo/users v0.0.0-latest
-	gno.land/p/gnoswap/int256 v0.0.0-latest
-	gno.land/p/gnoswap/uint256 v0.0.0-latest
-	gno.land/r/demo/wugnot v0.0.0-latest
-	gno.land/r/gnoswap/v1/common v0.0.0-latest
-	gno.land/r/gnoswap/v1/consts v0.0.0-latest
-	gno.land/r/gnoswap/v1/emission v0.0.0-latest
-	gno.land/r/gnoswap/v1/pool v0.0.0-latest
-	gno.land/r/gnoswap/v1/staker v0.0.0-latest
-)

router/protocol_fee_swap.gno

@@ -11,6 +11,7 @@ import (
 	u256 "gno.land/p/gnoswap/uint256"
 )
 
+// TODO: should be global?
 var (
 	swapFee = uint64(15) // 0.15%
 )
@@ -58,7 +59,9 @@ func SetSwapFeeByAdmin(fee uint64) {
 		panic(err)
 	}
 
-	setSwapFee(fee)
+	if err := setSwapFee(fee); err != nil {
+		panic(err)
+	}
 
 	prevAddr, prevRealm := getPrev()
 
@@ -79,7 +82,9 @@ func SetSwapFee(fee uint64) {
 		panic(err)
 	}
 
-	setSwapFee(fee)
+	if err := setSwapFee(fee); err != nil {
+		panic(err)
+	}
 
 	prevAddr, prevRealm := getPrev()
 
@@ -91,16 +96,17 @@ func SetSwapFee(fee uint64) {
 	)
 }
 
-func setSwapFee(fee uint64) {
+func setSwapFee(fee uint64) error {
 	common.IsHalted()
 
 	// 10000 (bps) = 100%
 	if fee > 10000 {
-		panic(addDetailToError(
-			errInvalidSwapFee,
-			ufmt.Sprintf("protocol_fee_swap.gno__setSwapFee() || fee(%d) must be in range 0 ~ 10000", fee),
-		))
+		return ufmt.Errorf(
+			"%s: fee must be in range 0 to 10000. got %d",
+			errInvalidSwapFee.Error(), fee,
+		)
 	}
 
 	swapFee = fee
+	return nil
 }