wip

mesg-foundation · Nov 20, 2019 · e5b5d09 · e5b5d09
1 parent 981e836
commit e5b5d09
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/x/xvalidator/validator.go b/x/xvalidator/validator.go
@@ -9,7 +9,6 @@ import (
 	ut "github.com/go-playground/universal-translator"
 	"github.com/mesg-foundation/engine/hash"
 	"github.com/mesg-foundation/engine/x/xnet"
-	"github.com/mesg-foundation/engine/x/xvalidator"
 	validator "gopkg.in/go-playground/validator.v9"
 	en_translations "gopkg.in/go-playground/validator.v9/translations/en"
 )
@@ -29,31 +28,31 @@ func New() (*validator.Validate, ut.Translator) {
 	trans, _ := uni.GetTranslator("en")
 	validate := validator.New()
 
-	validate.RegisterValidation("env", xvalidator.IsEnv)
+	validate.RegisterValidation("env", IsEnv)
 	validate.RegisterTranslation("env", trans, func(ut ut.Translator) error {
 		return ut.Add("env", "{0} must be a valid env variable name", false)
 	}, func(ut ut.Translator, fe validator.FieldError) string {
 		t, _ := ut.T(fe.Tag(), fe.Field())
 		return t
 	})
 
-	validate.RegisterValidation("portmap", xvalidator.IsPortMapping)
+	validate.RegisterValidation("portmap", IsPortMapping)
 	validate.RegisterTranslation("portmap", trans, func(ut ut.Translator) error {
 		return ut.Add("portmap", "{0} must be a valid port mapping. eg: 80 or 80:80", false)
 	}, func(ut ut.Translator, fe validator.FieldError) string {
 		t, _ := ut.T(fe.Tag(), fe.Field())
 		return t
 	})
 
-	validate.RegisterValidation("domain", xvalidator.IsDomainName)
+	validate.RegisterValidation("domain", IsDomainName)
 	validate.RegisterTranslation("domain", trans, func(ut ut.Translator) error {
 		return ut.Add("domain", "{0} must respect domain-style notation. eg: author.name", false)
 	}, func(ut ut.Translator, fe validator.FieldError) string {
 		t, _ := ut.T(fe.Tag(), fe.Field())
 		return t
 	})
 
-	validate.RegisterValidation("hash", xvalidator.IsDomainName)
+	validate.RegisterValidation("hash", IsDomainName)
 	validate.RegisterTranslation("hash", trans, func(ut ut.Translator) error {
 		return ut.Add("hash", "{0} must be a valid hash in hex format", false)
 	}, func(ut ut.Translator, fe validator.FieldError) string {