per issue not per block

Author: samliok

testutil/random_network/config.go

@@ -13,9 +13,12 @@ type FuzzConfig struct {
 	// The probability that a transaction verification will fail. Default is .1%.
 	TxVerificationFailure float64
 
-	// The minimum and maximum number of transactions per block. Default is between 5 and 20.
-	MinTxsPerBlock int
-	MaxTxsPerBlock int
+	// The minimum and maximum number of transactions to be issued at a block. Default is between 5 and 20.
+	MinTxsPerIssue int
+	MaxTxsPerIssue int
+
+	// Number of transactions per block. Default is 15.
+	TxsPerBlock int
 
 	// The number of blocks that must be finalized before ending the fuzz test. Default is 100.
 	NumFinalizedBlocks int
@@ -42,8 +45,9 @@ func DefaultFuzzConfig() *FuzzConfig {
 		MinNodes:              3,
 		MaxNodes:              10,
 		TxVerificationFailure: .001,
-		MinTxsPerBlock:        5,
-		MaxTxsPerBlock:        20,
+		MinTxsPerIssue:        5,
+		MaxTxsPerIssue:        20,
+		TxsPerBlock:           15,
 		NumFinalizedBlocks:    100,
 		RandomSeed:            time.Now().UnixMilli(),
 		NodeCrashPercentage:   0.1,

testutil/random_network/mempool.go

@@ -197,7 +197,7 @@ func (m *Mempool) BuildBlock(ctx context.Context, md simplex.ProtocolMetadata, b
 	m.WaitForPendingTxs(ctx)
 
 	// Pack the block once we have pending txs
-	txs := m.PackBlock(ctx, m.config.MaxTxsPerBlock)
+	txs := m.PackBlock(ctx, m.config.TxsPerBlock)
 	if ctx.Err() != nil {
 		return nil, false
 	}

testutil/random_network/network.go

@@ -88,7 +88,7 @@ func (n *Network) Run() {
 		n.recoverToHeight(n.getMaxHeight())
 		maxHeight := n.getMaxHeight()
 		minHeight := n.getMinHeight()
-		
+
 		n.logger.Info("Issued Transactions", zap.Int("count", len(txs)), zap.Uint64("min height", minHeight), zap.Uint64("max height", maxHeight))
 		if prevHeight == int(maxHeight) {
 			panic(fmt.Sprintf(
@@ -141,7 +141,6 @@ func (n *Network) recoverToHeight(height uint64) {
 			}
 		}
 
-
 		n.lock.Lock()
 		n.BasicInMemoryNetwork.AdvanceTime(n.config.AdvanceTimeTickAmount)
 		n.lock.Unlock()
@@ -153,7 +152,7 @@ func (n *Network) IssueTxs() []*TX {
 	n.lock.Lock()
 	defer n.lock.Unlock()
 
-	numTxs := n.randomness.Intn(n.config.MaxTxsPerBlock-n.config.MinTxsPerBlock+1) + n.config.MinTxsPerBlock // randomize between min and max inclusive
+	numTxs := n.randomness.Intn(n.config.MaxTxsPerIssue-n.config.MinTxsPerIssue+1) + n.config.MinTxsPerIssue // randomize between min and max inclusive
 	txs := make([]*TX, 0, numTxs)
 
 	for range numTxs {