lint issue

Author: gregns1

db/hybrid_logical_vector.go

@@ -693,12 +693,12 @@ func (hlv HybridLogicalVector) GoString() string {
 }
 
 // ErrNoNewVersionsToAdd will be thrown when there are no new versions from incoming HLV to be added to HLV that is local
-var ErrNoNewVersionsToAdd  = errors.New("no new versions to add to HLV")
+var ErrNoNewVersionsToAdd = errors.New("no new versions to add to HLV")
 
 // IsInConflict is used to identify if two HLV's are in conflict or not. Will return boolean to indicate if in conflict
 // or not and will error for the following cases:
-//	- Local HLV dominates incoming HLV (meaning local version is a newer version that the incoming one)
-//	- Local CV matches incoming CV, so no new versions to add
+//   - Local HLV dominates incoming HLV (meaning local version is a newer version that the incoming one)
+//   - Local CV matches incoming CV, so no new versions to add
 func IsInConflict(ctx context.Context, localHLV, incomingHLV *HybridLogicalVector) (bool, error) {
 	incomingCV := incomingHLV.ExtractCurrentVersionFromHLV()
 	localCV := localHLV.ExtractCurrentVersionFromHLV()

db/hybrid_logical_vector_test.go

@@ -1434,14 +1434,14 @@ func TestIsInConflict(t *testing.T) {
 			incomingHLV: "112@abc;123@ghi",
 		},
 		{
-			name: "local revision is newer",
-			localHLV: "111@abc;123@def",
-			incomingHLV: "100@abc;123@ghi",
+			name:          "local revision is newer",
+			localHLV:      "111@abc;123@def",
+			incomingHLV:   "100@abc;123@ghi",
 			expectedError: true,
 		},
 		{
-			name: "merge versions match",
-			localHLV: "130@abc,123@def,100@ghi;50@jkl",
+			name:        "merge versions match",
+			localHLV:    "130@abc,123@def,100@ghi;50@jkl",
 			incomingHLV: "150@mno,123@def,100@ghi;50@jkl",
 		},
 	}
@@ -1450,6 +1450,7 @@ func TestIsInConflict(t *testing.T) {
 			localHLV, _, err := extractHLVFromBlipString(tc.localHLV)
 			require.NoError(t, err)
 			incomingHLV, _, err := extractHLVFromBlipString(tc.incomingHLV)
+			require.NoError(t, err)
 
 			inConflict, err := IsInConflict(t.Context(), localHLV, incomingHLV)
 			if tc.expectedError {

rest/utilities_testing_blip_client.go

@@ -329,7 +329,7 @@ func (cd *clientDoc) _hasConflict(t testing.TB, incomingHLV *db.HybridLogicalVec
 		require.FailNow(t, fmt.Sprintf("incoming CV %#+v is equal to local revision %#+v - this should've been filtered via changes response before ending up as a rev. This is only true if there is a single replication occurring, two simultaneous replications (e.g. P2P) could cause this. If there are multiple replications, modify code.", incomingCV, latestRev))
 	}
 
-	inConflict, err := db.IsInConflict(nil, &localHLV, incomingHLV)
+	inConflict, err := db.IsInConflict(t.Context(), &localHLV, incomingHLV)
 	if err != nil {
 		require.FailNow(t, fmt.Sprintf("incoming CV %#+v has lower version than the local revision %#+v - this should've been filtered via changes response before ending up as a rev. blip tester would reply that to Sync Gateway that it doesn't need this revision", incomingCV, localHLV))
 	}