Updated to number type.

src/mappings/erc20Templates.ts

@@ -28,7 +28,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()
     )
   )
 
@@ -109,7 +109,7 @@ export function handlerOrderReused(event: OrderReused): void {
     event.params.orderTxId.toHexString(),
     event.address.toHex(),
     event.params.caller.toHex(),
-    event.logIndex.toI32().toString()
+    event.logIndex.toI32()
   )
   const order = Order.load(orderId)
 
@@ -250,7 +250,7 @@ export function handleProviderFee(event: ProviderFee): void {
     event.transaction.hash.toHex(),
     event.address.toHex(),
     event.transaction.from.toHex(),
-    event.logIndex.toI32().toString()
+    event.logIndex.toI32()
   )
   const order = Order.load(orderId)
 

src/mappings/utils/orderUtils.ts

@@ -4,7 +4,7 @@ export function getOrderId(
   tx: string,
   tokenAddress: string,
   fromAddress: string,
-  eventIndex: string
+  eventIndex: number
 ): string {
   return `${tx}-${tokenAddress}-${fromAddress}-${eventIndex}`
 }
@@ -18,7 +18,7 @@ export function getOrder(
   transactionHash: string,
   address: string,
   transactionFrom: string,
-  eventIndex: string
+  eventIndex: number
 ): Order {
   const orderId = getOrderId(
     transactionHash,

test/integration/Datatoken.test.ts

@@ -423,7 +423,6 @@ describe('Datatoken tests', async () => {
       setProviderFee
     )
     assert(orderTx, 'Invalid orderTx')
-    console.log('event: ', orderTx.events.OrderStarted.logIndex)
     const orderId = `${orderTx.transactionHash.toLowerCase()}-${newDtAddress.toLowerCase()}-${user1.toLowerCase()}-${orderTx.events.OrderStarted.logIndex.toString()}`
 
     await sleep(3000)
@@ -434,6 +433,8 @@ describe('Datatoken tests', async () => {
     await sleep(3000)
 
     const token = (await response.json()).data.token
+    console.log('token.orders[0].id: ', token.orders[0].id)
+    console.log('orderId: ', orderId)
 
     assert(token, 'Invalid token')
     assert(token.orderCount === '1', 'Invalid orderCount after order')