Refactored logic.

.github/workflows/tests.yml

@@ -75,5 +75,5 @@ jobs:
           ADDRESS_FILE: /home/runner/.ocean/ocean-contracts/artifacts/address.json
           BARGE_FOLDER: /home/runner/.ocean/
       - name:  docker logs
-        run: docker logs ocean_graph-node_1 | grep -E -w 'firstEventIndex|trial|order datatoken'
+        run: docker logs ocean_graph-node_1
         if: ${{ failure() }}

src/mappings/utils/orderUtils.ts

@@ -41,8 +41,6 @@ export function searchOrderForEvent(
   eventIndex: number
 ): Order {
   let firstEventIndex = eventIndex - 1
-
-  log.info('firstEventIndex on simple order: {}', [firstEventIndex.toString()])
   while (firstEventIndex >= 0) {
     const orderId = getOrderId(
       transactionHash,
@@ -50,20 +48,13 @@ export function searchOrderForEvent(
       transactionFrom,
       firstEventIndex
     )
-    log.info('orderId as trial: {}', [orderId])
+    log.info('trying with this orderId: {}', [orderId])
     const order = Order.load(orderId)
     if (order !== null && order.datatoken == address) {
-      log.info('order datatoken: {}', [order.datatoken])
-      log.info('event address: {}', [address])
-      log.info('typeof order datatoken: {}', [typeof order.datatoken])
-      log.info('typeof hex event address: {}', [typeof address])
-      // add break
-      // return getOrder(
-      //   transactionHash,
-      //   address,
-      //   transactionFrom,
-      //   firstEventIndex
-      // )
+      log.info('found order datatoken: {} and event address: {}', [
+        order.datatoken,
+        address
+      ])
       return order
     }
     firstEventIndex--
@@ -78,22 +69,22 @@ export function searchOrderResusedForEvent(
   eventIndex: number
 ): OrderReuse {
   let firstEventIndex = eventIndex - 1
-  log.info('firstEventIndex on simple order: {}', [firstEventIndex.toString()])
   while (firstEventIndex >= 0) {
     const orderReused = OrderReuse.load(`${transactionHash}-${firstEventIndex}`)
 
     if (orderReused !== null) {
       const order = Order.load(orderReused.order)
-      if (
-        order !== null &&
-        order.datatoken.toString().toLowerCase() === eventAddress.toLowerCase()
-      ) {
+      if (order !== null && order.datatoken == eventAddress) {
+        log.info('found reused order datatoken: {} and event address: {}', [
+          order.datatoken,
+          eventAddress
+        ])
         return orderReused
       }
     }
 
     firstEventIndex--
   }
-  // return a default Order if it cannot find the right one
+  // return a default OrderReuse if it cannot find the right one
   return new OrderReuse(`${transactionHash}-${firstEventIndex}`)
 }

test/integration/SimplePublishConsume.test.ts

@@ -307,13 +307,9 @@ describe('Simple Publish & consume test', async () => {
       setProviderFee
     )
     await sleep(3000)
-    console.log('orderTx: ', orderTx)
-    console.log('order tx id: ', orderTx.events.OrderStarted.returnValues)
-    console.log('provider fee: ', orderTx.events.ProviderFee.returnValues)
     const orderId = `${orderTx.transactionHash.toLowerCase()}-${datatokenAddress.toLowerCase()}-${user1.toLowerCase()}-${orderTx.events.OrderStarted.logIndex.toFixed(
       1
     )}`
-    console.log('orderId: ', orderId)
     const query = {
       query: `query {order(id:"${orderId}"){id, providerFee, lastPriceToken{id}, eventIndex}}`
     }
@@ -325,30 +321,8 @@ describe('Simple Publish & consume test', async () => {
     })
     await sleep(3000)
     const queryResult = await response.json()
-    console.log('queryResult: ', queryResult)
 
-    const orderIdForProviderFees = `${orderTx.transactionHash.toLowerCase()}-${datatokenAddress.toLowerCase()}-${user1.toLowerCase()}-${orderTx.events.ProviderFee.logIndex.toFixed(
-      1
-    )}`
-    console.log('orderIdForProviderFees: ', orderIdForProviderFees)
-    const queryForProviderFees = {
-      query: `query {order(id:"${orderIdForProviderFees}"){id, providerFee, lastPriceToken{id}, eventIndex}}`
-    }
-
-    await sleep(3000)
-    const responseProviderFees = await fetch(subgraphUrl, {
-      method: 'POST',
-      body: JSON.stringify(queryForProviderFees)
-    })
-    await sleep(3000)
-    const queryResultProviderFees = await responseProviderFees.json()
-
-    console.log('queryResultProviderFees: ', queryResultProviderFees)
-
-    const providerFeeJSON = JSON.parse(
-      queryResultProviderFees.data.order.providerFee
-    )
-    console.log('provider fee: ', providerFeeJSON)
+    const providerFeeJSON = JSON.parse(queryResult.data.order.providerFee)
     const lastPriceToken = queryResult.data.order.lastPriceToken.id
 
     assert(lastPriceToken === ZERO_ADDRESS, 'Wrong lastPriceToken')