tx: apply strict-boolean-expressions

ethereumjs · Jul 8, 2022 · 502f85e · 502f85e
1 parent dddcc97
commit 502f85e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/packages/tx/src/baseTransaction.ts b/packages/tx/src/baseTransaction.ts
@@ -359,7 +359,7 @@ export abstract class BaseTransaction<TransactionObject> {
    */
   protected _getCommon(common?: Common, chainId?: BigIntLike) {
     // Chain ID provided
-    if (chainId) {
+    if (typeof chainId !== 'undefined') {
       const chainIdBigInt = bufferToBigInt(toBuffer(chainId))
       if (common) {
         if (common.chainId() !== chainIdBigInt) {

diff --git a/packages/tx/src/eip1559Transaction.ts b/packages/tx/src/eip1559Transaction.ts
@@ -150,7 +150,7 @@ export default class FeeMarketEIP1559Transaction extends BaseTransaction<FeeMark
     this.common = this._getCommon(opts.common, chainId)
     this.chainId = this.common.chainId()
 
-    if (!this.common.isActivatedEIP(1559)) {
+    if (this.common.isActivatedEIP(1559) === false) {
       throw new Error('EIP-1559 not enabled on Common')
     }
     this.activeCapabilities = this.activeCapabilities.concat([1559, 2718, 2930])

diff --git a/packages/tx/src/util.ts b/packages/tx/src/util.ts
@@ -18,7 +18,7 @@ export class AccessLists {
   public static getAccessListData(accessList: AccessListBuffer | AccessList) {
     let AccessListJSON
     let bufferAccessList
-    if (accessList && isAccessList(accessList)) {
+    if (isAccessList(accessList)) {
       AccessListJSON = accessList
       const newAccessList: AccessListBuffer = []
 

diff --git a/packages/tx/test/base.spec.ts b/packages/tx/test/base.spec.ts
@@ -274,7 +274,7 @@ tape('[BaseTransaction]', function (t) {
     for (const txType of txTypes) {
       txType.txs.forEach(function (tx: any, i: number) {
         const { privateKey } = txType.fixtures[i]
-        if (privateKey) {
+        if (typeof privateKey !== 'undefined') {
           st.ok(tx.sign(Buffer.from(privateKey, 'hex')), `${txType.name}: should sign tx`)
         }
 
@@ -316,7 +316,7 @@ tape('[BaseTransaction]', function (t) {
     for (const txType of txTypes) {
       txType.txs.forEach(function (tx: any, i: number) {
         const { privateKey, sendersAddress } = txType.fixtures[i]
-        if (privateKey) {
+        if (typeof privateKey !== 'undefined') {
           const signedTx = tx.sign(Buffer.from(privateKey, 'hex'))
           st.equal(
             signedTx.getSenderAddress().toString(),
@@ -333,7 +333,7 @@ tape('[BaseTransaction]', function (t) {
     for (const txType of txTypes) {
       txType.txs.forEach(function (tx: any, i: number) {
         const { privateKey } = txType.fixtures[i]
-        if (privateKey) {
+        if (typeof privateKey !== 'undefined') {
           const signedTx = tx.sign(Buffer.from(privateKey, 'hex'))
           const txPubKey = signedTx.getSenderPublicKey()
           const pubKeyFromPriv = privateToPublic(Buffer.from(privateKey, 'hex'))
@@ -355,7 +355,7 @@ tape('[BaseTransaction]', function (t) {
       for (const txType of txTypes) {
         txType.txs.forEach(function (tx: any, i: number) {
           const { privateKey } = txType.fixtures[i]
-          if (privateKey) {
+          if (typeof privateKey !== 'undefined') {
             let signedTx = tx.sign(Buffer.from(privateKey, 'hex'))
             signedTx = JSON.parse(JSON.stringify(signedTx)) // deep clone
             ;(signedTx as any).s = SECP256K1_ORDER + BigInt(1)
@@ -373,7 +373,7 @@ tape('[BaseTransaction]', function (t) {
     for (const txType of txTypes) {
       txType.txs.forEach(function (tx: any, i: number) {
         const { privateKey } = txType.fixtures[i]
-        if (privateKey) {
+        if (typeof privateKey !== 'undefined') {
           const signedTx = tx.sign(Buffer.from(privateKey, 'hex'))
           st.ok(signedTx.verifySignature(), `${txType.name}: should verify signing it`)
         }

diff --git a/packages/tx/test/index.ts b/packages/tx/test/index.ts
@@ -2,18 +2,18 @@ import * as minimist from 'minimist'
 
 const argv = minimist(process.argv.slice(2))
 
-if (argv.b) {
+if (argv.b === true) {
   require('./base.spec')
-} else if (argv.l) {
+} else if (argv.l === true) {
   require('./legacy.spec')
-} else if (argv.e) {
+} else if (argv.e === true) {
   require('./typedTxsAndEIP2930.spec')
   require('./eip1559.spec')
-} else if (argv.t) {
+} else if (argv.t === true) {
   require('./transactionRunner')
-} else if (argv.f) {
+} else if (argv.f === true) {
   require('./transactionFactory.spec')
-} else if (argv.a) {
+} else if (argv.a === true) {
   // All manual API tests
   require('./base.spec')
   require('./legacy.spec')

diff --git a/packages/tx/test/testLoader.ts b/packages/tx/test/testLoader.ts
@@ -52,7 +52,7 @@ export async function getTests(
       const testsByName = JSON.parse(content)
       const testNames = Object.keys(testsByName)
       for (const testName of testNames) {
-        if (!skipPredicate(testName, testsByName[testName])) {
+        if (skipPredicate(testName, testsByName[testName]) === false) {
           await onFile(parsedFileName, subDir, testName, testsByName[testName])
         }
       }

diff --git a/packages/tx/test/transactionRunner.ts b/packages/tx/test/transactionRunner.ts
@@ -42,7 +42,7 @@ const EIPs: any = {
 }
 
 tape('TransactionTests', async (t) => {
-  const fileFilterRegex = file ? new RegExp(file + '[^\\w]') : undefined
+  const fileFilterRegex = typeof file !== 'undefined' ? new RegExp(file + '[^\\w]') : undefined
   await getTests(
     (
       _filename: string,
@@ -56,14 +56,14 @@ tape('TransactionTests', async (t) => {
             continue
           }
           const forkTestData = testData.result[forkName]
-          const shouldBeInvalid = !!forkTestData.exception
+          const shouldBeInvalid = typeof forkTestData.exception !== 'undefined'
 
           try {
             const rawTx = toBuffer(testData.txbytes)
             const hardfork = forkNameMap[forkName]
             const common = new Common({ chain: 1, hardfork })
             const activateEIPs = EIPs[forkName]
-            if (activateEIPs) {
+            if (typeof activateEIPs !== undefined) {
               common.setEIPs(activateEIPs)
             }
             const tx = TransactionFactory.fromSerializedData(rawTx, { common })
@@ -73,7 +73,7 @@ tape('TransactionTests', async (t) => {
             const senderIsCorrect = forkTestData.sender === sender
             const hashIsCorrect = forkTestData.hash?.slice(2) === hash
 
-            const hashAndSenderAreCorrect = forkTestData && senderIsCorrect && hashIsCorrect
+            const hashAndSenderAreCorrect = senderIsCorrect && hashIsCorrect
             if (shouldBeInvalid) {
               st.assert(!txIsValid, `Transaction should be invalid on ${forkName}`)
             } else {