Added more logs and other tweaks.

src/mappings/erc20Templates.ts

@@ -32,7 +32,7 @@ export function handleOrderStarted(event: OrderStarted): void {
       event.transaction.hash.toHex(),
       event.address.toHex(),
       event.transaction.from.toHex(),
-      event.logIndex.toI32().toString()
+      event.logIndex.toI32()
     )
   )
 
@@ -119,7 +119,7 @@ export function handlerOrderReused(event: OrderReused): void {
   if (!order) return
 
   const reuseOrder = new OrderReuse(
-    `${event.transaction.hash.toHex()}-${event.logIndex.toI32().toString()}`
+    `${event.transaction.hash.toHex()}-${event.logIndex.toI32()}`
   )
   if (event.transaction.gasPrice)
     reuseOrder.gasPrice = event.transaction.gasPrice

src/mappings/utils/orderUtils.ts

@@ -5,7 +5,7 @@ export function getOrderId(
   tx: string,
   tokenAddress: string,
   fromAddress: string,
-  eventIndex: string
+  eventIndex: number
 ): string {
   return `${tx}-${tokenAddress}-${fromAddress}-${eventIndex}`
 }
@@ -19,7 +19,7 @@ export function getOrder(
   transactionHash: string,
   address: string,
   transactionFrom: string,
-  eventIndex: string
+  eventIndex: number
 ): Order {
   const orderId = getOrderId(
     transactionHash,
@@ -42,30 +42,24 @@ export function searchOrderForEvent(
 ): Order {
   let firstEventIndex = eventIndex - 1
 
-  log.info('firstEventIndex on simple order: {}', [
-    firstEventIndex.toString().replace('0.0', '0')
-  ])
+  log.info('firstEventIndex on simple order: {}', [firstEventIndex.toString()])
   while (firstEventIndex >= 0) {
     const orderId = getOrderId(
       transactionHash,
       address,
       transactionFrom,
-      firstEventIndex.toString().replace('0.0', '0')
+      firstEventIndex
     )
     log.info('orderId as trial: {}', [orderId])
     const order = Order.load(orderId)
     if (order !== null && order.datatoken === address) {
+      log.info('order datatoken: {}', [order.datatoken])
       return order
     }
     firstEventIndex--
   }
   // return a default Order if it cannot find the right one
-  return getOrder(
-    transactionHash,
-    address,
-    transactionFrom,
-    firstEventIndex.toString().replace('0.0', '0')
-  )
+  return getOrder(transactionHash, address, transactionFrom, firstEventIndex)
 }
 
 export function searchOrderResusedForEvent(
@@ -76,20 +70,17 @@ export function searchOrderResusedForEvent(
   let firstEventIndex = eventIndex - 1
   log.info('firstEventIndex on simple order: {}', [firstEventIndex.toString()])
   while (firstEventIndex >= 0) {
-    const orderReused = OrderReuse.load(
-      `${transactionHash}-${firstEventIndex.toString()}`
-    )
-    const order = Order.load(orderReused.order)
-    if (
-      orderReused !== null &&
-      order !== null &&
-      order.datatoken === eventAddress
-    ) {
-      return orderReused
+    const orderReused = OrderReuse.load(`${transactionHash}-${firstEventIndex}`)
+
+    if (orderReused !== null) {
+      const order = Order.load(orderReused.order)
+      if (order !== null && order.datatoken === eventAddress) {
+        return orderReused
+      }
     }
 
     firstEventIndex--
   }
   // return a default Order if it cannot find the right one
-  return new OrderReuse(`${transactionHash}-${firstEventIndex.toString()}`)
+  return new OrderReuse(`${transactionHash}-${firstEventIndex}`)
 }

test/integration/SimplePublishConsume.test.ts

@@ -310,7 +310,9 @@ describe('Simple Publish & consume test', async () => {
     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.toString()}`
+    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,7 +327,9 @@ describe('Simple Publish & consume test', async () => {
     const queryResult = await response.json()
     console.log('queryResult: ', queryResult)
 
-    const orderIdForProviderFees = `${orderTx.transactionHash.toLowerCase()}-${datatokenAddress.toLowerCase()}-${user1.toLowerCase()}-${orderTx.events.ProviderFee.logIndex.toString()}`
+    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}}`