Move `ChannelOutIface` to `op-e2e/actions` package

whoops

op-e2e/actions/garbage_channel_out.go

@@ -50,8 +50,22 @@ type Writer interface {
 	Write([]byte) (int, error)
 }
 
-// Compile-time check for derive.ChannelOutApi interface implementation for the GarbageChannelOut type.
-var _ derive.ChannelOutIface = (*GarbageChannelOut)(nil)
+// ChannelOutIface is the interface implemented by ChannelOut & GarbageChannelOut
+type ChannelOutIface interface {
+	ID() derive.ChannelID
+	Reset() error
+	AddBlock(block *types.Block) error
+	ReadyBytes() int
+	Flush() error
+	Close() error
+	OutputFrame(w *bytes.Buffer, maxSize uint64) error
+}
+
+// Compile-time check for ChannelOutIface interface implementation for the ChannelOut type.
+var _ ChannelOutIface = (*derive.ChannelOut)(nil)
+
+// Compile-time check for ChannelOutIface interface implementation for the GarbageChannelOut type.
+var _ ChannelOutIface = (*GarbageChannelOut)(nil)
 
 // GarbageChannelOut is a modified `derive.ChannelOut` that can be configured to behave differently
 // than the original

op-e2e/actions/l2_batcher.go

@@ -61,7 +61,7 @@ type L2Batcher struct {
 
 	l1Signer types.Signer
 
-	l2ChannelOut     derive.ChannelOutIface
+	l2ChannelOut     ChannelOutIface
 	l2Submitting     bool // when the channel out is being submitted, and not safe to write to without resetting
 	l2BufferedBlock  eth.BlockID
 	l2SubmittedBlock eth.BlockID
@@ -125,7 +125,7 @@ func (s *L2Batcher) ActL2BatchBuffer(t Testing) {
 	}
 	// Create channel if we don't have one yet
 	if s.l2ChannelOut == nil {
-		var ch derive.ChannelOutIface
+		var ch ChannelOutIface
 		if s.l2BatcherCfg.GarbageCfg != nil {
 			ch, err = NewGarbageChannelOut(s.l2BatcherCfg.GarbageCfg)
 		} else {

op-node/rollup/derive/channel_out.go

@@ -17,20 +17,6 @@ import (
 var ErrNotDepositTx = errors.New("first transaction in block is not a deposit tx")
 var ErrTooManyRLPBytes = errors.New("batch would cause RLP bytes to go over limit")
 
-// ChannelOutIface is the interface implemented by ChannelOut
-type ChannelOutIface interface {
-	ID() ChannelID
-	Reset() error
-	AddBlock(block *types.Block) error
-	ReadyBytes() int
-	Flush() error
-	Close() error
-	OutputFrame(w *bytes.Buffer, maxSize uint64) error
-}
-
-// Compile-time check for ChannelOutApi interface implementation for the ChannelOut type.
-var _ ChannelOutIface = (*ChannelOut)(nil)
-
 type ChannelOut struct {
 	id ChannelID
 	// Frame ID of the next frame to emit. Increment after emitting