op-program: delete redundant code (#11263)

* delete redundant code

* delete

op-program/client/program.go

@@ -16,7 +16,6 @@ import (
 	cldr "github.com/ethereum-optimism/optimism/op-program/client/driver"
 	"github.com/ethereum-optimism/optimism/op-program/client/l1"
 	"github.com/ethereum-optimism/optimism/op-program/client/l2"
-	oppio "github.com/ethereum-optimism/optimism/op-program/io"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
@@ -78,15 +77,15 @@ func runDerivation(logger log.Logger, cfg *rollup.Config, l2Cfg *params.ChainCon
 	return claim.ValidateClaim(logger, l2ClaimBlockNum, eth.Bytes32(l2Claim), l2Source)
 }
 
-func CreateHinterChannel() oppio.FileChannel {
+func CreateHinterChannel() preimage.FileChannel {
 	r := os.NewFile(HClientRFd, "preimage-hint-read")
 	w := os.NewFile(HClientWFd, "preimage-hint-write")
-	return oppio.NewReadWritePair(r, w)
+	return preimage.NewReadWritePair(r, w)
 }
 
 // CreatePreimageChannel returns a FileChannel for the preimage oracle in a detached context
-func CreatePreimageChannel() oppio.FileChannel {
+func CreatePreimageChannel() preimage.FileChannel {
 	r := os.NewFile(PClientRFd, "preimage-oracle-read")
 	w := os.NewFile(PClientWFd, "preimage-oracle-write")
-	return oppio.NewReadWritePair(r, w)
+	return preimage.NewReadWritePair(r, w)
 }

op-program/host/host.go

@@ -16,7 +16,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-program/host/flags"
 	"github.com/ethereum-optimism/optimism/op-program/host/kvstore"
 	"github.com/ethereum-optimism/optimism/op-program/host/prefetcher"
-	oppio "github.com/ethereum-optimism/optimism/op-program/io"
 	opservice "github.com/ethereum-optimism/optimism/op-service"
 	"github.com/ethereum-optimism/optimism/op-service/client"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
@@ -54,8 +53,8 @@ func Main(logger log.Logger, cfg *config.Config) error {
 func FaultProofProgram(ctx context.Context, logger log.Logger, cfg *config.Config) error {
 	var (
 		serverErr chan error
-		pClientRW oppio.FileChannel
-		hClientRW oppio.FileChannel
+		pClientRW preimage.FileChannel
+		hClientRW preimage.FileChannel
 	)
 	defer func() {
 		if pClientRW != nil {
@@ -73,13 +72,13 @@ func FaultProofProgram(ctx context.Context, logger log.Logger, cfg *config.Confi
 		}
 	}()
 	// Setup client I/O for preimage oracle interaction
-	pClientRW, pHostRW, err := oppio.CreateBidirectionalChannel()
+	pClientRW, pHostRW, err := preimage.CreateBidirectionalChannel()
 	if err != nil {
 		return fmt.Errorf("failed to create preimage pipe: %w", err)
 	}
 
 	// Setup client I/O for hint comms
-	hClientRW, hHostRW, err := oppio.CreateBidirectionalChannel()
+	hClientRW, hHostRW, err := preimage.CreateBidirectionalChannel()
 	if err != nil {
 		return fmt.Errorf("failed to create hints pipe: %w", err)
 	}
@@ -120,7 +119,7 @@ func FaultProofProgram(ctx context.Context, logger log.Logger, cfg *config.Confi
 // This method will block until both the hinter and preimage handlers complete.
 // If either returns an error both handlers are stopped.
 // The supplied preimageChannel and hintChannel will be closed before this function returns.
-func PreimageServer(ctx context.Context, logger log.Logger, cfg *config.Config, preimageChannel oppio.FileChannel, hintChannel oppio.FileChannel) error {
+func PreimageServer(ctx context.Context, logger log.Logger, cfg *config.Config, preimageChannel preimage.FileChannel, hintChannel preimage.FileChannel) error {
 	var serverDone chan error
 	var hinterDone chan error
 	defer func() {

op-program/host/host_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-program/client/l1"
 	"github.com/ethereum-optimism/optimism/op-program/host/config"
 	"github.com/ethereum-optimism/optimism/op-program/host/kvstore"
-	"github.com/ethereum-optimism/optimism/op-program/io"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
@@ -29,10 +28,10 @@ func TestServerMode(t *testing.T) {
 	cfg.DataDir = dir
 	cfg.ServerMode = true
 
-	preimageServer, preimageClient, err := io.CreateBidirectionalChannel()
+	preimageServer, preimageClient, err := preimage.CreateBidirectionalChannel()
 	require.NoError(t, err)
 	defer preimageClient.Close()
-	hintServer, hintClient, err := io.CreateBidirectionalChannel()
+	hintServer, hintClient, err := preimage.CreateBidirectionalChannel()
 	require.NoError(t, err)
 	defer hintClient.Close()
 	logger := testlog.Logger(t, log.LevelTrace)

op-program/io/filechan.go

-package io
-
-import (
-	"errors"
-	"io"
-	"os"
-)
-
-// FileChannel is a unidirectional channel for file I/O
-type FileChannel interface {
-	io.ReadWriteCloser
-	// Reader returns the file that is used for reading.
-	Reader() *os.File
-	// Writer returns the file that is used for writing.
-	Writer() *os.File
-}
-
-type ReadWritePair struct {
-	r *os.File
-	w *os.File
-}
-
-// NewReadWritePair creates a new FileChannel that uses the given files
-func NewReadWritePair(r *os.File, w *os.File) *ReadWritePair {
-	return &ReadWritePair{r: r, w: w}
-}
-
-func (rw *ReadWritePair) Read(p []byte) (int, error) {
-	return rw.r.Read(p)
-}
-
-func (rw *ReadWritePair) Write(p []byte) (int, error) {
-	return rw.w.Write(p)
-}
-
-func (rw *ReadWritePair) Reader() *os.File {
-	return rw.r
-}
-
-func (rw *ReadWritePair) Writer() *os.File {
-	return rw.w
-}
-
-func (rw *ReadWritePair) Close() error {
-	return errors.Join(rw.r.Close(), rw.w.Close())
-}
-
-// CreateBidirectionalChannel creates a pair of FileChannels that are connected to each other.
-func CreateBidirectionalChannel() (FileChannel, FileChannel, error) {
-	ar, bw, err := os.Pipe()
-	if err != nil {
-		return nil, nil, err
-	}
-	br, aw, err := os.Pipe()
-	if err != nil {
-		return nil, nil, err
-	}
-	return NewReadWritePair(ar, aw), NewReadWritePair(br, bw), nil
-}