Merge pull request #1705 from lightninglabs/itest-fixes

itest: fix flakes

Author: GeorgeTsagk

authmailbox/receive_subscription.go

@@ -106,6 +106,15 @@ func (s *receiveSubscription) connectAndAuthenticate(ctx context.Context,
 
 	err := s.connectServerStream(ctx, initialBackoff, reconnectRetries)
 	if err != nil {
+		if errors.Is(err, ErrClientShutdown) {
+			log.DebugS(ctx, "Client is shutting down, not "+
+				"connecting to server stream")
+
+			// Allow the main server to identify this as the request
+			// being canceled by the client. Which will cause the
+			// error not to be treated as a fatal error.
+			return context.Canceled
+		}
 		return fmt.Errorf("connecting server stream failed: %w", err)
 	}
 

itest/supply_commit_test.go

@@ -155,7 +155,7 @@ func testSupplyCommitIgnoreAsset(t *harnessTest) {
 
 	t.Log("Minting asset group with a single normal asset and " +
 		"universe/supply commitments enabled")
-	mintReq := issuableAssets[0]
+	mintReq := CopyRequest(issuableAssets[0])
 	mintReq.Asset.EnableSupplyCommitments = true
 	rpcAssets := MintAssetsConfirmBatch(
 		t.t, t.lndHarness.Miner().Client, t.tapd,

proof/archive.go

@@ -879,21 +879,54 @@ func (m *MultiArchiver) FetchIssuanceProof(ctx context.Context,
 // intended to be a performance optimized lookup compared to fetching a proof
 // and checking for ErrProofNotFound. The multi archiver only considers a proof
 // to be present if all backends have it.
-func (m *MultiArchiver) HasProof(ctx context.Context, id Locator) (bool, error) {
+func (m *MultiArchiver) HasProof(ctx context.Context,
+	id Locator) (bool, error) {
+
+	var (
+		someHaveProof = false
+		allHaveProof  = true
+	)
 	for _, archive := range m.backends {
 		ok, err := archive.HasProof(ctx, id)
 		if err != nil {
 			return false, err
 		}
 
-		// We are expecting all backends to have the proof, otherwise we
-		// consider the proof not to be found.
-		if !ok {
-			return false, nil
-		}
+		someHaveProof = someHaveProof || ok
+		allHaveProof = allHaveProof && ok
+	}
+
+	// If all backends have the proof, then we don't need to do anything
+	// further and can return that result.
+	if allHaveProof {
+		return true, nil
 	}
 
-	return true, nil
+	// If no backends have the proof, then this is just a proof we don't
+	// know about, which is fine too.
+	if !someHaveProof {
+		return false, nil
+	}
+
+	// If only some but not all backends have the proof, it's possible that
+	// the other ones are in the process of importing it right now. So we
+	// re-try a couple of times to see if the proof becomes available
+	// eventually.
+	return fn.RetryFuncN(
+		ctx, fn.DefaultRetryConfig(), func() (bool, error) {
+			allHaveProof = true
+			for _, archive := range m.backends {
+				ok, err := archive.HasProof(ctx, id)
+				if err != nil {
+					return false, err
+				}
+
+				allHaveProof = allHaveProof && ok
+			}
+
+			return allHaveProof, nil
+		},
+	)
 }
 
 // FetchProofs fetches all proofs for assets uniquely identified by the passed