update use of setHardfork to enum

ethereumjs · Jul 19, 2021 · c39c82a · c39c82a
1 parent 1dfd049
commit c39c82a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/packages/block/test/block.spec.ts b/packages/block/test/block.spec.ts
@@ -469,7 +469,7 @@ tape('[Block]: block functions', function (t) {
       const blockchain = new Mockchain()
 
       const common = new Common({ chain: Chain.Mainnet })
-      common.setHardfork('berlin')
+      common.setHardfork(Hardfork.Berlin)
 
       const mainnetForkBlock = common.hardforkBlockBN('london')
       const rootBlock = Block.fromBlockData({
@@ -491,7 +491,7 @@ tape('[Block]: block functions', function (t) {
         common
       )
       await blockchain.putBlock(preForkBlock)
-      common.setHardfork('london')
+      common.setHardfork(Hardfork.London)
       const forkBlock = createBlock(preForkBlock, 'forkBlock', [], common)
       await blockchain.putBlock(forkBlock)
       const uncleFork = createBlock(forkBlock, 'uncleFork', [], common)

diff --git a/packages/block/test/header.spec.ts b/packages/block/test/header.spec.ts
@@ -44,7 +44,7 @@ tape('[Block]: Header functions', function (t) {
     st.ok(header.hash().toString('hex'), 'genesis block should initialize')
     st.equal(header._common.hardfork(), 'chainstart', 'should initialize with correct HF provided')
 
-    common.setHardfork('byzantium')
+    common.setHardfork(Hardfork.Byzantium)
     st.equal(
       header._common.hardfork(),
       'chainstart',

diff --git a/packages/blockchain/src/index.ts b/packages/blockchain/src/index.ts
@@ -324,7 +324,7 @@ export default class Blockchain implements BlockchainInterface {
 
     if (!genesisBlock) {
       const common = this._common.copy()
-      common.setHardfork('chainstart')
+      common.setHardfork(Hardfork.Chainstart)
       genesisBlock = Block.genesis({}, { common })
     }
 

diff --git a/packages/client/lib/rpc/modules/eth.ts b/packages/client/lib/rpc/modules/eth.ts
@@ -1,3 +1,4 @@
+import { Hardfork } from '@ethereumjs/common'
 import { Transaction, TransactionFactory } from '@ethereumjs/tx'
 import {
   Account,
@@ -471,8 +472,8 @@ export class Eth {
     try {
       const common = this.client.config.chainCommon.copy()
       // TODO: generalize with a new Common.latestSupportedHardfork() method or similar
-      // Alternative: common.setHardfork('lastest')
-      common.setHardfork('london')
+      // Alternative: common.setHardfork('latest')
+      common.setHardfork(Hardfork.London)
       const tx = TransactionFactory.fromSerializedData(toBuffer(serializedTx), { common })
       if (!tx.isSigned()) {
         return {

diff --git a/packages/common/tests/hardforks.spec.ts b/packages/common/tests/hardforks.spec.ts
@@ -60,7 +60,7 @@ tape('[Common]: Hardfork logic', function (t: tape.Test) {
       st.equal(hardfork, 'byzantium', 'should send correct hardforkChanged event')
       st.end()
     })
-    c.setHardfork('byzantium')
+    c.setHardfork(Hardfork.Byzantium)
   })
 
   t.test('hardforkBlock()', function (st: tape.Test) {

diff --git a/packages/common/tests/params.spec.ts b/packages/common/tests/params.spec.ts
@@ -8,11 +8,11 @@ tape('[Common]: Parameter access for param(), paramByHardfork()', function (t: t
     st.equal(c.paramByHardfork('gasPrices', 'ecAdd', 'byzantium'), 500, msg)
 
     msg = 'Should return correct value for HF set in class'
-    c.setHardfork('byzantium')
+    c.setHardfork(Hardfork.Byzantium)
     st.equal(c.param('gasPrices', 'ecAdd'), 500, msg)
-    c.setHardfork('istanbul')
+    c.setHardfork(Hardfork.Istanbul)
     st.equal(c.param('gasPrices', 'ecAdd'), 150, msg)
-    c.setHardfork('muirGlacier')
+    c.setHardfork(Hardfork.MuirGlacier)
     st.equal(c.param('gasPrices', 'ecAdd'), 150, msg)
 
     msg = 'Should return null for non-existing value'
@@ -40,7 +40,7 @@ tape('[Common]: Parameter access for param(), paramByHardfork()', function (t: t
     let msg = 'Should throw when called with non-existing topic'
     st.throws(f, /Topic gasPrizes not defined$/, msg)
 
-    c.setHardfork('byzantium')
+    c.setHardfork(Hardfork.Byzantium)
     st.equal(c.param('gasPrices', 'ecAdd'), 500, 'Should return correct value for HF set in class')
 
     c = new Common({

diff --git a/packages/tx/test/base.spec.ts b/packages/tx/test/base.spec.ts
@@ -97,7 +97,7 @@ tape('[BaseTransaction]', function (t) {
         `${txType.name}: should initialize with correct HF provided`
       )
 
-      initCommon.setHardfork('byzantium')
+      initCommon.setHardfork(Hardfork.Byzantium)
       st.equal(
         tx.common.hardfork(),
         'london',

diff --git a/packages/vm/tests/api/opcodes.spec.ts b/packages/vm/tests/api/opcodes.spec.ts
@@ -61,14 +61,14 @@ tape('VM -> getActiveOpcodes()', (t) => {
     const common = new Common({ chain: Chain.Mainnet, hardfork: Hardfork.Istanbul })
     const vm = new VM({ common })
 
-    common.setHardfork('byzantium')
+    common.setHardfork(Hardfork.Byzantium)
     st.equal(
       vm.getActiveOpcodes().get(CHAINID),
       undefined,
       'opcode not exposed after HF change (-> < istanbul)'
     )
 
-    common.setHardfork('istanbul')
+    common.setHardfork(Hardfork.Istanbul)
     st.equal(
       vm.getActiveOpcodes().get(CHAINID)!.name,
       'CHAINID',