|
|
@ -31,6 +31,15 @@ import ( |
|
|
|
// into the journal, but no such file is currently open.
|
|
|
|
// into the journal, but no such file is currently open.
|
|
|
|
var errNoActiveJournal = errors.New("no active journal") |
|
|
|
var errNoActiveJournal = errors.New("no active journal") |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// devNull is a WriteCloser that just discards anything written into it. Its
|
|
|
|
|
|
|
|
// goal is to allow the transaction journal to write into a fake journal when
|
|
|
|
|
|
|
|
// loading transactions on startup without printing warnings due to no file
|
|
|
|
|
|
|
|
// being readt for write.
|
|
|
|
|
|
|
|
type devNull struct{} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (*devNull) Write(p []byte) (n int, err error) { return len(p), nil } |
|
|
|
|
|
|
|
func (*devNull) Close() error { return nil } |
|
|
|
|
|
|
|
|
|
|
|
// txJournal is a rotating log of transactions with the aim of storing locally
|
|
|
|
// txJournal is a rotating log of transactions with the aim of storing locally
|
|
|
|
// created transactions to allow non-executed ones to survive node restarts.
|
|
|
|
// created transactions to allow non-executed ones to survive node restarts.
|
|
|
|
type txJournal struct { |
|
|
|
type txJournal struct { |
|
|
@ -59,6 +68,10 @@ func (journal *txJournal) load(add func(*types.Transaction) error) error { |
|
|
|
} |
|
|
|
} |
|
|
|
defer input.Close() |
|
|
|
defer input.Close() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Temporarilly discard any journal additions (don't double add on load)
|
|
|
|
|
|
|
|
journal.writer = new(devNull) |
|
|
|
|
|
|
|
defer func() { journal.writer = nil }() |
|
|
|
|
|
|
|
|
|
|
|
// Inject all transactions from the journal into the pool
|
|
|
|
// Inject all transactions from the journal into the pool
|
|
|
|
stream := rlp.NewStream(input, 0) |
|
|
|
stream := rlp.NewStream(input, 0) |
|
|
|
total, dropped := 0, 0 |
|
|
|
total, dropped := 0, 0 |
|
|
|