feat(network): Throw error when can not get networkId

es/account/index.js

@@ -28,8 +28,6 @@ import * as Crypto from '../utils/crypto'
 import { buildTx } from '../tx/builder'
 import { TX_TYPE } from '../tx/builder/schema'
 
-const DEFAULT_NETWORK_ID = 'ae_mainnet'
-
 /**
  * Sign encoded transaction
  * @instance
@@ -57,7 +55,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
 }
 
 /**

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

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

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

es/utils/aepp-wallet-communication/rpc/aepp-rpc.js

@@ -9,7 +9,6 @@ import * as R from 'ramda'
 import uuid from 'uuid/v4'
 
 import Ae from '../../../ae'
-import Account from '../../../account'
 import { RpcClient } from './rpc-clients'
 import { getHandler, message, voidFn } from '../helpers'
 import { METHODS, RPC_STATUS, VERSION } from '../schema'
@@ -80,7 +79,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

test/integration/node.js

@@ -64,9 +64,13 @@ describe('Node client', function () {
         e.message.should.be.equal('Invalid node instance object')
       }
     })
-    it('Can get network id', async () => {
+    it('Throw error on get network without node ', async () => {
       const node = await NodePool()
-      node.getNetworkId().should.be.equal('ae_mainnet')
+      try {
+        node.getNetworkId()
+      } catch (e) {
+        e.message.should.be.equal('networkId is not provided')
+      }
     })
     it('Throw error on using API without node', async () => {
       const node = await NodePool()