Allow profile moderation to be disabled without removing info

Author: placer14

repo/profile.go

@@ -15,9 +15,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
@@ -130,9 +127,6 @@ func (p *Profile) IsModerationEnabled() bool {
 }
 
 func (p *Profile) validateModeratorFees() error {
-	if !p.profileProto.Moderator && p.profileProto.ModeratorInfo != nil {
-		return ErrNonModeratorShouldNotHaveInfo
-	}
 	if p.profileProto.Moderator && p.profileProto.ModeratorInfo == nil {
 		return ErrModeratorInfoMissing
 	}

repo/profile_test.go

@@ -154,6 +154,24 @@ func TestProfileValidWithoutModeratorInfo(t *testing.T) {
 	}
 }
 
+func TestProfileValidWithModeratorInfoAndModerationDisabled(t *testing.T) {
+	var (
+		p  = factory.MustNewProfile()
+		pp = p.GetProtobuf()
+	)
+	pp.Moderator = false
+	pp.ModeratorInfo = &pb.Moderator{
+		Fee: &pb.Moderator_Fee{
+			FeeType:    pb.Moderator_Fee_PERCENTAGE,
+			Percentage: 0,
+		},
+	}
+
+	if err := p.Valid(); err != nil {
+		t.Errorf("expected profile to be valid with moderator info and moderation disabled, but errored (%s)", err)
+	}
+}
+
 func TestProfileInvalidWithoutModeratorFee(t *testing.T) {
 	var (
 		p  = factory.MustNewProfile()