Merge branch 'zkevm' into zkevm

cffls · Jun 19, 2024 · 68cb3b5 · 68cb3b5
2 parents 0993187 + 2d2712a
commit 68cb3b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/ci_zkevm.yml b/.github/workflows/ci_zkevm.yml
@@ -22,6 +22,7 @@ jobs:
       matrix:
         os: [ ubuntu-20.04, macos-14 ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
+    timeout-minutes: ${{ matrix.os == 'macos-14' && 40 || 30 }}
 
     steps:
       - uses: actions/checkout@v3

diff --git a/Makefile b/Makefile
@@ -149,10 +149,10 @@ db-tools:
 
 ## test:                              run unit tests with a 100s timeout
 test:
-	$(GOTEST) --timeout 100s
+	$(GOTEST) --timeout 200s
 
 test3:
-	$(GOTEST) --timeout 100s -tags $(BUILD_TAGS),erigon3
+	$(GOTEST) --timeout 200s -tags $(BUILD_TAGS),erigon3
 
 ## test-integration:                  run integration tests with a 30m timeout
 test-integration:

diff --git a/zk/txpool/policy_test.go b/zk/txpool/policy_test.go
@@ -21,11 +21,7 @@ func newTestACLDB(tb testing.TB, dir string) kv.RwDB {
 	tb.Helper()
 
 	if dir == "" {
-		dir = fmt.Sprintf("/tmp/acl-db-temp_%v", time.Now().UTC().Format(time.RFC3339Nano))
-
-		if err := os.Mkdir(dir, 0775); err != nil {
-			tb.Fatal(err)
-		}
+		dir = tb.TempDir()
 	}
 
 	state, err := OpenACLDB(context.Background(), dir)