feat(network): Throw error when can not get networkId instead of usin…

…g mainnet by default
aeternity · Jan 16, 2020 · f1f27f5 · f1f27f5
1 parent 199d2b3
commit f1f27f5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/es/account/index.js b/es/account/index.js
@@ -57,7 +57,8 @@ async function signTransaction (tx, opt = {}) {
  * @return {String} NetworkId
  */
 function getNetworkId () {
-  return this.networkId || (this.selectedNode ? this.selectedNode.networkId : false) || DEFAULT_NETWORK_ID
+  if (!this.networkId && !this.selectedNode.networkId) throw new Error('networkId is not provided')
+  return this.networkId || this.selectedNode.networkId
 }
 
 /**

diff --git a/es/ae/aepp.js b/es/ae/aepp.js
@@ -45,5 +45,5 @@ import GeneralizeAccount from '../contract/ga'
  * @return {Object} Aepp instance
  */
 export const Aepp = Ae.compose(ContractAPI, Aens, Oracle, GeneralizeAccount, Rpc)
-export const RpcAepp = Ae.compose(Chain, Tx, Oracle, Contract, Aens, AeppRpc)
+export const RpcAepp = Ae.compose(AeppRpc, Tx, Oracle, Contract, Aens, Chain)
 export default Aepp
diff --git a/es/ae/wallet.js b/es/ae/wallet.js
@@ -159,6 +159,6 @@ export const Wallet = Ae.compose(Accounts, Chain, Tx, Contract, GeneralizeAccoun
   }
 })
 
-export const RpcWallet = Ae.compose(Accounts, Chain, Tx, Contract, Oracle, Aens, GeneralizeAccount, WalletRpc)
+export const RpcWallet = Ae.compose(WalletRpc, Tx, Contract, Oracle, Aens, GeneralizeAccount, Chain)
 
 export default Wallet
diff --git a/es/node-pool/index.js b/es/node-pool/index.js
@@ -4,7 +4,7 @@
  * @export NodePool
  * @example import NodePool from '@aeternity/aepp-sdk/es/node-pool'
  */
-import { DEFAULT_NETWORK_ID, getterForCurrentNode, prepareNodeObject } from './helpers'
+import { getterForCurrentNode, prepareNodeObject } from './helpers'
 import AsyncInit from '../utils/async-init'
 
 /**
@@ -85,7 +85,8 @@ export const NodePool = AsyncInit.compose({
      * nodePool.getNetworkId()
      */
     getNetworkId () {
-      return this.networkId || this.selectedNode.networkId || DEFAULT_NETWORK_ID
+      if (!this.networkId && !this.selectedNode.networkId) throw new Error('networkId is not provided')
+      return this.networkId || this.selectedNode.networkId
     },
     /**
      * Check if you have selected node

diff --git a/es/utils/aepp-wallet-communication/rpc/aepp-rpc.js b/es/utils/aepp-wallet-communication/rpc/aepp-rpc.js
@@ -80,7 +80,7 @@ const handleMessage = (instance) => async (msg) => {
  * @param {Object} connection Wallet connection object
  * @return {Object}
  */
-export const AeppRpc = Ae.compose(Account, {
+export const AeppRpc = Ae.compose({
   async init ({ name, onAddressChange = voidFn, onDisconnect = voidFn, onNetworkChange = voidFn, connection }) {
     const eventsHandlers = ['onDisconnect', 'onAddressChange', 'onNetworkChange']
     this.connection = connection