refactor(node-pool)!: inline helpers, export by default

aeternity · Jun 16, 2021 · ed1cfb5 · ed1cfb5
1 parent 3e84139
commit ed1cfb5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 32 deletions.
diff --git a/src/node-pool/helpers.js b/src/node-pool/helpers.js
diff --git a/src/node-pool/index.js b/src/node-pool/index.js
@@ -6,7 +6,6 @@
  */
 import stampit from '@stamp/it'
 import Joi from 'joi-browser'
-import { getterForCurrentNode, prepareNodeObject } from './helpers'
 import { getNetworkId } from '../node'
 
 /**
@@ -19,7 +18,7 @@ import { getNetworkId } from '../node'
  * @param {Array} [options.nodes] - Array with Node instances
  * @return {Object} NodePool instance
  */
-export const NodePool = stampit({
+export default stampit({
   init ({ nodes = [] } = {}) {
     this.pool = new Map()
     this.validateNodes(nodes)
@@ -35,7 +34,10 @@ export const NodePool = stampit({
       enumerable: true,
       configurable: false,
       get () {
-        return getterForCurrentNode(this.selectedNode)
+        if (!this.selectedNode || !this.selectedNode.instance) {
+          throw new Error('You can\'t use Node API. Node is not connected or not defined!')
+        }
+        return this.selectedNode.instance.api
       }
     }
   },
@@ -44,20 +46,28 @@ export const NodePool = stampit({
      * Add Node
      * @function
      * @alias module:@aeternity/aepp-sdk/es/node-pool
-     * @rtype (name: String, nodeInstance: Object, select: Boolean) => Void
+     * @rtype (name: String, nodeInstance: Object, select: Boolean) => void
      * @param {String} name - Node name
-     * @param {Object} nodeInstance - Node instance
+     * @param {Object} node - Node instance
      * @param {Boolean} select - Select this node as current
-     * @return {Void}
+     * @return {void}
      * @example
      * nodePool.addNode('testNode', awaitNode({ url, internalUrl }), true) // add and select new node with name 'testNode'
      */
-    addNode (name, nodeInstance, select = false) {
+    addNode (name, node, select = false) {
       if (this.pool.has(name)) throw new Error(`Node with name ${name} already exist`)
 
-      this.validateNodes([{ name, instance: nodeInstance }])
+      this.validateNodes([{ name, instance: node }])
 
-      this.pool.set(name, prepareNodeObject(name, nodeInstance))
+      this.pool.set(name, {
+        name,
+        instance: node,
+        url: node.url,
+        internalUrl: node.internalUrl,
+        networkId: node.nodeNetworkId,
+        version: node.version,
+        consensusProtocolVersion: node.consensusProtocolVersion
+      })
       if (select || !this.selectedNode) {
         this.selectNode(name)
       }
@@ -66,9 +76,9 @@ export const NodePool = stampit({
      * Select Node
      * @function
      * @alias module:@aeternity/aepp-sdk/es/node-pool
-     * @rtype (name: String) => Void
+     * @rtype (name: String) => void
      * @param {String} name - Node name
-     * @return {Void}
+     * @return {void}
      * @example
      * nodePool.selectNode('testNode')
      */
@@ -148,5 +158,3 @@ export const NodePool = stampit({
     selectedNode: {}
   }
 })
-
-export default NodePool
diff --git a/src/tx/validator.js b/src/tx/validator.js
@@ -18,7 +18,7 @@ import {
   TX_TYPE
 } from './builder/schema'
 import { buildTxHash, calculateFee, unpackTx } from './builder'
-import { NodePool } from '../node-pool'
+import NodePool from '../node-pool'
 
 /**
  * Transaction validator

diff --git a/test/integration/node.js b/test/integration/node.js
@@ -21,7 +21,7 @@ import { url, internalUrl, ignoreVersion } from './'
 import { describe, it, before } from 'mocha'
 import { expect } from 'chai'
 import * as R from 'ramda'
-import { NodePool } from '../../src/node-pool'
+import NodePool from '../../src/node-pool'
 
 describe('Node client', function () {
   let client