Skip to content

N
nebula
Commit ce0f43d4 authored by Michael de Hoog's avatar Michael de Hoog
Browse files
Options

Move wait group increment into publishAndWait

parent 96ebda4d
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
op-service/txmgr/txmgr.go
View file @ ce0f43d4
...@@ -295,6 +295,7 @@ func (m *SimpleTxManager) sendTx(ctx context.Context, tx *types.Transaction) (*t ...@@ -295,6 +295,7 @@ func (m *SimpleTxManager) sendTx(ctx context.Context, tx *types.Transaction) (*t
sendState := NewSendState(m.cfg.SafeAbortNonceTooLowCount, m.cfg.TxNotInMempoolTimeout) sendState := NewSendState(m.cfg.SafeAbortNonceTooLowCount, m.cfg.TxNotInMempoolTimeout)
receiptChan := make(chan *types.Receipt, 1) receiptChan := make(chan *types.Receipt, 1)
publishAndWait := func(tx *types.Transaction, bumpFees bool) *types.Transaction { publishAndWait := func(tx *types.Transaction, bumpFees bool) *types.Transaction {
wg.Add(1)
tx, published := m.publishTx(ctx, tx, sendState, bumpFees) tx, published := m.publishTx(ctx, tx, sendState, bumpFees)
if published { if published {
go func() { go func() {
...@@ -308,7 +309,6 @@ func (m *SimpleTxManager) sendTx(ctx context.Context, tx *types.Transaction) (*t ...@@ -308,7 +309,6 @@ func (m *SimpleTxManager) sendTx(ctx context.Context, tx *types.Transaction) (*t
} }
// Immediately publish a transaction before starting the resumbission loop // Immediately publish a transaction before starting the resumbission loop
wg.Add(1)
tx = publishAndWait(tx, false) tx = publishAndWait(tx, false)
ticker := time.NewTicker(m.cfg.ResubmissionTimeout) ticker := time.NewTicker(m.cfg.ResubmissionTimeout)
...@@ -326,7 +326,6 @@ func (m *SimpleTxManager) sendTx(ctx context.Context, tx *types.Transaction) (*t ...@@ -326,7 +326,6 @@ func (m *SimpleTxManager) sendTx(ctx context.Context, tx *types.Transaction) (*t
m.l.Warn("Aborting transaction submission") m.l.Warn("Aborting transaction submission")
return nil, errors.New("aborted transaction sending") return nil, errors.New("aborted transaction sending")
} }
wg.Add(1)
tx = publishAndWait(tx, true) tx = publishAndWait(tx, true)
case <-ctx.Done(): case <-ctx.Done():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment