refactoring

Author: tclemos

cmd/loadtest/gasmanager/gas_provider.go

@@ -42,6 +42,7 @@ func (o *GasProviderBase) watchNewHeaders(ctx context.Context) {
 	if o.onNewHeader == nil {
 		return
 	}
+	const intervalToCheckNewHeader = 1 * time.Second
 	log.Trace().Msg("starting to watch for new block headers")
 	var lastHeader *types.Header
 	for {
@@ -51,12 +52,13 @@ func (o *GasProviderBase) watchNewHeaders(ctx context.Context) {
 			return
 		default:
 			log.Trace().Msg("fetching latest block header")
-			time.Sleep(1 * time.Second)
+			time.Sleep(intervalToCheckNewHeader)
 		}
 
 		header, err := o.client.HeaderByNumber(ctx, nil)
 		if err != nil {
 			log.Warn().Err(err).Msg("failed to fetch latest block header, retrying...")
+			continue
 		}
 
 		// Only trigger when there is a new header

cmd/loadtest/gasmanager/gas_vault.go

@@ -37,18 +37,27 @@ func (o *GasVault) AddGas(gas uint64) {
 
 // SpendOrWaitAvailableBudget attempts to spend the specified amount of gas from the vault's available budget.
 func (o *GasVault) SpendOrWaitAvailableBudget(gas uint64) {
+	const intervalToCheckBudgetAvailability = 100 * time.Millisecond
 	for {
-		o.mu.Lock()
-		if gas <= o.gasBudgetAvailable {
-			o.gasBudgetAvailable -= gas
-			o.mu.Unlock()
+		if spent := o.trySpendBudget(gas); spent {
 			break
 		}
-		o.mu.Unlock()
-		time.Sleep(100 * time.Millisecond)
+		time.Sleep(intervalToCheckBudgetAvailability)
 	}
 }
 
+// trySpendBudget tries to spend the specified amount of gas from the vault's available budget.
+// It returns true if the gas was successfully spent, or false if there was insufficient budget.
+func (o *GasVault) trySpendBudget(gas uint64) bool {
+	o.mu.Lock()
+	defer o.mu.Unlock()
+	if gas <= o.gasBudgetAvailable {
+		o.gasBudgetAvailable -= gas
+		return true
+	}
+	return false
+}
+
 // GetAvailableBudget returns the current available gas budget in the vault.
 func (o *GasVault) GetAvailableBudget() uint64 {
 	o.mu.Lock()

cmd/loadtest/loadtest.go

@@ -1346,8 +1346,9 @@ func loadTestTransaction(ctx context.Context, c *ethclient.Client, tops *bind.Tr
 		to = getRandomAddress()
 	}
 
+	const eoaTransferGasLimit = 21000
 	if tops.GasLimit == 0 {
-		tops.GasLimit = uint64(21000)
+		tops.GasLimit = uint64(eoaTransferGasLimit)
 	}
 
 	amount := ltp.SendAmount