Network test fix: assert on number of completed rollback TXs (#947)

* Assert on number of rollbacks instead of number of active rollback TXs


Co-authored-by: Rein Krul <[email protected]>

network/dag/bbolt_tree.go

@@ -50,6 +50,7 @@ type bboltTree struct {
 	bucketName             string
 	tree                   tree.Tree
 	activeRollbackRoutines *uint32
+	numRollbacks           *uint32
 }
 
 // newBBoltTreeStore returns an instance of a BBolt based tree store. Buckets managed by this store are filled to treeBucketFillPercent
@@ -60,6 +61,7 @@ func newBBoltTreeStore(db *bbolt.DB, bucketName string, tree tree.Tree) *bboltTr
 		bucketName:             bucketName,
 		tree:                   tree,
 		activeRollbackRoutines: new(uint32),
+		numRollbacks:           new(uint32),
 	}
 }
 
@@ -98,6 +100,7 @@ func (store *bboltTree) dagObserver(ctx context.Context, transaction Transaction
 				if err == context.DeadlineExceeded {
 					log.Logger().Warnf("deadline exceeded - rollback transaction %s from %s", transaction.Ref(), store.bucketName)
 					store.tree.Delete(transaction.Ref(), transaction.Clock())
+					atomic.AddUint32(store.numRollbacks, 1)
 				}
 			}()
 			tx.OnCommit(func() {

network/dag/bbolt_tree_test.go

@@ -139,11 +139,12 @@ func TestBboltTree_dagObserver(t *testing.T) {
 			observerRollbackTimeOut = defaultObserverRollbackTimeOut
 		}()
 
+		assert.Equal(t, uint32(0), atomic.LoadUint32(store.numRollbacks))
 		store.dagObserver(ctx, tx, nil)
 		assert.Equal(t, tx.Ref(), store.getRoot().(*tree.Xor).Hash())
 
 		test.WaitFor(t, func() (bool, error) {
-			return atomic.LoadUint32(store.activeRollbackRoutines) == 0, nil
+			return atomic.LoadUint32(store.numRollbacks) == 1, nil
 		}, 5*time.Second, "timeout while waiting for go routine to exit")
 		assert.Equal(t, hash.EmptyHash(), store.getRoot().(*tree.Xor).Hash())
 

network/transport/grpc/outbound_connector_test.go

@@ -68,8 +68,10 @@ func Test_connector_start(t *testing.T) {
 
 		<-connected // wait for connected
 
-		resetCounts, _ := bo.counts()
-		assert.Equal(t, 1, resetCounts)
+		test.WaitFor(t, func() (bool, error) {
+			resetCounts, _ := bo.counts()
+			return resetCounts == 1, nil
+		}, 5 * time.Second, "waiting for backoff.Reset() to be called")
 	})
 	t.Run("not connecting when already connected", func(t *testing.T) {
 		calls := make(chan struct{}, 10)