Fix expect throw

.eslintrc

@@ -8,6 +8,7 @@
  "plugin:@typescript-eslint/recommended"
  ],
  "rules": {
- "prefer-rest-params": "off" // super(...arguments)
+ "prefer-rest-params": "off", // super(...arguments)
+ "@typescript-eslint/no-inferrable-types": "off"
  }
 }

tests/crossChainSwap.test.ts

@@ -81,7 +81,7 @@ describe('Test SmartContract `CrossChainSwap`', () => {
  pubKeyOrAddrToSign: bobPubKey,
  } as MethodCallOptions<CrossChainSwap>
  )
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /locktime has not yet expired/
  )
  })

tests/crowdfund.test.ts

@@ -68,6 +68,6 @@ describe('Test SmartContract `Crowdfund`', () => {
  } as MethodCallOptions<Crowdfund>
  )
 
- expect(callContract()).to.be.rejectedWith(/fundraising expired/)
+ return expect(callContract()).to.be.rejectedWith(/fundraising expired/)
  })
 })

tests/demo.test.ts

@@ -31,12 +31,12 @@ describe('Test SmartContract `Demo`', () => {
  it('should throw when calling `add`', async () => {
  await demo.deploy(1)
  const callContract = async () => await demo.methods.add(-5n)
- expect(callContract()).to.be.rejectedWith(/add check failed/)
+ return expect(callContract()).to.be.rejectedWith(/add check failed/)
  })
 
  it('should throw when calling `sub`', async () => {
  await demo.deploy(1)
  const callContract = async () => await demo.methods.sub(9n)
- expect(callContract()).to.be.rejectedWith(/sub check failed/)
+ return expect(callContract()).to.be.rejectedWith(/sub check failed/)
  })
 })

tests/erc20.test.ts

@@ -338,7 +338,7 @@ describe('Test SmartContract `ERC20`', () => {
  150n
  )
 
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /Execution failed, ERC20: insufficient allowance/
  )
  })

tests/erc721.test.ts

@@ -35,7 +35,7 @@ describe('Test SmartContract `Erc721`', () => {
  () => getDummySig() // mint without correct minter sig
  )
 
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /minter signature check failed/
  )
  })
@@ -60,7 +60,7 @@ describe('Test SmartContract `Erc721`', () => {
  (sigResps) => findSig(sigResps, myPublicKey) // minterSig
  )
 
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /token was already minted before/
  )
  })
@@ -91,7 +91,7 @@ describe('Test SmartContract `Erc721`', () => {
  } as MethodCallOptions<Erc721>
  )
 
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /sender doesn't have the token/
  )
  })

tests/hashedMapNonState.test.ts

@@ -49,7 +49,7 @@ describe('Test SmartContract `HashedMapNonState`', () => {
  await hashedMapNonState.deploy(1)
  const callContract = async () =>
  await hashedMapNonState.methods.delete(2n)
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /hashedMap should have the key before delete/
  )
  })

tests/hashedSetNonState.test.ts

@@ -51,7 +51,7 @@ describe('Test SmartContract `HashedSetNonState`', () => {
  await hashedSetNonState.deploy(1)
  const callContract = async () =>
  await hashedSetNonState.methods.delete(2n)
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /hashedSet should have the key before delete/
  )
  })

tests/helloWorld.test.ts

@@ -26,6 +26,8 @@ describe('Test SmartContract `HelloWorld`', () => {
  await helloWorld.deploy(1)
  const callContract = async () =>
  await helloWorld.methods.unlock(toByteString('wrong message', true))
- expect(callContract()).to.be.rejectedWith(/Not expected message!/)
+ return expect(callContract()).to.be.rejectedWith(
+ /Not expected message!/
+ )
  })
 })

tests/multiPartyHashPuzzle.test.ts

@@ -56,6 +56,6 @@ describe('Test SmartContract `MultiPartyHashPuzzle`', () => {
  preimagesWrong[0] = sha256('aabbcc')
  const callContract = async () =>
  await instance.methods.unlock(preimagesWrong)
- expect(callContract()).to.be.rejectedWith(/hash mismatch/)
+ return expect(callContract()).to.be.rejectedWith(/hash mismatch/)
  })
 })

tests/multiPartyHashPuzzleOpt.test.ts

@@ -53,6 +53,6 @@ describe('Test SmartContract `MultiPartyHashPuzzleOpt`', () => {
  preimagesWrong[0] = sha256('aabbcc')
  const callContract = async () =>
  await instance.methods.unlock(preimagesWrong)
- expect(callContract()).to.be.rejectedWith(/hash mismatch/)
+ return expect(callContract()).to.be.rejectedWith(/hash mismatch/)
  })
 })

tests/multiSig.test.ts

@@ -81,6 +81,6 @@ describe('Test SmartContract `P2MS`', () => {
  } as MethodCallOptions<MultiSigPayment>
  )
 
- expect(callContract()).to.be.rejectedWith(/Execution failed/)
+ return expect(callContract()).to.be.rejectedWith(/Execution failed/)
  })
 })

tests/ordinalLock.test.ts

@@ -8,6 +8,7 @@ import {
  PubKey,
  hash160,
  ByteString,
+ ContractTransaction,
 } from 'scrypt-ts'
 import { OrdinalLock, purchaseTxBuilder } from '../src/contracts/ordinalLock'
 import chaiAsPromised from 'chai-as-promised'
