Remove OracleNodeAPI wrapper

es/ae/oracle.js

@@ -44,8 +44,8 @@ import { ORACLE_TTL, QUERY_FEE, QUERY_TTL, RESPONSE_TTL } from '../tx/builder/sc
  * @return {Promise<Object>} Oracle object
  */
 async function getOracleObject (oracleId) {
-  const oracle = await this.getOracle(oracleId)
-  const { oracleQueries: queries } = await this.getOracleQueries(oracleId)
+  const oracle = await this.api.getOracleByPubkey(oracleId)
+  const { oracleQueries: queries } = await this.api.getOracleQueriesByPubkey(oracleId)
   return {
     ...oracle,
     queries,
@@ -72,7 +72,7 @@ async function getOracleObject (oracleId) {
 function pollForQueries (oracleId, onQuery, { interval = 5000 } = {}) {
   const knownQueryIds = new Set()
   const checkNewQueries = async () => {
-    const queries = ((await this.getOracleQueries(oracleId)).oracleQueries || [])
+    const queries = ((await this.api.getOracleQueriesByPubkey(oracleId)).oracleQueries || [])
       .filter(({ id }) => !knownQueryIds.has(id))
     queries.forEach(({ id }) => knownQueryIds.add(id))
     if (queries.length) onQuery(queries)
@@ -95,7 +95,7 @@ function pollForQueries (oracleId, onQuery, { interval = 5000 } = {}) {
  * @return {Promise<Object>} OracleQuery object
  */
 async function getQueryObject (oracleId, queryId) {
-  const q = await this.getOracleQuery(oracleId, queryId)
+  const q = await this.api.getOracleQueryByPubkeyAndQueryId(oracleId, queryId)
   return {
     ...q,
     decodedQuery: decodeBase64Check(q.query.slice(3)).toString(),
@@ -122,7 +122,7 @@ async function getQueryObject (oracleId, queryId) {
 export async function pollForQueryResponse (oracleId, queryId, { attempts = 20, interval = 5000 } = {}) {
   for (let i = 0; i < attempts; i++) {
     if (i) await pause(interval)
-    const { response } = await this.getOracleQuery(oracleId, queryId)
+    const { response } = await this.api.getOracleQueryByPubkeyAndQueryId(oracleId, queryId)
     const responseBuffer = decodeBase64Check(assertedType(response, 'or'))
     if (responseBuffer.length) {
       return { response, decode: () => responseBuffer } // TODO: Return just responseBuffer

es/chain/index.js

@@ -22,7 +22,7 @@
  * @example import Chain from '@aeternity/aepp-sdk/es/chain'
  */
 
-import Oracle from '../oracle'
+import stampit from '@stamp/it'
 import { required } from '@stamp/required'
 
 /**
@@ -36,7 +36,7 @@ import { required } from '@stamp/required'
  * @param {Object} [options={}] - Initializer object
  * @return {Object} Chain instance
  */
-const Chain = Oracle.compose({
+const Chain = stampit({
   deepProps: { Ae: { defaults: { waitMined: true } } },
   statics: { waitMined (bool) { return this.deepProps({ Ae: { defaults: { waitMined: bool } } }) } }
 }, required({

es/chain/node.js

@@ -17,7 +17,6 @@
 import * as R from 'ramda'
 
 import Chain from './'
-import Oracle from '../oracle/node'
 import { AE_AMOUNT_FORMATS, formatAmount } from '../utils/amount-formatter'
 import TransactionValidator from '../tx/validator'
 import NodePool from '../node-pool'
@@ -229,7 +228,7 @@ async function resolveName (nameOrId, prefix, { verify = false, resolveByNode =
  * @return {Object} ChainNode instance
  * @example ChainNode({url: 'https://testnet.aeternity.io/'})
  */
-const ChainNode = Chain.compose(Oracle, TransactionValidator, NodePool, {
+const ChainNode = Chain.compose(TransactionValidator, NodePool, {
   init ({ verifyTx = true }) {
     this.verifyTxBeforeSend = verifyTx
   },

es/index.js

@@ -44,7 +44,6 @@ import ContractCompilerAPI from './contract/compiler'
 import RpcAepp from './ae/aepp'
 import RpcWallet from './ae/wallet'
 import Oracle from './ae/oracle'
-import OracleNodeAPI from './oracle/node'
 import Selector from './account/selector'
 import Channel from './channel'
 import Universal from './ae/universal'
@@ -75,7 +74,6 @@ export {
   Node,
   NodePool,
   Oracle,
-  OracleNodeAPI,
   Selector,
   Transaction,
   TransactionValidator,

test/integration/transaction.js

@@ -201,22 +201,22 @@ describe('Native Transaction', function () {
     txFromAPI.should.be.equal(nativeTx)
     await clientNative.send(nativeTx, { verify: true })
 
-    const oId = (await client.getOracle(oracleId)).id
+    const oId = (await client.api.getOracleByPubkey(oracleId)).id
     oId.should.be.equal(oracleId)
   })
 
   it('native build of oracle extends tx', async () => {
     const callerId = await client.address()
     const params = { oracleId, callerId, oracleTtl }
-    const orTtl = (await client.getOracle(oracleId)).ttl
+    const orTtl = (await client.api.getOracleByPubkey(oracleId)).ttl
 
     const txFromAPI = await client.oracleExtendTx(params)
     const nativeTx = await clientNative.oracleExtendTx(params)
 
     txFromAPI.should.be.equal(nativeTx)
 
     await client.send(nativeTx)
-    const orNewTtl = (await client.getOracle(oracleId)).ttl
+    const orNewTtl = (await client.api.getOracleByPubkey(oracleId)).ttl
     orNewTtl.should.be.equal(orTtl + oracleTtl.value)
   })
 
@@ -233,7 +233,7 @@ describe('Native Transaction', function () {
 
     await client.send(nativeTx)
 
-    const oracleQuery = (await client.getOracleQuery(oracleId, queryId))
+    const oracleQuery = (await client.api.getOracleQueryByPubkeyAndQueryId(oracleId, queryId))
     oracleQuery.id.should.be.equal(queryId)
   })
 
@@ -247,7 +247,7 @@ describe('Native Transaction', function () {
 
     await client.send(nativeTx)
 
-    const orQuery = (await client.getOracleQuery(oracleId, queryId))
+    const orQuery = (await client.api.getOracleQueryByPubkeyAndQueryId(oracleId, queryId))
     orQuery.response.should.be.equal(`or_${encodeBase64Check(queryResponse)}`)
   })
   it('Get next account nonce', async () => {