Fixed tests for fees. Added TODOs.

src/mappings/erc20Templates.ts

@@ -145,24 +145,11 @@ export function handlePublishMarketFee(event: PublishMarketFee): void {
   )
 
   if (!order) return
-  log.info('found order: {}', [order.id])
   const publishMarket = getUser(event.params.PublishMarketFeeAddress.toHex())
   order.publishingMarket = publishMarket.id
-  log.info('order.publishingMarket: {}', [
-    event.params.PublishMarketFeeAddress.toHex()
-  ])
 
-  const publishMarketToken = getToken(
-    event.params.PublishMarketFeeAddress,
-    false
-  )
+  const publishMarketToken = getToken(event.params.PublishMarketFeeToken, true)
   order.publishingMarketToken = publishMarketToken.id
-  log.info('order.publishingMarketToken: {}', [
-    event.params.PublishMarketFeeAddress.toHexString()
-  ])
-  log.info('event.params.PublishMarketFeeAmount: {}', [
-    event.params.PublishMarketFeeAmount.toBigDecimal().toString()
-  ])
   order.publishingMarketAmmount = weiToDecimal(
     event.params.PublishMarketFeeAmount.toBigDecimal(),
     publishMarketToken.decimals
@@ -206,18 +193,9 @@ export function handleConsumeMarketFee(event: ConsumeMarketFee): void {
   if (!order) return
   const consumeMarket = getUser(event.params.consumeMarketFeeAddress.toHex())
   order.consumerMarket = consumeMarket.id
-  log.info('order.consumerMarket: {}', [
-    event.params.consumeMarketFeeAddress.toHexString()
-  ])
 
   const consumeMarketToken = getToken(event.params.consumeMarketFeeToken, false)
   order.consumerMarketToken = consumeMarketToken.id
-  log.info('order.consumerMarketToken: {}', [
-    event.params.consumeMarketFeeToken.toHexString()
-  ])
-  log.info('event.params.consumerMarketAmmount: {}', [
-    event.params.consumeMarketFeeAmount.toBigDecimal().toString()
-  ])
   order.consumerMarketAmmount = weiToDecimal(
     event.params.consumeMarketFeeAmount.toBigDecimal(),
     consumeMarketToken.decimals

src/mappings/fixedRateExchange.ts

@@ -166,6 +166,7 @@ export function handleAllowedSwapperChanged(
 
 // TODO: implement market fee, opf fee
 export function handleSwap(event: Swapped): void {
+  // TODO
   const fixedRateId = getFixedRateGraphID(
     event.params.exchangeId.toHexString(),
     event.address

src/mappings/nftUpdate.ts

@@ -55,6 +55,7 @@ export function handleMetadataCreated(event: MetadataCreated): void {
 }
 
 export function handleMetadataUpdated(event: MetadataUpdated): void {
+  // TODO la updates
   const nftAddress = event.address.toHex()
   const nft = Nft.load(nftAddress)
   if (!nft) return

test/integration/Datatoken.test.ts

@@ -337,7 +337,7 @@ describe('Datatoken tests', async () => {
     )
   })
 
-  it('Check datatoken orders are updated correctly after publishing & ordering a datatoken', async () => {
+  it('Check datatoken orders are updated correctly after publishing & ordering a datatoken with fees', async () => {
     // Publish a datatoken for publishingMarketFeeToken
     const nftParams1: NftCreateData = {
       name: 'newNFT1',
@@ -511,11 +511,8 @@ describe('Datatoken tests', async () => {
       'Invalid log indeces'
     )
     const orderQuery = {
-      query: `query {order(id:"${orderId}"){id, publishingMarketAmmount, consumerMarketAmmount, eventIndex}}`
+      query: `query {order(id:"${orderId}"){id, publishingMarket{id}, publishingMarketToken{id}, publishingMarketAmmount, consumerMarket{id}, consumerMarketToken{id}, consumerMarketAmmount, eventIndex}}`
     }
-    // publishingMarket, publishingMarketToken
-    // consumerMarket, consumerMarketToken,
-
     await sleep(3000)
     const orderResponse = await fetch(subgraphUrl, {
       method: 'POST',
@@ -524,7 +521,19 @@ describe('Datatoken tests', async () => {
     await sleep(3000)
     const queryResult = await orderResponse.json()
     const order = queryResult.data.order
+    assert(order.publishingMarket.id === erc20Params.mpFeeAddress.toLowerCase())
+    assert(
+      order.publishingMarketToken.id === erc20Params.feeToken.toLowerCase()
+    )
     assert(order.publishingMarketAmmount === erc20Params.feeAmount)
+    assert(
+      order.consumerMarket.id ===
+        consumeMarketFees.consumeMarketFeeAddress.toLowerCase()
+    )
+    assert(
+      order.consumerMarketToken.id ===
+        consumeMarketFees.consumeMarketFeeToken.toLowerCase()
+    )
     assert(order.consumerMarketAmmount === '0.00000000000002')
   })
 })