Skip to content

Commit f7014ad

Browse files
committed
align with release/anemone
1 parent 85a1376 commit f7014ad

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

db/hybrid_logical_vector.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,9 @@ func appendRevocationMacroExpansions(currentSpec []sgbucket.MacroExpansionSpec,
491491

492492
// ExtractHLVFromBlipMessage extracts the full HLV a string in the format seen over Blip
493493
// blip string may be the following formats
494-
// 1. cv only: cv
495-
// 2. cv and pv: cv;pv1,pv2
496-
// 3. cv, pv, and mv: cv;mv1,mv2;pv1,pv2
494+
// 1. cv only: cv
495+
// 2. cv and pv: cv;pv1,pv2
496+
// 3. cv+mv and pv: cv,mv1,mv2;pv1,pv2
497497
//
498498
// Function will return list of revIDs if legacy rev ID was found in the HLV history section (PV)
499499
// TODO: CBG-3662 - Optimise once we've settled on and tested the format with CBL

rest/utilities_testing_blip_client.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,7 @@ func (btr *BlipTesterReplicator) initHandlers(btc *BlipTesterClient) {
596596
if btc.UseHLV() {
597597
var incomingHLV *db.HybridLogicalVector
598598
if revHistory != "" {
599+
// TODO: Replace with new Beta version/handling
599600
incomingHLV, err = db.FromHistoryForHLV(revHistory)
600601
require.NoError(btr.TB(), err, "error extracting HLV history %q: %v", revHistory, err)
601602
hlv = *incomingHLV
@@ -1115,11 +1116,11 @@ func (btcRunner *BlipTestClientRunner) NewBlipTesterClientOptsWithRT(rt *RestTes
11151116
if !opts.ConflictResolver.IsValid() {
11161117
require.FailNowf(btcRunner.TB(), "invalid conflict resolver", "invalid conflict resolver %q", opts.ConflictResolver)
11171118
}
1118-
if opts.SourceID == "" {
1119-
opts.SourceID = "blipclient"
1120-
}
11211119
id, err := uuid.NewRandom()
11221120
require.NoError(btcRunner.TB(), err)
1121+
if opts.SourceID == "" {
1122+
opts.SourceID = fmt.Sprintf("btc-%d", id.ID())
1123+
}
11231124

11241125
client = &BlipTesterClient{
11251126
BlipTesterClientOpts: *opts,

0 commit comments

Comments
 (0)