alter comments + remove debugging lines

Author: gregns1

rest/utilities_testing_blip_client.go

@@ -349,9 +349,7 @@ func (btcc *BlipTesterCollectionClient) _resolveConflict(incomingHLV *db.HybridL
 }
 
 func (btcc *BlipTesterCollectionClient) _resolveConflictLWW(incomingHLV *db.HybridLogicalVector, incomingBody []byte, incomingIsDelete bool, latestLocalRev *clientDocRev) (body []byte, hlv db.HybridLogicalVector, isTombstone bool) {
-	fmt.Println("incoming hlv in resolver", incomingHLV)
 	latestLocalHLV := latestLocalRev.HLV
-	fmt.Println("local hlv in resolver", latestLocalHLV)
 	updatedHLV := latestLocalRev.HLV.Copy()
 	localDeleted := latestLocalRev.isDelete
 	if localDeleted && !incomingIsDelete {

topologytest/multi_actor_no_conflict_test.go

@@ -107,9 +107,9 @@ func TestMultiActorResurrect(t *testing.T) {
 
 							resBody := fmt.Appendf(nil, `{"activePeer": "%s", "createPeer": "%s", "deletePeer": "%s", "resurrectPeer": "%s", "topology": "%s", "action": "resurrect"}`, resurrectPeerName, createPeerName, deletePeer, resurrectPeer, topology.specDescription)
 							resurrectVersion := resurrectPeer.WriteDocument(collectionName, docID, resBody)
-							// in the case of a Couchbase Server resurrection, the hlv is lost since all system xattrs are lost on a resurrection
-							// if cbs resurrect, if delete AND resurrecting peer is server side peer (cbs or sgw) the all docs will converge for version expected
-							// if cbs resurrect and delete AND resurrecting peer is NOT server side peer (lite), then need to wait for tombstone convergence first
+							// in the case of a Couchbase Server resurrection, the hlv is lost since all system xattrs are
+							// lost on a resurrection so the resurrecting version may conflict with a version on cbl
+							// peer then cbl will resolve in favour if its own tombstone.
 							if resurrectPeer.Type() == PeerTypeCouchbaseServer {
 								if strings.Contains(topologySpec.description, "CBL") {
 									if conflictNotExpectedOnCBL(deletePeer, resurrectPeer, deletePeerName, resurrectPeerName) {

topologytest/peer_test.go

@@ -127,11 +127,6 @@ func (p Peers) SortedPeers() iter.Seq2[string, Peer] {
 	}
 }
 
-func (p Peers) PeerList() []string {
-	peerNames := slices.Collect(maps.Keys(p))
-	return peerNames
-}
-
 // peerIsServerSide returns true if the peer is a Couchbase Server or Sync Gateway peer.
 func peerIsServerSide(p Peer) bool {
 	if p.Type() == PeerTypeCouchbaseServer || p.Type() == PeerTypeSyncGateway {
@@ -149,12 +144,10 @@ func conflictNotExpectedOnCBL(deletePeer Peer, resurrectPeer Peer, delPeerName s
 	}
 	if peerIsServerSide(deletePeer) && peerIsServerSide(resurrectPeer) {
 		if strings.Contains(delPeerName, "1") && strings.Contains(resPeerName, "2") {
-			fmt.Println("conflict expected due to different backing bucket")
 			// conflict expected due to different backing bucket (sourceID)
 			return false
 		}
 		if strings.Contains(delPeerName, "2") && strings.Contains(resPeerName, "1") {
-			fmt.Println("conflict expected due to different backing bucket")
 			// conflict expected due to different backing bucket (sourceID)
 			return false
 		}
@@ -283,10 +276,6 @@ func (to Topology) SortedPeers() iter.Seq2[string, Peer] {
 	return to.peers.SortedPeers()
 }
 
-func (to Topology) PeersInTopology() []string {
-	return to.peers.PeerList()
-}
-
 // CompareRevTreeOnly is true for a given topology when comparing only revtree is correct.
 func (to Topology) CompareRevTreeOnly() bool {
 	for _, peer := range to.peers.ActivePeers() {