diff --git a/cmd/service/api.go b/cmd/service/api.go index 679ca82..10b7d58 100644 --- a/cmd/service/api.go +++ b/cmd/service/api.go @@ -20,7 +20,6 @@ const ( // Bootstrap API server. func initApiServer(custodialContainer *custodial.Custodial) *echo.Echo { customValidator := validator.New() - customValidator.RegisterValidation("eth_checksum", api.EthChecksumValidator) server := echo.New() server.HideBanner = true diff --git a/internal/api/network.go b/internal/api/network.go index baeb597..efe8e0a 100644 --- a/internal/api/network.go +++ b/internal/api/network.go @@ -15,7 +15,7 @@ func HandleNetworkAccountStatus(c echo.Context) error { var ( cu = c.Get("cu").(*custodial.Custodial) accountStatusRequest struct { - Address string `param:"address" validate:"required,eth_checksum"` + Address string `param:"address" validate:"required,eth_addr_checksum"` } networkBalance big.Int networkNonce uint64 diff --git a/internal/api/sign.go b/internal/api/sign.go index d602ee1..d45c1c4 100644 --- a/internal/api/sign.go +++ b/internal/api/sign.go @@ -25,9 +25,9 @@ func HandleSignTransfer(c echo.Context) error { var ( cu = c.Get("cu").(*custodial.Custodial) req struct { - From string `json:"from" validate:"required,eth_checksum"` - To string `json:"to" validate:"required,eth_checksum"` - VoucherAddress string `json:"voucherAddress" validate:"required,eth_checksum"` + From string `json:"from" validate:"required,eth_addr_checksum"` + To string `json:"to" validate:"required,eth_addr_checksum"` + VoucherAddress string `json:"voucherAddress" validate:"required,eth_addr_checksum"` Amount uint64 `json:"amount" validate:"required"` } ) diff --git a/internal/api/validator.go b/internal/api/validator.go index 713baf4..9b8883a 100644 --- a/internal/api/validator.go +++ b/internal/api/validator.go @@ -1,7 +1,6 @@ package api import ( - "github.com/celo-org/celo-blockchain/common" "github.com/go-playground/validator/v10" ) @@ -17,12 +16,3 @@ func (v *Validator) Validate(i interface{}) error { } return nil } - -func EthChecksumValidator(fl validator.FieldLevel) bool { - addr, err := common.NewMixedcaseAddressFromString(fl.Field().String()) - if err != nil { - return false - } - - return addr.ValidChecksum() -}