client: add types.ts into Fetcher dir

Author: jochem-brouwer

packages/client/lib/sync/fetcher/blockfetcher.ts

@@ -1,7 +1,7 @@
 import { Block, BlockBodyBuffer } from '@ethereumjs/block'
 import { Peer } from '../../net/peer'
 import { EthProtocolMethods } from '../../net/protocol'
-import { Job } from '../../types'
+import { Job } from './types'
 import { BlockFetcherBase, JobTask, BlockFetcherOptions } from './blockfetcherbase'
 
 /**

packages/client/lib/sync/fetcher/fetcher.ts

@@ -4,7 +4,8 @@ const Heap = require('qheap')
 import { PeerPool } from '../../net/peerpool'
 import { Config } from '../../config'
 
-import { QHeap, Job } from '../../types'
+import { QHeap } from '../../types'
+import { Job } from './types'
 import { Peer } from '../../net/peer'
 
 export interface FetcherOptions {

packages/client/lib/sync/fetcher/headerfetcher.ts

@@ -2,7 +2,7 @@ import { BlockFetcherBase, BlockFetcherOptions, JobTask } from './blockfetcherba
 import { Peer } from '../../net/peer'
 import { FlowControl, LesProtocolMethods } from '../../net/protocol'
 import { BlockHeader } from '@ethereumjs/block'
-import { Job } from '../../types'
+import { Job } from './types'
 import { BN } from 'ethereumjs-util'
 
 export interface HeaderFetcherOptions extends BlockFetcherOptions {

packages/client/lib/sync/fetcher/types.ts

@@ -0,0 +1,10 @@
+import { Peer } from "@ethereumjs/devp2p"
+
+export type Job<JobTask, JobResult, StorageItem> = {
+    task: JobTask
+    time: number
+    index: number
+    result?: JobResult | StorageItem[]
+    state: 'idle' | 'expired' | 'active'
+    peer: Peer | null
+  }

packages/client/lib/types.ts

@@ -33,13 +33,4 @@ export interface QHeap<T> {
   peek(): T | undefined
   length: number
   gc(opts: { minLength: number; maxLength: number }): void
-}
-
-export type Job<JobTask, JobResult, StorageItem> = {
-  task: JobTask
-  time: number
-  index: number
-  result?: JobResult | StorageItem[]
-  state: 'idle' | 'expired' | 'active'
-  peer: Peer | null
-}
+}