Skip to content

Commit

Permalink
Merge branch 'master' into stylus_bench_improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
eljobe authored Jan 20, 2025
2 parents 32d66d9 + 9fe417e commit 0d05845
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arbnode/batch_poster.go
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ func (b *BatchPoster) getTxsInfoByBlock(ctx context.Context, number int64) ([]tx
return blk.Transactions, nil
}

// checkRevert checks blocks with number in range [from, to] whether they
// checkReverts checks blocks with number in range [from, to] whether they
// contain reverted batch_poster transaction.
// It returns true if it finds batch posting needs to halt, which is true if a batch reverts
// unless the data poster is configured with noop storage which can tolerate reverts.
Expand Down
2 changes: 1 addition & 1 deletion arbnode/delay_buffer.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type DelayBufferConfig struct {
Threshold uint64
}

// GetBufferConfig gets the delay buffer config from the sequencer inbox contract.
// GetDelayBufferConfig gets the delay buffer config from the sequencer inbox contract.
// If the contract doesn't support the delay buffer, it returns a config with Enabled set to false.
func GetDelayBufferConfig(ctx context.Context, sequencerInbox *bridgegen.SequencerInbox) (
*DelayBufferConfig, error) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/genericconf/logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func (l *fileLoggerFactory) close() error {
return nil
}

// initLog is not threadsafe
// InitLog is not threadsafe
func InitLog(logType string, logLevel string, fileLoggingConfig *FileLoggingConfig, pathResolver func(string) string) error {
var glogger *log.GlogHandler
// always close previous instance of file logger
Expand Down

0 comments on commit 0d05845

Please sign in to comment.