blockchain: integrating Block 3.0.0

evertonfraga · evertonfraga · commit c24fd7ded67a · 2020-04-21T07:05:27.000-04:00
diff --git a/packages/blockchain/test/index.ts b/packages/blockchain/test/index.ts
@@ -142,8 +142,12 @@ test('blockchain test', t => {
         st.error(err, 'no error')
         blockchain.getBlock(1, (err?: Error, block?: Block) => {
           st.error(err, 'no error')
-          st.equal(block.hash().toString('hex'), blocks[1].hash().toString('hex'))
-          st.end()
+          if (block) {
+            st.equal(block.hash().toString('hex'), blocks[1].hash().toString('hex'))
+            st.end()
+          } else {
+            st.fail('block is not defined!')
+          }
         })
       })
     })
@@ -158,8 +162,12 @@ test('blockchain test', t => {
       st.error(err, 'no error')
       blockchain.getBlock(genesisBlock.hash(), (err?: Error, block?: Block) => {
         st.error(err, 'no error')
-        st.equal(block.hash().toString('hex'), genesisBlock.hash().toString('hex'))
-        st.end()
+        if (block) {
+          st.equal(block.hash().toString('hex'), genesisBlock.hash().toString('hex'))
+          st.end()
+        } else {
+          st.fail('block is not defined!')
+        }
       })
     })
   })
@@ -370,7 +378,7 @@ test('blockchain test', t => {
   })
 
   t.test('should catch iterator func error', async st => {
-    const { blockchain, blocks, error } = await generateBlockchain(25)
+    const { blockchain, error } = await generateBlockchain(25)
     st.error(error, 'no error')
     blockchain.iterator(
       'error',
@@ -585,9 +593,13 @@ test('blockchain test', t => {
         if (err) {
           return st.error(err)
         }
-        st.equals(head.hash().toString('hex'), genesis.hash().toString('hex'), 'should get head')
-        st.equals(blockchain._heads['head0'].toString('hex'), 'abcd', 'should get state root heads')
-        st.end()
+        if (genesis) {
+          st.equals(head.hash().toString('hex'), genesis.hash().toString('hex'), 'should get head')
+          st.equals(blockchain._heads['head0'].toString('hex'), 'abcd', 'should get state root heads')
+          st.end()
+        } else {
+          st.fail()
+        }
       })
     })
   })
@@ -627,6 +639,9 @@ test('blockchain test', t => {
       if (err) {
         return st.error(err)
       }
+      if (!genesis) {
+        return st.fail('genesis not defined!')
+      }
       const blockchain = new Blockchain({ db: db })
       async.series(
         [
@@ -746,6 +761,9 @@ test('blockchain test', t => {
               if (err) {
                 return st.error(err)
               }
+              if (!block) {
+                return st.fail('block not defined!')
+              }
               st.equals(
                 cachedHash.toString('hex'),
                 block.hash().toString('hex'),
@@ -854,6 +872,9 @@ test('blockchain test', t => {
                       if (err) {
                         return st.error(err)
                       }
+                      if (!getBlock) {
+                        return st.fail('getBlock not defined!')
+                      }
                       t.equals(
                         getBlock.hash().toString('hex'),
                         block.hash().toString('hex'),
diff --git a/packages/blockchain/test/util.ts b/packages/blockchain/test/util.ts
@@ -1,6 +1,6 @@
 import { rlp, toBuffer, bufferToInt } from 'ethereumjs-util'
 import BN = require('bn.js')
-import Blockchain, { Block } from '../src'
+import Blockchain from '../src'
 
 const util = require('util')
 import { Block } from 'ethereumjs-block'
@@ -43,7 +43,7 @@ export const generateBlocks = (numberOfBlocks: number, existingBlocks?: Block[])
     const block = new Block()
     block.header.number = toBuffer(i)
     block.header.parentHash = blocks[i - 1].hash()
-    block.header.difficulty = block.header.canonicalDifficulty(blocks[i - 1])
+    block.header.difficulty = toBuffer(block.header.canonicalDifficulty(blocks[i - 1]))
     block.header.gasLimit = toBuffer(8000000)
     block.header.timestamp = toBuffer(bufferToInt(blocks[i - 1].header.timestamp) + 1)
     blocks.push(block)
