fix(RPC): Remove NodePool stamp from AE composition (#612)

aeternity · Aug 20, 2019 · 21af2eb · 21af2eb
1 parent dd8f85f
commit 21af2eb
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/es/ae/aepp.js b/es/ae/aepp.js
@@ -25,8 +25,9 @@
 import Ae from './'
 import Aens from './aens'
 import Rpc from '../rpc/client'
+import { ContractAPI } from './contract'
+import Oracle from './oracle'
 import GeneralizeAccount from '../contract/ga'
-import { Contract } from './contract'
 
 /**
  * Aepp Stamp
@@ -40,6 +41,6 @@ import { Contract } from './contract'
  * @param {Object} [options={}] - Initializer object
  * @return {Object} Aepp instance
  */
-const Aepp = Ae.compose(Contract, Aens, GeneralizeAccount, Rpc)
+const Aepp = Ae.compose(ContractAPI, Aens, Oracle, GeneralizeAccount, Rpc)
 
 export default Aepp
diff --git a/es/ae/contract.js b/es/ae/contract.js
@@ -34,6 +34,7 @@ import ContractCompilerAPI from '../contract/compiler'
 import ContractBase from '../contract'
 import ContractACI from '../contract/aci'
 import BigNumber from 'bignumber.js'
+import NodePool from '../node-pool'
 
 /**
  * Handle contract call error
@@ -293,7 +294,7 @@ async function contractCompile (source, options = {}) {
  * const client = await ContractWithAe({ url, internalUrl, compilerUrl, keypair, ... })
  *
  */
-export const Contract = Ae.compose(ContractBase, ContractACI, {
+export const ContractAPI = Ae.compose(ContractBase, ContractACI, {
   methods: {
     contractCompile,
     contractCallStatic,
@@ -317,6 +318,6 @@ export const Contract = Ae.compose(ContractBase, ContractACI, {
   }
 })
 
+export const Contract = ContractAPI.compose(NodePool)
 export const ContractWithCompiler = Contract.compose(ContractCompilerAPI)
-
 export default ContractWithCompiler
diff --git a/es/ae/universal.js b/es/ae/universal.js
@@ -30,6 +30,7 @@ import Oracle from './oracle'
 import GeneralizeAccount from '../contract/ga'
 import Accounts from '../accounts'
 import Contract from './contract'
+import NodePool from '../node-pool'
 
 /**
  * Universal Stamp
@@ -42,8 +43,7 @@ import Contract from './contract'
  * @param {Object} [options={}] - Initializer object
  * @return {Object} Universal instance
  */
-
-export const Universal = Ae.compose(Accounts, Chain, Transaction, Aens, Contract, Oracle, GeneralizeAccount, {
+export const Universal = Ae.compose(Accounts, Chain, NodePool, Transaction, Aens, Contract, Oracle, GeneralizeAccount, {
   init () {},
   props: { process: {} }
 })

diff --git a/es/ae/wallet.js b/es/ae/wallet.js
@@ -31,6 +31,7 @@ import Rpc from '../rpc/server'
 import * as R from 'ramda'
 import Tx from '../tx/tx'
 import Contract from './contract'
+import NodePool from '../node-pool'
 import GeneralizeAccount from '../contract/ga'
 
 const contains = R.flip(R.contains)
@@ -130,7 +131,7 @@ async function rpcAddress ({ params, session }) {
   onContract: confirm
 })
  */
-const Wallet = Ae.compose(Accounts, Chain, Tx, Contract, GeneralizeAccount, Rpc, {
+const Wallet = Ae.compose(Accounts, Chain, NodePool, Tx, Contract, GeneralizeAccount, Rpc, {
   init ({ onTx = this.onTx, onChain = this.onChain, onAccount = this.onAccount, onContract = this.onContract }, { stamp }) {
     this.onTx = onTx
     this.onChain = onChain

diff --git a/es/chain/index.js b/es/chain/index.js
@@ -24,7 +24,6 @@
 
 import Oracle from '../oracle'
 import { required } from '@stamp/required'
-import { NodePool } from '../node-pool'
 
 /**
  * Basic Chain Stamp
@@ -37,7 +36,7 @@ import { NodePool } from '../node-pool'
  * @param {Object} [options={}] - Initializer object
  * @return {Object} Chain instance
  */
-const Chain = NodePool.compose(Oracle, {
+const Chain = Oracle.compose({
   deepProps: { Chain: { defaults: { waitMined: true } } },
   statics: { waitMined (bool) { return this.deepProps({ Chain: { defaults: { waitMined: bool } } }) } },
   deepConf: {

diff --git a/es/chain/node.js b/es/chain/node.js
@@ -19,6 +19,7 @@ import Chain from './'
 import Oracle from '../oracle/node'
 import formatBalance from '../utils/amount-formatter'
 import TransactionValidator from '../tx/validator'
+import NodePool from '../node-pool'
 
 /**
  * ChainNode module
@@ -187,7 +188,7 @@ async function getName (name) {
  * @return {Object} ChainNode instance
  * @example ChainNode({url: 'https://sdk-testnet.aepps.com/'})
  */
-const ChainNode = Chain.compose(Oracle, TransactionValidator, {
+const ChainNode = Chain.compose(Oracle, TransactionValidator, NodePool, {
   init ({ verifyTx = false }) {
     this.verifyTxBeforeSend = verifyTx
   },

diff --git a/es/oracle/index.js b/es/oracle/index.js
@@ -23,7 +23,7 @@
  */
 
 import { required } from '@stamp/required'
-import { NodePool } from '../node-pool'
+import stampit from '@stamp/it'
 
 /**
  * Basic Oracle Stamp
@@ -37,7 +37,7 @@ import { NodePool } from '../node-pool'
  * @param {Object} [options={}] - Initializer object
  * @return {Object} Oracle instance
  */
-const OracleBase = NodePool.compose({
+const OracleBase = stampit({
   deepConf: {
     Contract: {
       methods: [