trie -> new CP mechanism: minor fixes, removed ScratchDB related src files and tests

Author: holgerd77

packages/trie/src/checkpointTrie.ts

@@ -49,7 +49,6 @@ export class CheckpointTrie extends BaseTrie {
     }
 
     await this.lock.wait()
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     this.root = await this.db.revert()
     this.lock.signal()
   }

packages/trie/src/db.ts

@@ -166,10 +166,6 @@ export class DB {
     if (this.isCheckpoint) {
       for (const op of opStack) {
         if (op.type === 'put') {
-          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-          if (!op.value) {
-            continue
-          }
           await this.put(op.key, op.value)
           // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         } else if (op.type === 'del') {

packages/trie/src/scratch.ts

@@ -8,7 +8,6 @@ tape('DB tests', (t) => {
   const v = Buffer.from('v1')
   const k2 = Buffer.from('k2')
   const v2 = Buffer.from('v2')
-  //const k3 = Buffer.from('k3')
   const v3 = Buffer.from('v3')
 
   t.test('Operations: puts and gets value', async (st) => {

packages/trie/src/scratchReadStream.ts

@@ -156,31 +156,9 @@ tape('db stream test', function (tester) {
     },
   ] as BatchDBOp[]
 
-  /*const expectedNodes = {
-    '3c38d9aa6ad288c8e27da701e17fe99a5b67c8b12fd0469651c80494d36bc4c1': true,
-    d5f61e1ff2b918d1c2a2c4b1732a3c68bd7e3fd64f35019f2f084896d4546298: true,
-    e64329dadee2fb8a113b4c88cfe973aeaa9b523d4dc8510b84ca23f9d5bfbd90: true,
-    c916d458bfb5f27603c5bd93b00f022266712514a59cde749f19220daffc743f: true,
-    '2386bfb0de9cf93902a110f5ab07b917ffc0b9ea599cb7f4f8bb6fd1123c866c': true,
-  } as any*/
-
   it('should populate trie', async function (t) {
     trie.checkpoint()
     await trie.batch(ops)
     t.end()
   })
-
-  /*it('should only fetch nodes in the current trie', function (t) {
-    const stream = trie._createScratchReadStream()
-    stream.on('data', (d: any) => {
-      const key = d.key.toString('hex')
-      t.ok(!!expectedNodes[key])
-      delete expectedNodes[key]
-    })
-    stream.on('end', () => {
-      const keys = Object.keys(expectedNodes)
-      t.equal(keys.length, 0)
-      t.end()
-    })
-  })*/
 })

packages/trie/test/db.spec.ts

@@ -161,7 +161,6 @@ export default class DefaultStateManager implements StateManager {
     const account = await this.getAccount(address)
     const storageTrie = this._trie.copy(false)
     storageTrie.root = account.stateRoot
-    //@ts-ignore
     storageTrie.db.checkpoints = []
     return storageTrie
   }