oceanprotocol
/
ocean-subgraph
mirror of https://github.com/oceanprotocol/ocean-subgraph.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix dt tests. Added logs for provider fee. Need fix for Simple publish and consume tests.

This commit is contained in:
Maria Carmina 2023-03-22 21:13:51 +02:00
parent 19bd3f6cb7
commit ef2264c4bf
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mappings/erc20Templates.ts
View File

@ -28,7 +28,7 @@ export function handleOrderStarted(event: OrderStarted): void {
event.transaction.hash.toHex(),
event.address.toHex(),
event.transaction.from.toHex(),
BigInt.fromI32(event.logIndex).toI32()
event.logIndex.toI32().toString()
)
)
@ -90,7 +90,6 @@ export function handleOrderStarted(event: OrderStarted): void {
order.gasPrice = BigInt.zero()
}
order.save()
token.orders.concat(order.id)
token.save()
addOrder()
if (token.nft) {
@ -110,14 +109,14 @@ export function handlerOrderReused(event: OrderReused): void {
event.params.orderTxId.toHexString(),
event.address.toHex(),
event.params.caller.toHex(),
parseInt(event.logIndex.toString())
event.logIndex.toI32().toString()
)
const order = Order.load(orderId)
if (!order) return
const reuseOrder = new OrderReuse(
`${event.transaction.hash.toHex()}-${parseInt(event.logIndex.toString())}`
`${event.transaction.hash.toHex()}-${event.logIndex.toI32().toString()}`
)
if (event.transaction.gasPrice)
reuseOrder.gasPrice = event.transaction.gasPrice
@ -253,7 +252,7 @@ export function handleProviderFee(event: ProviderFee): void {
event.transaction.hash.toHex(),
event.address.toHex(),
event.transaction.from.toHex(),
parseInt(event.logIndex.toString())
event.logIndex.toI32().toString()
)
const order = Order.load(orderId)
@ -265,14 +264,18 @@ export function handleProviderFee(event: ProviderFee): void {
return
}
let orderReuse = OrderReuse.load(event.transaction.hash.toHex())
let orderReuse = OrderReuse.load(
`${event.transaction.hash.toHex()}-${event.logIndex.toI32().toString()}`
)
if (orderReuse) {
orderReuse.providerFee = providerFee
orderReuse.providerFeeValidUntil = event.params.validUntil
orderReuse.eventIndex = event.logIndex.toI32()
orderReuse.save()
} else {
orderReuse = new OrderReuse(event.transaction.hash.toHex())
orderReuse = new OrderReuse(
`${event.transaction.hash.toHex()}-${event.logIndex.toI32().toString()}`
)
orderReuse.providerFee = providerFee
orderReuse.providerFeeValidUntil = event.params.validUntil
orderReuse.order = orderId

4
src/mappings/utils/orderUtils.ts
View File

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

8
test/integration/Datatoken.test.ts
View File

@ -423,9 +423,7 @@ describe('Datatoken tests', async () => {
setProviderFee
)
assert(orderTx, 'Invalid orderTx')
const orderId = `${orderTx.transactionHash.toLowerCase()}-${newDtAddress.toLowerCase()}-${user1.toLowerCase()}-${
orderTx.events.OrderStarted.logIndex
}`
const orderId = `${orderTx.transactionHash.toLowerCase()}-${newDtAddress.toLowerCase()}-${user1.toLowerCase()}-${orderTx.events.OrderStarted.logIndex.toString()}`
await sleep(3000)
response = await fetch(subgraphUrl, {
@ -435,15 +433,13 @@ 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')
assert(token.orders[0].id === orderId)
assert(token.orders[0].lastPriceToken.id === ZERO_ADDRESS)
assert(token.orders[0].nftOwner.id === publisher, 'invalid nftOwner')
assert(token.orders[0].eventIndex === 1, 'invalid order eventIndex')
assert(token.orders[0].eventIndex === 0, 'invalid order eventIndex')
assert(token.eventIndex !== null, 'Invalid eventIndex')
assert(
token.eventIndex !== token.orders[0].eventIndex,

15
test/integration/SimplePublishConsume.test.ts
View File

@ -306,9 +306,8 @@ describe('Simple Publish & consume test', async () => {
1,
setProviderFee
)
const orderId = `${orderTx.transactionHash.toLowerCase()}-${datatokenAddress.toLowerCase()}-${user1.toLowerCase()}-${
orderTx.events.OrderStarted.logIndex
}`
console.log('orderTx: ', orderTx)
const orderId = `${orderTx.transactionHash.toLowerCase()}-${datatokenAddress.toLowerCase()}-${user1.toLowerCase()}-${orderTx.events.OrderStarted.logIndex.toString()}`
const query = {
query: `query {order(id:"${orderId}"){id, providerFee, lastPriceToken{id}, eventIndex}}`
@ -321,8 +320,10 @@ describe('Simple Publish & consume test', async () => {
})
await sleep(3000)
const queryResult = await response.json()
console.log('queryResult: ', queryResult)
const providerFeeJSON = JSON.parse(queryResult.data.order.providerFee)
console.log('provider fee: ', providerFeeJSON)
const lastPriceToken = queryResult.data.order.lastPriceToken.id
assert(lastPriceToken === ZERO_ADDRESS, 'Wrong lastPriceToken')
@ -387,9 +388,7 @@ describe('Simple Publish & consume test', async () => {
assert(orderTx.transactionHash, 'Failed to start order')
// Check initial provider fee has been set correctly
const orderId = `${orderTx.transactionHash.toLowerCase()}-${datatokenAddress.toLowerCase()}-${user4.toLowerCase()}-${
orderTx.events.OrderStarted.logIndex
}`
const orderId = `${orderTx.transactionHash.toLowerCase()}-${datatokenAddress.toLowerCase()}-${user4.toLowerCase()}-${orderTx.events.OrderStarted.logIndex.toString()}`
const initialQuery = {
query: `query {order(id:"${orderId}"){id, providerFee, lastPriceToken{id}, eventIndex}}`
@ -467,7 +466,9 @@ describe('Simple Publish & consume test', async () => {
// Check the new provider fee has been set in OrderReuse
const reuseQuery = {
query: `query {orderReuse(id:"${reusedOrder.transactionHash}-${reusedOrder.events.OrderReused.logIndex}"){id, providerFee, eventIndex}}`
query: `query {orderReuse(id:"${
reusedOrder.transactionHash
}-${reusedOrder.events.OrderReused.logIndex.toString()}"){id, providerFee, eventIndex}}`
}
await sleep(2000)