Remove TimeoutWrapper

cytonic-network · Aug 23, 2022 · 19d8a35 · 19d8a35
1 parent e387c4b
commit 19d8a35
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 33 deletions.
diff --git a/arbnode/node.go b/arbnode/node.go
@@ -761,9 +761,6 @@ func createNodeImpl(
 			}
 		}
 
-		if daWriter != nil {
-			daWriter = das.NewWriterTimeoutWrapper(daWriter, config.DataAvailability.RequestTimeout)
-		}
 		daReader = das.NewReaderTimeoutWrapper(daReader, config.DataAvailability.RequestTimeout)
 
 		if config.DataAvailability.PanicOnError {

diff --git a/das/aggregator_test.go b/das/aggregator_test.go
@@ -202,9 +202,14 @@ func testConfigurableStorageFailures(t *testing.T, shouldFailAggregation bool) {
 		backends = append(backends, *details)
 	}
 
-	unwrappedAggregator, err := NewAggregator(ctx, DataAvailabilityConfig{AggregatorConfig: AggregatorConfig{AssumedHonest: assumedHonest}, L1NodeURL: "none"}, backends)
+	aggregator, err := NewAggregator(
+		ctx,
+		DataAvailabilityConfig{
+			AggregatorConfig: AggregatorConfig{AssumedHonest: assumedHonest},
+			L1NodeURL:        "none",
+			RequestTimeout:   time.Millisecond * 2000,
+		}, backends)
 	Require(t, err)
-	aggregator := WriterTimeoutWrapper{time.Millisecond * 2000, unwrappedAggregator}
 
 	rawMsg := []byte("It's time for you to see the fnords.")
 	cert, err := aggregator.Store(ctx, rawMsg, 0, []byte{})

diff --git a/das/timeout_wrapper.go b/das/timeout_wrapper.go
@@ -9,21 +9,15 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/offchainlabs/nitro/arbstate"
 )
 
 type ReaderTimeoutWrapper struct {
 	t time.Duration
 	DataAvailabilityServiceReader
 }
-type WriterTimeoutWrapper struct {
-	t time.Duration
-	DataAvailabilityServiceWriter
-}
 
 type TimeoutWrapper struct {
 	ReaderTimeoutWrapper
-	WriterTimeoutWrapper
 }
 
 func NewReaderTimeoutWrapper(dataAvailabilityServiceReader DataAvailabilityServiceReader, t time.Duration) DataAvailabilityServiceReader {
@@ -32,12 +26,6 @@ func NewReaderTimeoutWrapper(dataAvailabilityServiceReader DataAvailabilityServi
 		DataAvailabilityServiceReader: dataAvailabilityServiceReader,
 	}
 }
-func NewWriterTimeoutWrapper(dataAvailabilityServiceWriter DataAvailabilityServiceWriter, t time.Duration) DataAvailabilityServiceWriter {
-	return &WriterTimeoutWrapper{
-		t:                             t,
-		DataAvailabilityServiceWriter: dataAvailabilityServiceWriter,
-	}
-}
 
 func (w *ReaderTimeoutWrapper) GetByHash(ctx context.Context, hash common.Hash) ([]byte, error) {
 	deadlineCtx, cancel := context.WithDeadline(ctx, time.Now().Add(w.t))
@@ -47,22 +35,6 @@ func (w *ReaderTimeoutWrapper) GetByHash(ctx context.Context, hash common.Hash)
 	return w.DataAvailabilityServiceReader.GetByHash(deadlineCtx, hash)
 }
 
-func (w *WriterTimeoutWrapper) Store(ctx context.Context, message []byte, timeout uint64, sig []byte) (*arbstate.DataAvailabilityCertificate, error) {
-	deadlineCtx, cancel := context.WithDeadline(ctx, time.Now().Add(w.t))
-	// In the case of the aggregator, allow goroutines started by Store(...)
-	// to continue until the end of the deadline even after a result
-	// has been returned.
-	go func() {
-		<-deadlineCtx.Done()
-		cancel()
-	}()
-	return w.DataAvailabilityServiceWriter.Store(deadlineCtx, message, timeout, sig)
-}
-
 func (w *ReaderTimeoutWrapper) String() string {
 	return fmt.Sprintf("ReaderTimeoutWrapper{%v}", w.DataAvailabilityServiceReader)
 }
-
-func (w *WriterTimeoutWrapper) String() string {
-	return fmt.Sprintf("WriterTimeoutWrapper{%v}", w.DataAvailabilityServiceWriter)
-}