refactor!: enable verification in deep props instead of extra variable

src/ae/index.js

@@ -38,7 +38,7 @@ import { AE_AMOUNT_FORMATS } from '../utils/amount-formatter'
  * @rtype (tx: String, options: Object) => Promise[String]
  * @param {String} tx - Transaction
  * @param {Object} [options={}] options - Options
- * @param {Object} [options.verify] verify - Verify transaction before broadcast, throw error if not valid
+ * @param {Object} [options.verify=true] verify - Verify transaction before broadcast, throw error if not valid
  * @return {Object} Transaction
  */
 async function send (tx, options = {}) {

src/chain/index.js

@@ -37,7 +37,7 @@ import { required } from '@stamp/required'
  * @return {Object} Chain instance
  */
 const Chain = stampit({
-  deepProps: { Ae: { defaults: { waitMined: true } } },
+  deepProps: { Ae: { defaults: { waitMined: true, verify: true } } },
   statics: { waitMined (bool) { return this.deepProps({ Ae: { defaults: { waitMined: bool } } }) } }
 }, required({
   methods: {
@@ -74,7 +74,7 @@ const Chain = stampit({
  * @rtype (tx: String, options?: Object) => tx: Promise[Object]|txHash: Promise[String]
  * @param {String} tx - Transaction to submit
  * @param {String} [options={}] - Options to pass to the implementation
- * @param {String} [options.verify = false] - Verify transaction before broadcast.
+ * @param {String} [options.verify=true] - Verify transaction before broadcast.
  * @return {Object} Transaction
  */
 

src/chain/node.js

@@ -36,8 +36,7 @@ import { DRY_RUN_ACCOUNT, NAME_ID_KEY } from '../tx/builder/schema'
 
 async function sendTransaction (tx, options = {}) {
   const { waitMined, verify } = R.merge(this.Ae.defaults, options)
-  // Verify transaction before broadcast
-  if (verify || (typeof verify !== 'boolean' && this.verifyTxBeforeSend)) {
+  if (verify) {
     const { validation, tx: txObject, txType } = await this.unpackAndVerify(tx)
     if (validation.length) {
       throw Object.assign(new Error('Transaction verification error: ' + JSON.stringify(validation)), {
@@ -260,9 +259,6 @@ async function resolveName (nameOrId, prefix, { verify, resolveByNode } = {}) {
  * @example ChainNode({url: 'https://testnet.aeternity.io/'})
  */
 const ChainNode = Chain.compose(TransactionValidator, NodePool, {
-  init ({ verifyTx = true }) {
-    this.verifyTxBeforeSend = verifyTx
-  },
   methods: {
     sendTransaction,
     balance,

test/integration/aens.js

@@ -67,7 +67,7 @@ describe('Aens', function () {
     const { pointers } = await aens.getName(name)
     pointers.length.should.be.equal(0)
     try {
-      await aens.spend(100, name, { onAccount, verify: true })
+      await aens.spend(100, name, { onAccount })
     } catch (e) {
       e.message.should.be.equal(`Name ${name} don't have pointers for ak`)
     }
@@ -118,7 +118,7 @@ contract Identity =
   it('Spend by name', async () => {
     const current = await aens.address()
     const onAccount = aens.addresses().find(acc => acc !== current)
-    await aens.spend(100, name, { onAccount, verify: true })
+    await aens.spend(100, name, { onAccount })
   })
 
   it('transfers names', async () => {

test/integration/contract.js

@@ -420,7 +420,7 @@ describe('Contract', function () {
     await contract.poll(deployed.transaction, { interval: 50, attempts: 1200 })
     expect(deployed.result).to.be.equal(undefined)
     deployed.txData.should.not.be.equal(undefined)
-    const result = await deployed.call('getArg', ['42'], { waitMined: false, verify: false })
+    const result = await deployed.call('getArg', ['42'], { waitMined: false })
     expect(result.result).to.be.equal(undefined)
     result.txData.should.not.be.equal(undefined)
     await contract.poll(result.hash, { interval: 50, attempts: 1200 })

test/integration/ga.js

@@ -44,11 +44,8 @@ describe('Generalize Account', function () {
   })
 
   it('Fail on make GA on already GA account', async () => {
-    try {
-      await client.createGeneralizeAccount('authorize', authContract)
-    } catch (e) {
-      e.message.should.be.equal(`Account ${gaAccount.publicKey} is already GA`)
-    }
+    await client.createGeneralizeAccount('authorize', authContract)
+      .should.be.rejectedWith(`Account ${gaAccount.publicKey} is already GA`)
   })
 
   it('Init MemoryAccount for GA and Spend using GA', async () => {
@@ -59,8 +56,8 @@ describe('Generalize Account', function () {
 
     const r = () => Math.floor(Math.random() * 20).toString()
     const callData = await client.contractEncodeCall(authContract, 'authorize', [r()])
-    await client.spend(10000, publicKey, { authData: { callData }, onAccount: gaAccount.publicKey, verify: false })
-    await client.spend(10000, publicKey, { authData: { source: authContract, args: [r()] }, onAccount: gaAccount.publicKey, verify: false })
+    await client.spend(10000, publicKey, { authData: { callData }, onAccount: gaAccount.publicKey })
+    await client.spend(10000, publicKey, { authData: { source: authContract, args: [r()] }, onAccount: gaAccount.publicKey })
     const balanceAfter = await client.balance(publicKey)
     balanceAfter.should.be.equal('20000')
   })

test/integration/transaction.js

@@ -199,7 +199,7 @@ describe('Native Transaction', function () {
     const nativeTx = await clientNative.oracleRegisterTx(params)
 
     txFromAPI.should.be.equal(nativeTx)
-    await clientNative.send(nativeTx, { verify: true })
+    await clientNative.send(nativeTx)
 
     const oId = (await client.api.getOracleByPubkey(oracleId)).id
     oId.should.be.equal(oracleId)

test/integration/txVerification.js

@@ -71,7 +71,7 @@ describe('Verify Transaction', function () {
     })
 
     try {
-      await client.send(spendTx, { verify: true })
+      await client.send(spendTx)
     } catch ({ errorData }) {
       const atLeastOneError = !!errorData.validation.length
       atLeastOneError.should.be.equal(true)