@@ -108,7 +109,7 @@ describe('Test SmartContract `OrdinalLock`', () => {
  current: OrdinalLock,
  options: MethodCallOptions<OrdinalLock>,
  destOutput: ByteString
- ): Promise<any> => {
+ ): Promise<ContractTransaction> => {
  const destOutputBR = new bsv.encoding.BufferReader(
  Buffer.from(destOutput, 'hex')
  )
@@ -132,6 +133,7 @@ describe('Test SmartContract `OrdinalLock`', () => {
  const result = {
  tx: unsignedTx,
  atInputIndex: 0, // the contract input's index
+ nexts: [],
  }
 
  return Promise.resolve(result)
@@ -143,7 +145,7 @@ describe('Test SmartContract `OrdinalLock`', () => {
  await instance.methods.purchase(destOutputStr, {
  changeAddress: await buyerSigner.getDefaultAddress(),
  } as MethodCallOptions<OrdinalLock>)
- expect(callContract()).to.be.rejectedWith(/Execution failed/)
+ return expect(callContract()).to.be.rejectedWith(/Execution failed/)
  })
 
  it('should fail cancel method w bad sig.', async () => {
@@ -161,6 +163,6 @@ describe('Test SmartContract `OrdinalLock`', () => {
  changeAddress: wrongKey.toAddress(),
  } as MethodCallOptions<OrdinalLock>
  )
- expect(callContract()).to.be.rejectedWith(/bad seller/)
+ return expect(callContract()).to.be.rejectedWith(/bad seller/)
  })
 })

tests/p2pkh.test.ts

@@ -69,7 +69,9 @@ describe('Test SmartContract `P2PKH`', () => {
  } as MethodCallOptions<P2PKH>
  )
 
- expect(callContract()).to.be.rejectedWith(/signature check failed/)
+ return expect(callContract()).to.be.rejectedWith(
+ /signature check failed/
+ )
  })
 
  it('should fail if passing wrong public key', async () => {
@@ -90,7 +92,7 @@ describe('Test SmartContract `P2PKH`', () => {
  pubKeyOrAddrToSign: myPublicKey, // use the correct private key, `myPrivateKey`, to sign
  } as MethodCallOptions<P2PKH>
  )
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /public key hashes are not equal/
  )
  })

tests/priceBet.test.ts

@@ -138,6 +138,8 @@ describe('Test SmartContract `PriceBet`', () => {
  } as MethodCallOptions<PriceBet>
  )
 
- expect(callContract()).to.be.rejectedWith(/signature check failed/)
+ return expect(callContract()).to.be.rejectedWith(
+ /signature check failed/
+ )
  })
 })

tests/recallable.test.ts

@@ -39,7 +39,7 @@ describe('Test SmartContract `Recallable`', () => {
  pubKeyOrAddrToSign: alicePublicKey,
  } as MethodCallOptions<Recallable>
  )
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /invalid value of `satoshisSent`/
  )
  })
@@ -55,7 +55,7 @@ describe('Test SmartContract `Recallable`', () => {
  } as MethodCallOptions<Recallable>
  )
 
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /invalid value of `satoshisSent`/
  )
  })
@@ -67,7 +67,7 @@ describe('Test SmartContract `Recallable`', () => {
  PubKey(toHex(bobPublicKey)),
  BigInt(1)
  )
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /user's signature check failed/
  )
  })

tests/socialRecovery.test.ts

@@ -70,7 +70,9 @@ describe('Test SmartContract `SocialRecovery`', () => {
  pubKeyOrAddrToSign: wrongKey.toPublicKey(),
  } as MethodCallOptions<SocialRecovery>
  )
- expect(callContract()).to.be.rejectedWith(/signature check failed/)
+ return expect(callContract()).to.be.rejectedWith(
+ /signature check failed/
+ )
  })
 
  it('should pass updating signing key when threshold reached.', async () => {
@@ -142,7 +144,7 @@ describe('Test SmartContract `SocialRecovery`', () => {
  } as MethodCallOptions<SocialRecovery>
  )
 
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /Guardian threshold not reached/
  )
  })

tests/statefulMultiSig.test.ts

@@ -139,7 +139,9 @@ describe('Test SmartContract `StatefulMultiSig`', () => {
  },
  } as MethodCallOptions<StatefulMultiSig>
  )
- expect(callContract()).to.be.rejectedWith(/signature check failed/)
+ return expect(callContract()).to.be.rejectedWith(
+ /signature check failed/
+ )
  })
 
  it('should fail pay if threshold not reached', async () => {
@@ -157,7 +159,7 @@ describe('Test SmartContract `StatefulMultiSig`', () => {
  await statefulMultiSig.signer.getDefaultAddress(),
  } as MethodCallOptions<StatefulMultiSig>
  )
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /Not enough valid signatures./
  )
  })

tests/timeLock.test.ts

@@ -31,7 +31,7 @@ describe('Test SmartContract `TimeLock`', () => {
  await timeLock.methods.unlock({
  lockTime: 1673500100,
  } as MethodCallOptions<TimeLock>)
- expect(callContract()).to.be.rejectedWith(
+ return expect(callContract()).to.be.rejectedWith(
  /locktime has not yet expired/
  )
  })