Remove cache expiry test and hooks, didn't work

OffchainLabs · May 29, 2024 · a23b629 · a23b629
1 parent 45f9ad7
commit a23b629
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/das/dasRpcServer.go b/das/dasRpcServer.go
@@ -159,12 +159,12 @@ type batch struct {
 }
 
 const (
-	maxPendingBatches = 10
+	maxPendingBatches   = 10
+	batchBuildingExpiry = 1 * time.Minute
 )
 
-// exposed globals for test control
+// exposed global for test control
 var (
-	batchBuildingExpiry   = 1 * time.Minute
 	legacyDASStoreAPIOnly = false
 )
 

diff --git a/das/rpc_test.go b/das/rpc_test.go
@@ -30,7 +30,7 @@ func blsPubToBase64(pubkey *blsSignatures.PublicKey) string {
 
 type sleepOnIterationFn func(i int)
 
-func testRpcImpl(t *testing.T, size, times int, concurrent bool, sleepOnIteration sleepOnIterationFn) {
+func testRpcImpl(t *testing.T, size, times int, concurrent bool) {
 	// enableLogging()
 
 	ctx := context.Background()
@@ -125,7 +125,6 @@ func testRpcImpl(t *testing.T, size, times int, concurrent bool, sleepOnIteratio
 		} else {
 			runStore()
 		}
-		sleepOnIteration(i)
 	}
 
 	wg.Wait()
@@ -134,29 +133,21 @@ func testRpcImpl(t *testing.T, size, times int, concurrent bool, sleepOnIteratio
 const chunkSize = 512 * 1024
 
 func TestRPCStore(t *testing.T) {
-	dontSleep := func(_ int) {}
-
 	for _, tc := range []struct {
 		desc             string
 		totalSize, times int
 		concurrent       bool
-		sleepOnIteration sleepOnIterationFn
 		leagcyAPIOnly    bool
 	}{
-		{desc: "small store", totalSize: 100, times: 1, concurrent: false, sleepOnIteration: dontSleep},
-		{desc: "chunked store - last chunk full", totalSize: chunkSize * 20, times: 10, concurrent: true, sleepOnIteration: dontSleep},
-		{desc: "chunked store - last chunk not full", totalSize: chunkSize*31 + 123, times: 10, concurrent: true, sleepOnIteration: dontSleep},
-		{desc: "chunked store - overflow cache - sequential", totalSize: chunkSize * 3, times: 15, concurrent: false, sleepOnIteration: dontSleep},
-		{desc: "chunked store - wait for cache clear", totalSize: chunkSize * 3, times: 15, concurrent: true, sleepOnIteration: func(i int) {
-			if i == 9 {
-				time.Sleep(time.Second * 6)
-			}
-		}},
-		{desc: "new client falls back to old api for old server", totalSize: (5*1024*1024)/2 - len(sendChunkJSONBoilerplate) - 100 /* geth counts headers too */, times: 5, concurrent: true, sleepOnIteration: dontSleep, leagcyAPIOnly: true},
+		{desc: "small store", totalSize: 100, times: 1, concurrent: false},
+		{desc: "chunked store - last chunk full", totalSize: chunkSize * 20, times: 10, concurrent: true},
+		{desc: "chunked store - last chunk not full", totalSize: chunkSize*31 + 123, times: 10, concurrent: true},
+		{desc: "chunked store - overflow cache - sequential", totalSize: chunkSize * 3, times: 15, concurrent: false},
+		{desc: "new client falls back to old api for old server", totalSize: (5*1024*1024)/2 - len(sendChunkJSONBoilerplate) - 100 /* geth counts headers too */, times: 5, concurrent: true, leagcyAPIOnly: true},
 	} {
 		t.Run(tc.desc, func(t *testing.T) {
 			legacyDASStoreAPIOnly = tc.leagcyAPIOnly
-			testRpcImpl(t, tc.totalSize, tc.times, tc.concurrent, tc.sleepOnIteration)
+			testRpcImpl(t, tc.totalSize, tc.times, tc.concurrent)
 		})
 	}
 }