Merge pull request #1883 from OpenBazaar/brian.1880

(#1880) Remove validation for non-nil mod info

Author: cpacia

repo/profile.go

@@ -12,9 +12,6 @@ var (
 	// ErrModeratorInfoMissing indicates when the moderator information is
 	// missing while also indicating they are a moderator
 	ErrModeratorInfoMissing = errors.New("moderator is enabled but information is missing")
-	// ErrNonModeratorShouldNotHaveInfo indicates when the moderator information
-	// is present, but not indicating moderator is enabled
-	ErrNonModeratorShouldNotHaveInfo = errors.New("moderator information is provided but moderator is not enabled")
 	// ErrMissingModeratorFee indicates the fee schedule is missing
 	ErrMissingModeratorFee = errors.New("moderator info is missing fee schedule")
 	// ErrUnknownModeratorFeeType indicates the feeType is unknown
@@ -101,9 +98,6 @@ func (p *Profile) validateModeratorFees() error {
 	if p.Moderator && p.ModeratorInfo == nil {
 		return ErrModeratorInfoMissing
 	}
-	if !p.Moderator && p.ModeratorInfo != nil {
-		return ErrNonModeratorShouldNotHaveInfo
-	}
 
 	// Moderator is true, Info is present
 	if p.ModeratorInfo.Fee == nil {

repo/profile_test.go

@@ -358,24 +358,6 @@ func TestProfileInvalidAsModeratorWithoutInfo(t *testing.T) {
 	}
 }
 
-func TestProfileInvalidAsUserWithModeratorInfo(t *testing.T) {
-	p := factory.NewProfile()
-	p.Moderator = false
-	p.ModeratorInfo = &repo.ModeratorInfo{
-		Fee: &repo.ModeratorFee{
-			FeeType:    pb.Moderator_Fee_PERCENTAGE.String(),
-			Percentage: 1.1,
-			FixedFee:   nil,
-		},
-	}
-
-	if err := p.Valid(); err == nil {
-		t.Errorf("expected regular user with moderator info to be invalid")
-	} else if err != repo.ErrNonModeratorShouldNotHaveInfo {
-		t.Errorf("expected ErrNonModeratorShouldNotHaveInfo error, but got (%s)", err.Error())
-	}
-}
-
 func TestProfileSetModeratorFixedFee(t *testing.T) {
 	p := factory.NewProfile()
 	p.ModeratorInfo.Fee.FeeType = pb.Moderator_Fee_FIXED_PLUS_PERCENTAGE.String()