Fix tests for orders part. Removed logs.

src/mappings/erc20Templates.ts

@@ -117,7 +117,6 @@ export function handleOrderStarted(event: OrderStarted): void {
 }
 
 export function handlerOrderReused(event: OrderReused): void {
-  log.info('searched order tx: {}', [event.params.orderTxId.toHexString()])
   const order = searchOrderForEvent(
     event.params.orderTxId.toHexString(),
     event.address.toHex(),
@@ -126,11 +125,10 @@ export function handlerOrderReused(event: OrderReused): void {
   )
 
   if (!order) return
-
-  log.info('found order id after searching: {}', [order.id])
+  const eventIndex: number = event.logIndex.toI32()
 
   const reuseOrder = new OrderReuse(
-    `${event.transaction.hash.toHex()}-${event.logIndex.toI32()}`
+    `${event.transaction.hash.toHex()}-${eventIndex}`
   )
   if (event.transaction.gasPrice)
     reuseOrder.gasPrice = event.transaction.gasPrice
@@ -262,9 +260,6 @@ export function handleProviderFee(event: ProviderFee): void {
   }", "r": "${event.params.r.toHexString()}", "s": "${event.params.s.toHexString()}", "validUntil": "${
     event.params.validUntil
   }"}`
-  log.info('event address in provider fee handler: {}', [
-    event.address.toHexString()
-  ])
 
   const order = searchOrderForEvent(
     event.transaction.hash.toHex(),
@@ -273,14 +268,7 @@ export function handleProviderFee(event: ProviderFee): void {
     event.logIndex.toI32()
   )
 
-  // const orderReuse = searchOrderReusedForEvent(
-  //   event.transaction.hash.toHex(),
-  //   event.address.toHex(),
-  //   event.logIndex.toI32()
-  // )
-
   if (order) {
-    log.info('order id in provider fee handler: {}', [order.id])
     order.providerFee = providerFee
     order.providerFeeValidUntil = event.params.validUntil
     order.save()
@@ -297,37 +285,4 @@ export function handleProviderFee(event: ProviderFee): void {
     orderReuse.providerFeeValidUntil = event.params.validUntil
     orderReuse.save()
   }
-  // if (order) {
-  //   order.providerFee = providerFee
-  //   order.providerFeeValidUntil = event.params.validUntil
-  //   order.save()
-  //   return
-  // }
-
-  // let orderReuse = searchOrderReusedForEvent(
-  //   event.transaction.hash.toHex(),
-  //   event.address.toHex(),
-  //   event.logIndex.toI32()
-  // )
-  // if (orderReuse) {
-  //   orderReuse.providerFee = providerFee
-  //   orderReuse.providerFeeValidUntil = event.params.validUntil
-  //   orderReuse.save()
-  // } else {
-  //   orderReuse = new OrderReuse(event.transaction.hash.toHex())
-  //   orderReuse.providerFee = providerFee
-  //   orderReuse.providerFeeValidUntil = event.params.validUntil
-  //   orderReuse.order = order!.id
-  //   orderReuse.createdTimestamp = event.block.timestamp.toI32()
-  //   orderReuse.tx = event.transaction.hash.toHex()
-  //   orderReuse.block = event.block.number.toI32()
-  //   orderReuse.caller = event.transaction.from.toHex()
-  //   if (event.transaction.gasPrice)
-  //     orderReuse.gasPrice = event.transaction.gasPrice
-  //   else orderReuse.gasPrice = BigInt.zero()
-  //   if (event.receipt !== null && event.receipt!.gasUsed) {
-  //     orderReuse.gasUsed = event.receipt!.gasUsed.toBigDecimal()
-  //   } else orderReuse.gasUsed = BigDecimal.zero()
-  //   orderReuse.save()
-  // }
 }

src/mappings/utils/orderUtils.ts

@@ -1,5 +1,4 @@
 import { Order, OrderReuse } from '../../@types/schema'
-import { log } from '@graphprotocol/graph-ts'
 
 export function getOrderId(
   tx: string,
@@ -40,25 +39,10 @@ export function searchOrderForEvent(
   transactionFrom: string,
   eventIndex: number
 ): Order | null {
-  for (let i = eventIndex - 1; i >= 0; i--) {
-    log.info('i for order started: {}', [i.toString()])
+  for (let i = eventIndex; i >= 0; i--) {
     const orderId = getOrderId(transactionHash, address, transactionFrom, i)
-    log.info('trying with this orderId: {}', [orderId])
     const order = Order.load(orderId)
-    log.info('loaded order with this orderId: {}', [orderId])
-    if (order) {
-      log.info('order with this orderId: {}', [order.id])
-      log.info('found order datatoken: {} and event address: {}', [
-        order.datatoken,
-        address
-      ])
-    }
     if (order && order.datatoken == address) {
-      log.info('found order datatoken: {} and event address: {}', [
-        order.datatoken,
-        address
-      ])
-      log.info('found order, exit searching: {}', [order.id])
       return order
     }
   }
@@ -70,28 +54,14 @@ export function searchOrderReusedForEvent(
   eventAddress: string,
   eventIndex: number
 ): OrderReuse | null {
-  for (let i = eventIndex - 1; i >= 0; i--) {
-    log.info('i in order reused: {}', [i.toString()])
-    log.info('transactionHash in order reused: {}', [
-      transactionHash.toString()
-    ])
+  for (let i = eventIndex; i >= 0; i--) {
     const orderReused = OrderReuse.load(`${transactionHash}-${i}`)
-    log.info('loaded order reused with this id: {}', [
-      `${transactionHash}-${i}`
-    ])
     if (!orderReused) {
       continue
     }
-    log.info('found reused order: {} ', [orderReused.id])
-    log.info('loaded reused order with this orderId: {}', [orderReused.order])
     const order = Order.load(orderReused.order)
 
     if (order && order.datatoken == eventAddress) {
-      log.info('found order: {} ', [order.id])
-      log.info('found reused order datatoken: {} and event address: {}', [
-        order.datatoken,
-        eventAddress
-      ])
       return orderReused
     }
   }

test/integration/SimplePublishConsume.test.ts

@@ -400,7 +400,6 @@ describe('Simple Publish & consume test', async () => {
     })
     await sleep(3000)
     const initialQueryResult = await initialResponse.json()
-    console.log('initial query result: ', initialQueryResult)
     const initialProviderFeeJSON = JSON.parse(
       initialQueryResult.data.order.providerFee
     )
@@ -454,7 +453,7 @@ describe('Simple Publish & consume test', async () => {
 
     const reusedOrder = await datatoken.reuseOrder(
       datatokenAddress,
-      user2,
+      user4,
       orderTx.transactionHash,
       setNewProviderFee
     )
@@ -464,28 +463,6 @@ describe('Simple Publish & consume test', async () => {
 
     sleep(4000)
     // Check the new provider fee has been set in OrderReuse
-    console.log('reused order: ', reusedOrder)
-    console.log(
-      'transaction hash for reuse order: ',
-      reusedOrder.transactionHash
-    )
-    console.log('transaction hash for start order: ', orderTx.transactionHash)
-    console.log(
-      'log index for reuse order: ',
-      reusedOrder.events.OrderReused.logIndex
-    )
-    console.log(
-      'log index for start order: ',
-      orderTx.events.OrderStarted.logIndex
-    )
-    console.log(
-      'log index for reuse order provider fees: ',
-      reusedOrder.events.ProviderFee.logIndex
-    )
-    console.log(
-      'log index for start order provider fees: ',
-      orderTx.events.ProviderFee.logIndex
-    )
 
     const reuseQuery = {
       query: `query {orderReuse(id:"${
@@ -494,7 +471,6 @@ describe('Simple Publish & consume test', async () => {
         1
       )}"){id, providerFee, eventIndex}}`
     }
-    console.log('print query: ', reuseQuery)
 
     await sleep(2000)
     const response = await fetch(subgraphUrl, {
@@ -528,11 +504,11 @@ describe('Simple Publish & consume test', async () => {
       'Invalid eventIndex for reuse order'
     )
     assert(
-      reuseQueryResult.data.orderReuse.eventIndex === 1,
+      reuseQueryResult.data.orderReuse.eventIndex === 0,
       'Invalid reuse order event index'
     )
     assert(
-      initialQueryResult.data.order.eventIndex === 1,
+      initialQueryResult.data.order.eventIndex === 0,
       'Invalid start order event index'
     )
   })