fix post-rebase

Author: bbrks

db/hybrid_logical_vector.go

@@ -273,7 +273,7 @@ func (hlv *HybridLogicalVector) InvalidateMV() {
 		if source == hlv.SourceID {
 			continue
 		}
-		hlv.setPreviousVersion(source, value)
+		hlv.SetPreviousVersion(source, value)
 	}
 	hlv.MergeVersions = nil
 }

topologytest/hlv_test.go

@@ -69,7 +69,7 @@ func waitForTombstoneVersion(t *testing.T, dsName base.ScopeAndCollectionName, p
 }
 
 // waitForConvergingVersion waits for the same document version to reach all peers.
-func waitForConvergingVersion(t *testing.T, dsName base.ScopeAndCollectionName, peers Peers, docID string) {
+func waitForConvergingVersion(t *testing.T, dsName base.ScopeAndCollectionName, peers Peers, replications Replications, docID string) {
 	t.Logf("waiting for converged doc versions across all peers")
 	if !assert.EventuallyWithT(t, func(c *assert.CollectT) {
 		for peerAid, peerA := range peers.SortedPeers() {
@@ -86,7 +86,7 @@ func waitForConvergingVersion(t *testing.T, dsName base.ScopeAndCollectionName,
 		}
 	}, totalWaitTime, pollInterval) {
 		// do if !assert->require pattern so we can delay PrintGlobalDocState evaluation
-		require.FailNowf(t, "Peers did not converge on version", "Global state for doc %q on all peers:\n%s", docID, peers.PrintGlobalDocState(t, dsName, docID))
+		require.FailNowf(t, "Peers did not converge on version", "Global state for doc %q on all peers:\n%s\nReplications: %s", docID, peers.PrintGlobalDocState(t, dsName, docID), replications)
 	}
 }
 

topologytest/multi_actor_conflict_test.go

@@ -70,13 +70,6 @@ func TestMultiActorConflictUpdate(t *testing.T) {
 func TestMultiActorConflictDelete(t *testing.T) {
 	for _, topology := range append(simpleTopologies, Topologies...) {
 		t.Run(topology.description, func(t *testing.T) {
-			switch topology.description {
-			case "2x CBL<->SG<->CBS XDCR only 1.3",
-				"CBL<->SG<->CBS1 CBS1<->CBS2 1.2":
-				// FIXME: CBG-4458
-				t.Skip("CBG-4458")
-			}
-
 			collectionName, peers, replications := setupTests(t, topology)
 			replications.Stop()
 
@@ -110,13 +103,6 @@ func TestMultiActorConflictDelete(t *testing.T) {
 func TestMultiActorConflictResurrect(t *testing.T) {
 	for _, topology := range append(simpleTopologies, Topologies...) {
 		t.Run(topology.description, func(t *testing.T) {
-			switch topology.description {
-			case "2x CBL<->SG<->CBS XDCR only 1.3",
-				"CBL<->SG<->CBS1 CBS1<->CBS2 1.2":
-				// FIXME: CBG-4458
-				t.Skip("CBG-4458")
-			}
-
 			collectionName, peers, replications := setupTests(t, topology)
 			replications.Stop()