Fix incorrect parsing of HLV history in BLIP rev message on BlipTesterClient

Author: bbrks

db/hybrid_logical_vector.go

@@ -427,6 +427,41 @@ func (hlv *HybridLogicalVector) ToHistoryForHLV() string {
 	return s.String()
 }
 
+func FromHistoryForHLV(history string) (*HybridLogicalVector, error) {
+	hlv := NewHybridLogicalVector()
+	// split the history string into PV and MV
+	versionSets := strings.Split(history, ";")
+	switch len(versionSets) {
+	case 0:
+		// no versions present
+		return hlv, nil
+	case 2:
+		// MV
+		mvs := strings.Split(versionSets[1], ",")
+		for _, mv := range mvs {
+			v, err := ParseVersion(mv)
+			if err != nil {
+				return nil, err
+			}
+			hlv.MergeVersions[v.SourceID] = v.Value
+		}
+		fallthrough
+	case 1:
+		// PV
+		pvs := strings.Split(versionSets[0], ",")
+		for _, pv := range pvs {
+			v, err := ParseVersion(pv)
+			if err != nil {
+				return nil, err
+			}
+			hlv.PreviousVersions[v.SourceID] = v.Value
+		}
+	default:
+		return nil, fmt.Errorf("Invalid history string format")
+	}
+	return hlv, nil
+}
+
 // appendRevocationMacroExpansions adds macro expansions for the channel map.  Not strictly an HLV operation
 // but putting the function here as it's required when the HLV's current version is being macro expanded
 func appendRevocationMacroExpansions(currentSpec []sgbucket.MacroExpansionSpec, channelNames []string) (updatedSpec []sgbucket.MacroExpansionSpec) {

rest/utilities_testing_blip_client.go

@@ -601,8 +601,8 @@ func (btr *BlipTesterReplicator) initHandlers(btc *BlipTesterClient) {
 			if btc.UseHLV() {
 				var incomingHLV *db.HybridLogicalVector
 				if revHistory != "" {
-					incomingHLV, _, err = db.ExtractHLVFromBlipMessage(revHistory)
-					require.NoError(btr.TB(), err, "error extracting HLV %q: %v", revHistory, err)
+					incomingHLV, err = db.FromHistoryForHLV(revHistory)
+					require.NoError(btr.TB(), err, "error extracting HLV history %q: %v", revHistory, err)
 					hlv = *incomingHLV
 				}
 				incomingCV, err := db.ParseVersion(revID)
@@ -849,8 +849,8 @@ func (btr *BlipTesterReplicator) initHandlers(btc *BlipTesterClient) {
 		if btc.UseHLV() {
 			var incomingHLV *db.HybridLogicalVector
 			if revHistory != "" {
-				incomingHLV, _, err = db.ExtractHLVFromBlipMessage(revHistory)
-				require.NoError(btr.TB(), err, "error extracting HLV %q: %v", revHistory, err)
+				incomingHLV, err = db.FromHistoryForHLV(revHistory)
+				require.NoError(btr.TB(), err, "error extracting HLV history %q: %v", revHistory, err)
 				hlv = *incomingHLV
 			}
 			incomingCV, err := db.ParseVersion(revID)