From 2ed17c3190c23f825a9d38093459118e9842b6c5 Mon Sep 17 00:00:00 2001 From: maskpp Date: Wed, 15 Jan 2025 16:02:27 +0800 Subject: [PATCH 1/4] use customize error --- .../pkg/chain_iterator/block_batch_iterator.go | 10 +++++----- .../pkg/chain_iterator/block_batch_iterator_test.go | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go b/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go index b79debd7a5e..11bb7d2b3a9 100644 --- a/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go +++ b/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go @@ -4,7 +4,6 @@ import ( "context" "errors" "fmt" - "io" "math/big" "time" @@ -23,6 +22,7 @@ const ( ) var ( + errEOF = errors.New("EOF") errContinue = errors.New("continue") ) @@ -143,7 +143,7 @@ func (i *BlockBatchIterator) Iter() error { break } if err := i.iter(); err != nil { - if errors.Is(err, io.EOF) { + if errors.Is(err, errEOF) { log.Debug( "Block batch iterator finished", "start", i.startHeight, @@ -205,7 +205,7 @@ func (i *BlockBatchIterator) iter() (err error) { } if i.current.Number.Uint64() >= destHeight { - return io.EOF + return errEOF } endHeight = i.current.Number.Uint64() + i.blocksReadPerEpoch @@ -226,7 +226,7 @@ func (i *BlockBatchIterator) iter() (err error) { } if i.isEnd { - return io.EOF + return errEOF } i.current = endHeader @@ -235,7 +235,7 @@ func (i *BlockBatchIterator) iter() (err error) { return errContinue } - return io.EOF + return errEOF } // updateCurrent updates the iterator's current cursor. diff --git a/packages/taiko-client/pkg/chain_iterator/block_batch_iterator_test.go b/packages/taiko-client/pkg/chain_iterator/block_batch_iterator_test.go index 429505c4bd1..5886dab291e 100644 --- a/packages/taiko-client/pkg/chain_iterator/block_batch_iterator_test.go +++ b/packages/taiko-client/pkg/chain_iterator/block_batch_iterator_test.go @@ -2,7 +2,6 @@ package chainiterator import ( "context" - "io" "math/big" "testing" "time" @@ -110,7 +109,7 @@ func (s *BlockBatchIteratorTestSuite) TestIterWithLessThanConfirmations() { }) s.Nil(err) - s.Equal(io.EOF, iter.iter()) + s.Equal(errEOF, iter.iter()) s.Equal(headHeight, lastEnd) } From 533eb40d22c8696ab5c7f9a1919854d048a076e7 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 15 Jan 2025 16:22:21 +0800 Subject: [PATCH 2/4] Update packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go --- .../taiko-client/pkg/chain_iterator/block_batch_iterator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go b/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go index 11bb7d2b3a9..b645321f031 100644 --- a/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go +++ b/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go @@ -22,7 +22,7 @@ const ( ) var ( - errEOF = errors.New("EOF") + errEOF = errors.New("End of batch") errContinue = errors.New("continue") ) From 702c873f5edab052744b53aa8dad8273081025b8 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 15 Jan 2025 16:24:54 +0800 Subject: [PATCH 3/4] Update packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go --- .../taiko-client/pkg/chain_iterator/block_batch_iterator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go b/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go index b645321f031..1348aa81b38 100644 --- a/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go +++ b/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go @@ -22,7 +22,7 @@ const ( ) var ( - errEOF = errors.New("End of batch") + errEOF = errors.New("end of batch") errContinue = errors.New("continue") ) From de42e5da3653cc2edfa3d187ca5515e870d51582 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 16 Jan 2025 08:56:36 +0800 Subject: [PATCH 4/4] Update packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go --- .../taiko-client/pkg/chain_iterator/block_batch_iterator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go b/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go index 1348aa81b38..ed2e278c5d9 100644 --- a/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go +++ b/packages/taiko-client/pkg/chain_iterator/block_batch_iterator.go @@ -22,7 +22,7 @@ const ( ) var ( - errEOF = errors.New("end of batch") + errEOF = errors.New("end of blockBatchIterator batch") errContinue = errors.New("continue") )