genericify things

algorand · Aug 13, 2023 · 9ccb6af · 9ccb6af
1 parent 02f4f2d
commit 9ccb6af
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/daemon/algod/api/server/v2/account.go b/daemon/algod/api/server/v2/account.go
@@ -467,11 +467,11 @@ func AssetParamsToAsset(creator string, idx basics.AssetIndex, params *basics.As
 		Decimals:      uint64(params.Decimals),
 		DefaultFrozen: &frozen,
 		Name:          omitEmpty(printableUTF8OrEmpty(params.AssetName)),
-		NameB64:       byteOrNil([]byte(params.AssetName)),
+		NameB64:       sliceOrNil([]byte(params.AssetName)),
 		UnitName:      omitEmpty(printableUTF8OrEmpty(params.UnitName)),
-		UnitNameB64:   byteOrNil([]byte(params.UnitName)),
+		UnitNameB64:   sliceOrNil([]byte(params.UnitName)),
 		Url:           omitEmpty(printableUTF8OrEmpty(params.URL)),
-		UrlB64:        byteOrNil([]byte(params.URL)),
+		UrlB64:        sliceOrNil([]byte(params.URL)),
 		Clawback:      addrOrNil(params.Clawback),
 		Freeze:        addrOrNil(params.Freeze),
 		Manager:       addrOrNil(params.Manager),

diff --git a/daemon/algod/api/server/v2/handlers.go b/daemon/algod/api/server/v2/handlers.go
@@ -1493,7 +1493,7 @@ func (v2 *Handlers) GetApplicationBoxes(ctx echo.Context, applicationID uint64,
 	lastRound := ledger.Latest()
 	keyPrefix := apps.MakeBoxKey(uint64(appIdx), "")
 
-	requestedMax, algodMax := nilToZero(params.Max), v2.Node.Config().MaxAPIBoxPerApplication
+	requestedMax, algodMax := nilToDefault(params.Max), v2.Node.Config().MaxAPIBoxPerApplication
 	max := applicationBoxesMaxKeys(requestedMax, algodMax)
 
 	if max != math.MaxUint64 {

diff --git a/daemon/algod/api/server/v2/utils.go b/daemon/algod/api/server/v2/utils.go
@@ -110,18 +110,12 @@ func omitEmpty[T comparable](val T) *T {
 	return &val
 }
 
-func byteOrNil(data []byte) *[]byte {
-	if len(data) == 0 {
-		return nil
-	}
-	return &data
-}
-
-func nilToZero(numPtr *uint64) uint64 {
-	if numPtr == nil {
-		return 0
+func nilToDefault[T any](valPtr *T) T {
+	if valPtr == nil {
+		var defaultV T
+		return defaultV
 	}
-	return *numPtr
+	return *valPtr
 }
 
 func computeCreatableIndexInPayset(tx node.TxnWithStatus, txnCounter uint64, payset []transactions.SignedTxnWithAD) (cidx *uint64) {
@@ -376,7 +370,7 @@ func convertTealValue(tv basics.TealValue) model.AvmValue {
 	return model.AvmValue{
 		Type:  uint64(tv.Type),
 		Uint:  omitEmpty(tv.Uint),
-		Bytes: byteOrNil([]byte(tv.Bytes)),
+		Bytes: sliceOrNil([]byte(tv.Bytes)),
 	}
 }