feedback improvements [3]

Author: Dominikkq

internal/adapters/entrypoints/rest/common.go

@@ -7,6 +7,7 @@ import (
 	"math"
 	"math/big"
 	"net/http"
+	"strconv"
 	"time"
 
 	"github.com/go-playground/validator/v10"
@@ -26,17 +27,24 @@ var RequestValidator = validator.New(validator.WithRequiredStructEnabled())
 
 func PositiveStringValidationRule(value string) bool {
 	bigIntValue := new(big.Int)
-	bigIntValue.SetString(value, 10)
+	_, ok := bigIntValue.SetString(value, 10)
+	if !ok {
+		return false
+	}
 	return bigIntValue.Cmp(big.NewInt(0)) > 0
 }
 
-func percentageFeeValidator(fl validator.FieldLevel) bool {
+func decimalPlacesValidator(fl validator.FieldLevel) bool {
 	val := fl.Field().Float()
-	if val < 0 || val >= 100 {
+	param := fl.Param()
+	maxDecimals, err := strconv.Atoi(param)
+	if err != nil {
 		return false
 	}
-	valTimes100 := val * 100
-	return math.Mod(valTimes100, 1) == 0
+	factor := math.Pow10(maxDecimals)
+	valTimesFactor := val * factor
+	diff := math.Abs(valTimesFactor - math.Round(valTimesFactor))
+	return diff < 1e-9
 }
 
 func init() {
@@ -52,8 +60,8 @@ func registerValidations() error {
 		return fmt.Errorf("registering positive_string validation: %w", err)
 	}
 
-	if err := RequestValidator.RegisterValidation("percentage_fee", percentageFeeValidator); err != nil {
-		return fmt.Errorf("registering percentage_fee validation: %w", err)
+	if err := RequestValidator.RegisterValidation("max_decimal_places", decimalPlacesValidator); err != nil {
+		return fmt.Errorf("registering max_decimal_places validation: %w", err)
 	}
 	return nil
 }

internal/entities/common_test.go

@@ -3,13 +3,14 @@ package entities_test
 import (
 	"encoding/hex"
 	"encoding/json"
+	"math"
+	"testing"
+
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/rsksmart/liquidity-provider-server/internal/entities"
 	"github.com/rsksmart/liquidity-provider-server/internal/entities/liquidity_provider"
 	"github.com/rsksmart/liquidity-provider-server/internal/entities/utils"
 	"github.com/stretchr/testify/require"
-	"math"
-	"testing"
 )
 
 func TestSigned_CheckIntegrity(t *testing.T) {
@@ -56,8 +57,8 @@ func TestSigned_CheckIntegrity(t *testing.T) {
 		signed entities.Signed[any]
 		err    error
 	}{
-		{signed: entities.Signed[any]{Value: peginConfig, Hash: "2f8528af602b84e2b8083ed9bbbf21bca3bcfcc78948ed970c65aa58f4271870"}},
-		{signed: entities.Signed[any]{Value: pegoutConfig, Hash: "e405a29c1e0469a284f45aa8b26c95a84d8ee993664e0cf2cc5f1a963212e432"}},
+		{signed: entities.Signed[any]{Value: peginConfig, Hash: "5ab75cad18e0ad640908a3b70d6bf2e3cdca66bb53544e91833c942c4f5430af"}},
+		{signed: entities.Signed[any]{Value: pegoutConfig, Hash: "35a51729bb71bb891db62dd968f33ea2479ddb17143da32ca6bb55142a488052"}},
 		{signed: entities.Signed[any]{Value: generalConfig, Hash: "77a1d9b2426955a2dbeb4e6b561607fbd8bd044de7a60c1ed77126e72ea3cb18"}},
 		{signed: entities.Signed[any]{Value: peginConfig, Hash: "f3daab424654d2eeb2b50dc00b3e453e24ca1c690d80015f5f54d5f1fefaf900"}, err: entities.IntegrityError},
 		{signed: entities.Signed[any]{Value: pegoutConfig, Hash: "3b3e7b075eb60b8c249f44a117f406c64992bafda1273f540277448abd14077e"}, err: entities.IntegrityError},

internal/entities/quote/pegin_quote.go

@@ -2,9 +2,10 @@ package quote
 
 import (
 	"context"
+	"time"
+
 	"github.com/rsksmart/liquidity-provider-server/internal/entities"
 	"github.com/rsksmart/liquidity-provider-server/internal/entities/utils"
-	"time"
 )
 
 const (
@@ -45,7 +46,7 @@ type CreatedPeginQuote struct {
 
 type PeginCreationData struct {
 	GasPrice      *entities.Wei   `json:"gasPrice" bson:"gas_price" validate:"required"`
-	FeePercentage *utils.BigFloat `json:"percentageFee" bson:"percentage_fee" validate:"required"`
+	FeePercentage *utils.BigFloat `json:"percentageFee" bson:"gte=0,lt=100,max_decimal_places=2" validate:"required"`
 	FixedFee      *entities.Wei   `json:"fixedFee" bson:"fixed_fee" validate:"required"`
 }
 

internal/entities/quote/pegout_quote.go

@@ -2,10 +2,11 @@ package quote
 
 import (
 	"context"
+	"time"
+
 	"github.com/rsksmart/liquidity-provider-server/internal/entities"
 	"github.com/rsksmart/liquidity-provider-server/internal/entities/liquidity_provider"
 	"github.com/rsksmart/liquidity-provider-server/internal/entities/utils"
-	"time"
 )
 
 const (
@@ -52,7 +53,7 @@ type CreatedPegoutQuote struct {
 
 type PegoutCreationData struct {
 	FeeRate       *utils.BigFloat `json:"feeRate" bson:"fee_rate" validate:"required"`
-	FeePercentage *utils.BigFloat `json:"percentageFee" bson:"percentage_fee" validate:"required"`
+	FeePercentage *utils.BigFloat `json:"percentageFee" bson:"gte=0,lt=100,max_decimal_places=2" validate:"required"`
 	GasPrice      *entities.Wei   `json:"gasPrice" bson:"gas_price" validate:"required"`
 	FixedFee      *entities.Wei   `json:"fixedFee" bson:"fixed_fee" validate:"required"`
 }

pkg/liquidity_provider.go

@@ -47,7 +47,7 @@ type PeginConfigurationDTO struct {
 	CallTime       uint32  `json:"callTime" validate:"required"`
 	PenaltyFee     string  `json:"penaltyFee" validate:"required,numeric,positive_string"`
 	FixedFee       string  `json:"fixedFee" validate:"required,numeric,min=0"`
-	FeePercentage  float64 `json:"feePercentage" validate:"numeric,percentage_fee"`
+	FeePercentage  float64 `json:"feePercentage" validate:"numeric,gte=0,lt=100,max_decimal_places=2"`
 	MaxValue       string  `json:"maxValue" validate:"required,numeric,positive_string"`
 	MinValue       string  `json:"minValue" validate:"required,numeric,positive_string"`
 }
@@ -61,7 +61,7 @@ type PegoutConfigurationDTO struct {
 	ExpireTime           uint32  `json:"expireTime" validate:"required"`
 	PenaltyFee           string  `json:"penaltyFee" validate:"required,numeric,positive_string"`
 	FixedFee             string  `json:"fixedFee" validate:"required,numeric,min=0"`
-	FeePercentage        float64 `json:"feePercentage" validate:"required,percentage_fee"`
+	FeePercentage        float64 `json:"feePercentage" validate:"required,gte=0,lt=100,max_decimal_places=2"`
 	MaxValue             string  `json:"maxValue" validate:"required,numeric,positive_string"`
 	MinValue             string  `json:"minValue" validate:"required,numeric,positive_string"`
 	ExpireBlocks         uint64  `json:"expireBlocks" validate:"required"`