Only check fixed fee if NOT percentage type

hoffmabc · hoffmabc · commit a1f36ce88d03 · 2020-04-28T11:21:06.000-04:00
diff --git a/core/profile.go b/core/profile.go
@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+
 	"github.com/OpenBazaar/openbazaar-go/ipfs"
 	"github.com/OpenBazaar/openbazaar-go/repo"
 
@@ -361,7 +362,7 @@ func ValidateProfile(profile *pb.Profile) error {
 			}
 		}
 		if profile.ModeratorInfo.Fee != nil {
-			if profile.ModeratorInfo.Fee.FixedFee != nil &&
+			if profile.ModeratorInfo.Fee.FeeType != pb.Moderator_Fee_PERCENTAGE && profile.ModeratorInfo.Fee.FixedFee != nil &&
 				len(profile.ModeratorInfo.Fee.FixedFee.AmountCurrency.Code) > repo.WordMaxCharacters {
 				return fmt.Errorf("moderator fee currency code character length is greater than the max of %d", repo.WordMaxCharacters)
 			}

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`"encoding/json"`
`7`	`7`	`"errors"`
`8`	`8`	`"fmt"`
	`9`	`+`
`9`	`10`	`"github.com/OpenBazaar/openbazaar-go/ipfs"`
`10`	`11`	`"github.com/OpenBazaar/openbazaar-go/repo"`
`11`	`12`
`@@ -361,7 +362,7 @@ func ValidateProfile(profile *pb.Profile) error {`
`361`	`362`	`}`
`362`	`363`	`}`
`363`	`364`	`if profile.ModeratorInfo.Fee != nil {`
`364`		`- if profile.ModeratorInfo.Fee.FixedFee != nil &&`
	`365`	`+ if profile.ModeratorInfo.Fee.FeeType != pb.Moderator_Fee_PERCENTAGE && profile.ModeratorInfo.Fee.FixedFee != nil &&`
`365`	`366`	`len(profile.ModeratorInfo.Fee.FixedFee.AmountCurrency.Code) > repo.WordMaxCharacters {`
`366`	`367`	`return fmt.Errorf("moderator fee currency code character length is greater than the max of %d", repo.WordMaxCharacters)`
`367`	`368`	`}`