util: refactor PrioritizedTaskExecutor

ethereumjs · Aug 16, 2024 · 5e09a53 · 5e09a53
1 parent c7aa1ff
commit 5e09a53
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 107 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/trie/src/util/index.ts b/packages/trie/src/util/index.ts
@@ -1,4 +1,3 @@
 export * from './encoding.js'
 export * from './genesisState.js'
-export * from './tasks.js'
 export * from './walkController.js'
diff --git a/packages/trie/src/util/walkController.ts b/packages/trie/src/util/walkController.ts
@@ -1,6 +1,6 @@
-import { BranchNode, ExtensionNode, LeafNode } from '../node/index.js'
+import { PrioritizedTaskExecutor } from '@ethereumjs/util'
 
-import { PrioritizedTaskExecutor } from './tasks.js'
+import { BranchNode, ExtensionNode, LeafNode } from '../node/index.js'
 
 import type { Trie } from '../trie.js'
 import type { FoundNodeFunction, Nibbles, TrieNode } from '../types.js'

diff --git a/packages/util/src/index.ts b/packages/util/src/index.ts
@@ -65,4 +65,5 @@ export * from './lock.js'
 export * from './mapDB.js'
 export * from './provider.js'
 export * from './requests.js'
+export * from './tasks.js'
 export * from './verkle.js'
diff --git a/packages/trie/src/util/tasks.ts → packages/util/src/tasks.ts b/packages/trie/src/util/tasks.ts → packages/util/src/tasks.ts
diff --git a/packages/trie/test/util/tasks.spec.ts → packages/util/test/tasks.spec.ts b/packages/trie/test/util/tasks.spec.ts → packages/util/test/tasks.spec.ts
@@ -1,6 +1,6 @@
 import { assert, describe, it } from 'vitest'
 
-import { PrioritizedTaskExecutor } from '../../src/index.js'
+import { PrioritizedTaskExecutor } from '../src/index.js'
 
 const taskExecutor = new PrioritizedTaskExecutor(2)
 

diff --git a/packages/verkle/src/util/index.ts b/packages/verkle/src/util/index.ts
diff --git a/packages/verkle/src/util/tasks.ts b/packages/verkle/src/util/tasks.ts
diff --git a/packages/verkle/src/verkleTree.ts b/packages/verkle/src/verkleTree.ts
@@ -6,6 +6,7 @@ import {
   bytesToHex,
   equalsBytes,
   intToHex,
+  matchingBytesLength,
   zeros,
 } from '@ethereumjs/util'
 import debug from 'debug'
@@ -22,7 +23,6 @@ import {
   type VerkleTreeOpts,
   type VerkleTreeOptsWithDefaults,
 } from './types.js'
-import { matchingBytesLength } from './util/index.js'
 
 import type { DB, PutBatch, VerkleCrypto } from '@ethereumjs/util'
 import type { Debugger } from 'debug'

diff --git a/packages/verkle/test/verkle.spec.ts b/packages/verkle/test/verkle.spec.ts
@@ -1,4 +1,4 @@
-import { MapDB, equalsBytes, hexToBytes } from '@ethereumjs/util'
+import { MapDB, equalsBytes, hexToBytes, matchingBytesLength } from '@ethereumjs/util'
 import { loadVerkleCrypto } from 'verkle-cryptography-wasm'
 import { assert, beforeAll, describe, it } from 'vitest'
 
@@ -8,7 +8,6 @@ import {
   VerkleLeafNodeValue,
   VerkleNodeType,
   decodeNode,
-  matchingBytesLength,
 } from '../src/index.js'
 import { VerkleTree } from '../src/verkleTree.js'