[FIX] error first and result later

examples/testContract.js

@@ -40,14 +40,32 @@ for (var contractName in output.contracts[fileName]) {
   }
 }
 
-// const harmony = new Harmony('ws://localhost:18545', 1);
-const harmony = new Harmony(
-  // 'https://ropsten.infura.io/v3/4f3be7f5bbe644b7a8d95c151c8f52ec',
-  'wss://Ropsten.infura.io/ws/v3/4f3be7f5bbe644b7a8d95c151c8f52ec',
-  // 'https://testnet-rpc.thundercore.com:8544',
-  ChainType.Ethereum,
-  ChainID.Ropsten,
-);
+const Settings = {
+  Ropsten: {
+    http: 'https://ropsten.infura.io/v3/4f3be7f5bbe644b7a8d95c151c8f52ec',
+    ws: 'wss://ropsten.infura.io/ws/v3/4f3be7f5bbe644b7a8d95c151c8f52ec',
+    type: ChainType.Ethereum,
+    id: ChainID.Ropsten,
+  },
+  Rinkeby: {
+    http: 'https://rinkeby.infura.io/v3/4f3be7f5bbe644b7a8d95c151c8f52ec',
+    ws: 'wss://rinkeby.infura.io/ws/v3/4f3be7f5bbe644b7a8d95c151c8f52ec',
+    type: ChainType.Ethereum,
+    id: ChainID.Ropsten,
+  },
+  Ganache: {
+    http: 'http://localhost:18545',
+    ws: 'ws://localhost:18545',
+    type: ChainType.Ethereum,
+    id: ChainID.Ganache,
+  },
+};
+
+function useSetting(setting, providerType) {
+  return [setting[providerType], setting.type, setting.id];
+}
+
+const harmony = new Harmony(...useSetting(Settings.Ganache, 'ws'));
 
 const mne =
   'food response winner warfare indicate visual hundred toilet jealous okay relief tornado';
@@ -137,76 +155,3 @@ deployContract().then((deployed) => {
     }
   });
 });
-
-// harmony.blockchain.newPendingTransactions().then((p) => {
-//   console.log({ txns: p });
-//   p.onData(async (res) => {
-//     const txn = await harmony.blockchain.getTransactionByHash({
-//       txnHash: res.params.result,
-//     });
-//     console.log(txn);
-//   });
-// });
-
-// const getValue = async (address) => {
-//   const newContract = harmony.contracts.createContract(abi, address);
-
-//   const value = await newContract.methods
-//     .getValue()
-//     .call({ from: acc1.address });
-//   return value;
-// };
-
-// async function setValue(address) {
-//   const newContract = harmony.contracts.createContract(abi, address);
-
-//   await newContract.methods.setValue('KKKK').call({
-//     from: acc1.address,
-//   });
-// }
-
-// async function myfunc(address) {
-//   const newContract = harmony.contracts.createContract(abi, address);
-//   const result = await newContract.methods
-//     .myFunction()
-//     .call({ from: acc1.address });
-//   return result;
-// }
-
-// const contractAddress = '0xbdce52076e5d8b95cadf5086ff429e33ce641374';
-
-// const newContract = harmony.contracts.createContract(abi, contractAddress);
-
-// harmony.blockchain.getCode({ address: contractAddress }).then(console.log);
-
-// newContract.methods
-//   .myFunction()
-//   .call({ from: acc1.address, gas: new harmony.crypto.BN(30000000) }, 'latest')
-//   .then(console.log);
-
-// deployContract().then((deployed) => {
-//   deployed.methods
-//     .add(1, 3)
-//     .call()
-//     .then(console.log);
-// });
-
-// myContract.methods
-//   .getValue()
-//   .call({ from: acc1.address })
-//   .then((res) => {
-//     console.log(res);
-//   });
-// myContract.methods
-//   .setValue('shit!')
-//   .call({ from: acc1.address })
-//   .then((res) => {
-//     console.log(res);
-//   });
-
-// .on('confirmation', (e) => {
-//   console.log(e);
-// });
-// .then((res) => {
-//   console.log(res);
-// });

examples/testWallet.js

@@ -1,6 +1,6 @@
 const { Harmony } = require('@harmony/core');
 
-const harmony = new Harmony('https://localhost:9128');
+const harmony = new Harmony('https://localhost:9015');
 
 async function createAndEncrypt(words, index, password) {
   for (let i = 0; i < index; i++) {

packages/harmony-contract/src/methods/method.ts

@@ -95,12 +95,12 @@ export class ContractMethod {
           blockNumber,
         ]),
       );
-      if (result.responseType === 'result') {
-        return this.afterCall(result);
+      if (result.responseType === 'raw') {
+        return this.afterCall(undefined);
       } else if (result.responseType === 'error') {
         throw result.message;
       } else {
-        return this.afterCall(undefined);
+        return this.afterCall(result);
       }
     } catch (error) {
       throw error;
@@ -116,12 +116,13 @@ export class ContractMethod {
           },
         ]),
       );
-      if (result.responseType === 'result') {
-        return result;
-      } else if (result.responseType === 'error') {
+
+      if (result.responseType === 'error') {
         throw result.message;
       } else if (result.responseType === 'raw') {
         throw new Error('Get estimateGas fail');
+      } else {
+        return result;
       }
     } catch (error) {
       throw error;

packages/harmony-transaction/src/transaction.ts

@@ -267,11 +267,9 @@ class Transaction {
     );
     if (res.responseType === 'error') {
       return false;
-    }
-    if (res.responseType === 'raw') {
+    } else if (res.responseType === 'raw') {
       return false;
-    }
-    if (res.responseType === 'result') {
+    } else {
       this.receipt = res;
       this.emitReceipt(this.receipt);
       this.id = res.transactionHash;