align with release/anemone

Author: bbrks

db/hybrid_logical_vector.go

@@ -491,9 +491,9 @@ func appendRevocationMacroExpansions(currentSpec []sgbucket.MacroExpansionSpec,
 
 // ExtractHLVFromBlipMessage extracts the full HLV a string in the format seen over Blip
 // blip string may be the following formats
-//  1. cv only:    		cv
-//  2. cv and pv:  		cv;pv1,pv2
-//  3. cv, pv, and mv: 	cv;mv1,mv2;pv1,pv2
+//  1. cv only:			cv
+//  2. cv and pv:		cv;pv1,pv2
+//  3. cv+mv and pv:	cv,mv1,mv2;pv1,pv2
 //
 // Function will return list of revIDs if legacy rev ID was found in the HLV history section (PV)
 // TODO: CBG-3662 - Optimise once we've settled on and tested the format with CBL

rest/utilities_testing_blip_client.go

@@ -596,6 +596,7 @@ func (btr *BlipTesterReplicator) initHandlers(btc *BlipTesterClient) {
 			if btc.UseHLV() {
 				var incomingHLV *db.HybridLogicalVector
 				if revHistory != "" {
+					// TODO: Replace with new Beta version/handling
 					incomingHLV, err = db.FromHistoryForHLV(revHistory)
 					require.NoError(btr.TB(), err, "error extracting HLV history %q: %v", revHistory, err)
 					hlv = *incomingHLV
@@ -1115,11 +1116,11 @@ func (btcRunner *BlipTestClientRunner) NewBlipTesterClientOptsWithRT(rt *RestTes
 	if !opts.ConflictResolver.IsValid() {
 		require.FailNowf(btcRunner.TB(), "invalid conflict resolver", "invalid conflict resolver %q", opts.ConflictResolver)
 	}
-	if opts.SourceID == "" {
-		opts.SourceID = "blipclient"
-	}
 	id, err := uuid.NewRandom()
 	require.NoError(btcRunner.TB(), err)
+	if opts.SourceID == "" {
+		opts.SourceID = fmt.Sprintf("btc-%d", id.ID())
+	}
 
 	client = &BlipTesterClient{
 		BlipTesterClientOpts: *opts,