@@ -105,7 +105,7 @@ func FuzzDurationTimeoutZeroMaxChannelDuration(f *testing.F) {
105105 f .Fuzz (func (t * testing.T , l1BlockNum uint64 ) {
106106 channelConfig := defaultTestChannelConfig ()
107107 channelConfig .MaxChannelDuration = 0
108- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
108+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
109109 require .NoError (t , err )
110110 cb .timeout = 0
111111 cb .updateDurationTimeout (l1BlockNum )
@@ -128,7 +128,7 @@ func FuzzChannelBuilder_DurationZero(f *testing.F) {
128128 // Create the channel builder
129129 channelConfig := defaultTestChannelConfig ()
130130 channelConfig .MaxChannelDuration = maxChannelDuration
131- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
131+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
132132 require .NoError (t , err )
133133
134134 // Whenever the timeout is set to 0, the channel builder should have a duration timeout
@@ -155,7 +155,7 @@ func FuzzDurationTimeoutMaxChannelDuration(f *testing.F) {
155155 // Create the channel builder
156156 channelConfig := defaultTestChannelConfig ()
157157 channelConfig .MaxChannelDuration = maxChannelDuration
158- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
158+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
159159 require .NoError (t , err )
160160
161161 // Whenever the timeout is greater than the l1BlockNum,
@@ -189,7 +189,7 @@ func FuzzChannelCloseTimeout(f *testing.F) {
189189 channelConfig := defaultTestChannelConfig ()
190190 channelConfig .ChannelTimeout = channelTimeout
191191 channelConfig .SubSafetyMargin = subSafetyMargin
192- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
192+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
193193 require .NoError (t , err )
194194
195195 // Check the timeout
@@ -217,7 +217,7 @@ func FuzzChannelZeroCloseTimeout(f *testing.F) {
217217 channelConfig := defaultTestChannelConfig ()
218218 channelConfig .ChannelTimeout = channelTimeout
219219 channelConfig .SubSafetyMargin = subSafetyMargin
220- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
220+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
221221 require .NoError (t , err )
222222
223223 // Check the timeout
@@ -244,7 +244,7 @@ func FuzzSeqWindowClose(f *testing.F) {
244244 channelConfig := defaultTestChannelConfig ()
245245 channelConfig .SeqWindowSize = seqWindowSize
246246 channelConfig .SubSafetyMargin = subSafetyMargin
247- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
247+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
248248 require .NoError (t , err )
249249
250250 // Check the timeout
@@ -272,7 +272,7 @@ func FuzzSeqWindowZeroTimeoutClose(f *testing.F) {
272272 channelConfig := defaultTestChannelConfig ()
273273 channelConfig .SeqWindowSize = seqWindowSize
274274 channelConfig .SubSafetyMargin = subSafetyMargin
275- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
275+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
276276 require .NoError (t , err )
277277
278278 // Check the timeout
@@ -318,7 +318,7 @@ func TestChannelBuilder_NextFrame(t *testing.T) {
318318 channelConfig := defaultTestChannelConfig ()
319319
320320 // Create a new channel builder
321- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
321+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
322322 require .NoError (t , err )
323323
324324 // Mock the internals of `ChannelBuilder.outputFrame`
@@ -359,7 +359,7 @@ func ChannelBuilder_OutputWrongFramePanic(t *testing.T, batchType uint) {
359359 channelConfig .BatchType = batchType
360360
361361 // Construct a channel builder
362- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
362+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
363363 require .NoError (t , err )
364364
365365 // Mock the internals of `ChannelBuilder.outputFrame`
@@ -395,7 +395,7 @@ func TestChannelBuilder_OutputFrames(t *testing.T) {
395395 channelConfig .InitNoneCompressor ()
396396
397397 // Construct the channel builder
398- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
398+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
399399 require .NoError (t , err )
400400 require .False (t , cb .IsFull ())
401401 require .Equal (t , 0 , cb .PendingFrames ())
@@ -453,7 +453,7 @@ func ChannelBuilder_OutputFrames_SpanBatch(t *testing.T, algo derive.Compression
453453 channelConfig .InitRatioCompressor (1 , algo )
454454
455455 // Construct the channel builder
456- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
456+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
457457 require .NoError (t , err )
458458 require .False (t , cb .IsFull ())
459459 require .Equal (t , 0 , cb .PendingFrames ())
@@ -510,7 +510,7 @@ func ChannelBuilder_MaxRLPBytesPerChannel(t *testing.T, batchType uint) {
510510 channelConfig .BatchType = batchType
511511
512512 // Construct the channel builder
513- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
513+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
514514 require .NoError (t , err )
515515
516516 // Add a block that overflows the [ChannelOut]
@@ -532,7 +532,7 @@ func ChannelBuilder_OutputFramesMaxFrameIndex(t *testing.T, batchType uint) {
532532 // Continuously add blocks until the max frame index is reached
533533 // This should cause the [ChannelBuilder.OutputFrames] function
534534 // to error
535- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
535+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
536536 require .NoError (t , err )
537537 require .False (t , cb .IsFull ())
538538 require .Equal (t , 0 , cb .PendingFrames ())
@@ -568,7 +568,7 @@ func TestChannelBuilder_FullShadowCompressor(t *testing.T) {
568568 }
569569
570570 cfg .InitShadowCompressor (derive .Zlib )
571- cb , err := NewChannelBuilder (cfg , defaultTestRollupConfig , latestL1BlockOrigin )
571+ cb , err := NewChannelBuilder (cfg , defaultTestRollupConfig , nil , latestL1BlockOrigin )
572572 require .NoError (err )
573573
574574 rng := rand .New (rand .NewSource (420 ))
@@ -600,7 +600,7 @@ func ChannelBuilder_AddBlock(t *testing.T, batchType uint) {
600600 channelConfig .InitRatioCompressor (1 , derive .Zlib )
601601
602602 // Construct the channel builder
603- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
603+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
604604 require .NoError (t , err )
605605
606606 // Add a nonsense block to the channel builder
@@ -626,7 +626,7 @@ func TestChannelBuilder_CheckTimeout(t *testing.T) {
626626 channelConfig := defaultTestChannelConfig ()
627627
628628 // Construct the channel builder
629- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
629+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
630630 require .NoError (t , err )
631631
632632 // Assert timeout is setup correctly
@@ -651,7 +651,7 @@ func TestChannelBuilder_CheckTimeoutZeroMaxChannelDuration(t *testing.T) {
651651 channelConfig .MaxChannelDuration = 0
652652
653653 // Construct the channel builder
654- cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , latestL1BlockOrigin )
654+ cb , err := NewChannelBuilder (channelConfig , defaultTestRollupConfig , nil , latestL1BlockOrigin )
655655 require .NoError (t , err )
656656
657657 // Without a max channel duration, timeout should not be set
@@ -674,7 +674,7 @@ func TestChannelBuilder_FramePublished(t *testing.T) {
674674 cfg .SubSafetyMargin = 100
675675
676676 // Construct the channel builder
677- cb , err := NewChannelBuilder (cfg , defaultTestRollupConfig , latestL1BlockOrigin )
677+ cb , err := NewChannelBuilder (cfg , defaultTestRollupConfig , nil , latestL1BlockOrigin )
678678 require .NoError (t , err )
679679 require .Equal (t , latestL1BlockOrigin + cfg .MaxChannelDuration , cb .timeout )
680680
@@ -691,7 +691,7 @@ func TestChannelBuilder_FramePublished(t *testing.T) {
691691}
692692
693693func TestChannelBuilder_LatestL1Origin (t * testing.T ) {
694- cb , err := NewChannelBuilder (defaultTestChannelConfig (), defaultTestRollupConfig , latestL1BlockOrigin )
694+ cb , err := NewChannelBuilder (defaultTestChannelConfig (), defaultTestRollupConfig , nil , latestL1BlockOrigin )
695695 require .NoError (t , err )
696696 require .Equal (t , eth.BlockID {}, cb .LatestL1Origin ())
697697
@@ -721,7 +721,7 @@ func ChannelBuilder_PendingFrames_TotalFrames(t *testing.T, batchType uint) {
721721 cfg .TargetNumFrames = tnf
722722 cfg .BatchType = batchType
723723 cfg .InitShadowCompressor (derive .Zlib )
724- cb , err := NewChannelBuilder (cfg , defaultTestRollupConfig , latestL1BlockOrigin )
724+ cb , err := NewChannelBuilder (cfg , defaultTestRollupConfig , nil , latestL1BlockOrigin )
725725 require .NoError (err )
726726
727727 // initial builder should be empty
@@ -766,7 +766,7 @@ func ChannelBuilder_InputBytes(t *testing.T, batchType uint) {
766766 chainId := big .NewInt (1234 )
767767 spanBatch = derive .NewSpanBatch (uint64 (0 ), chainId )
768768 }
769- cb , err := NewChannelBuilder (cfg , defaultTestRollupConfig , latestL1BlockOrigin )
769+ cb , err := NewChannelBuilder (cfg , defaultTestRollupConfig , nil , latestL1BlockOrigin )
770770 require .NoError (err )
771771
772772 require .Zero (cb .InputBytes ())
@@ -803,7 +803,7 @@ func ChannelBuilder_OutputBytes(t *testing.T, batchType uint) {
803803 cfg .TargetNumFrames = 16
804804 cfg .BatchType = batchType
805805 cfg .InitRatioCompressor (1.0 , derive .Zlib )
806- cb , err := NewChannelBuilder (cfg , defaultTestRollupConfig , latestL1BlockOrigin )
806+ cb , err := NewChannelBuilder (cfg , defaultTestRollupConfig , nil , latestL1BlockOrigin )
807807 require .NoError (err , "NewChannelBuilder" )
808808
809809 require .Zero (cb .OutputBytes ())
0 commit comments