fix tests

ethereumjs · Apr 14, 2023 · 38a2e7d · 38a2e7d · github-actions · Apr 14, 2023
1 parent eb75fcf
commit 38a2e7d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/packages/client/test/rpc/eth/getTransactionReceipt.spec.ts b/packages/client/test/rpc/eth/getTransactionReceipt.spec.ts
@@ -89,7 +89,11 @@ tape(`${method}: call with unknown tx hash`, async (t) => {
 })
 
 tape(`${method}: get dataGasUsed/dataGasPrice in blob tx receipt`, async (t) => {
-  initKZG(kzg, __dirname + '/../../../lib/trustedSetups/devnet4.txt')
+  try {
+    // Verified KZG is loaded correctly -- NOOP if throws
+    initKZG(kzg, __dirname + '/../../../lib/trustedSetups/devnet4.txt')
+    //eslint-disable-next-line
+  } catch {}
   const gethGenesis = require('../../../../block/test/testdata/4844-hardfork.json')
   const common = Common.fromGethGenesis(gethGenesis, {
     chain: 'customChain',

diff --git a/packages/util/src/kzg.ts b/packages/util/src/kzg.ts
@@ -37,6 +37,5 @@ export let kzg: Kzg = {
  */
 export function initKZG(kzgLib: Kzg, trustedSetupPath: string) {
   kzg = kzgLib
-
   kzg.loadTrustedSetup(trustedSetupPath)
 }
diff --git a/packages/vm/karma.conf.js b/packages/vm/karma.conf.js
@@ -34,6 +34,7 @@ module.exports = function (config) {
             '@chainsafe/as-sha256/hashObject':
               '../../node_modules/@chainsafe/as-sha256/lib/hashObject.js',
           },
+          ignore: ['c-kzg', 'safer-buffer'],
         },
       },
     },
Benchmark suite	Current: `38a2e7d`	Previous: `b4b1f82`	Ratio
`Block 9422905`	`7497` ops/sec (`±2.61%`)	`15827` ops/sec (`±1.66%`)	`2.11`
`Block 9422906`	`7382` ops/sec (`±3.36%`)	`15581` ops/sec (`±1.93%`)	`2.11`
`Block 9422910`	`7371` ops/sec (`±3.11%`)	`15070` ops/sec (`±1.88%`)	`2.04`