Check sponsor saved to deal

Author: james-toussaint

src/Modules/IexecPoco.ts

@@ -22,6 +22,7 @@ import {
 import {
     AccurateContribution,
     FaultyContribution,
+    OrdersMatched,
     SchedulerNotice,
     TaskClaimed,
     TaskConsensus,
@@ -127,13 +128,10 @@ export function handleOrdersMatched(event: OrdersMatchedEvent): void {
     let contract = IexecInterfaceTokenContract.bind(event.address);
     let viewedDeal = contract.viewDeal(event.params.dealid);
 
-    /*
     fetchAccount(viewedDeal.requester.toHex()).save();
     fetchAccount(viewedDeal.beneficiary.toHex()).save();
     fetchAccount(viewedDeal.callback.toHex()).save();
-    */
     let deal = fetchDeal(event.params.dealid.toHex());
-    /*
     deal.app = viewedDeal.app.pointer.toHex();
     deal.appOwner = viewedDeal.app.owner.toHex();
     deal.appPrice = toRLC(viewedDeal.app.price);
@@ -162,9 +160,7 @@ export function handleOrdersMatched(event: OrdersMatchedEvent): void {
     deal.requestorder = event.params.requestHash.toHex();
     deal.timestamp = event.block.timestamp;
     deal.save();
-    */
 
-    /*
     const dataset = deal.dataset;
 
     let apporder = fetchApporder(event.params.appHash.toHex());
@@ -196,7 +192,6 @@ export function handleOrdersMatched(event: OrdersMatchedEvent): void {
     protocol.dealsCount = protocol.dealsCount.plus(BigInt.fromI32(1));
     protocol.tasksCount = protocol.tasksCount.plus(deal.botSize);
     protocol.save();
-    */
 }
 
 export function handleSchedulerNotice(event: SchedulerNoticeEvent): void {

test/Modules/IexecPoco.test.ts

@@ -3,6 +3,7 @@
 
 import { Address, BigInt, Bytes, ethereum } from '@graphprotocol/graph-ts';
 import {
+    assert,
     createMockedFunction,
     describe,
     newTypedMockEventWithParams,
@@ -17,6 +18,10 @@ describe('IexecPoco', () => {
         const dealId = Bytes.fromHexString(
             '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
         );
+        const appHash = dealId;
+        const datasetHash = dealId;
+        const workerpoolHash = dealId;
+        const requestHash = dealId;
         const sponsor = Address.fromString('0xabcdef1234567890abcdef1234567890abcdef12');
         const timestamp = BigInt.fromI32(123456789);
         const assetAddress = Address.fromString('0x90cBa2Bbb19ecc291A12066Fd8329D65FA1f1947');
@@ -34,56 +39,65 @@ describe('IexecPoco', () => {
             .withArgs([ethereum.Value.fromFixedBytes(dealId)])
             .returns([
                 ethereum.Value.fromTuple(
-                    // app
                     changetype<ethereum.Tuple>([
-                        ethereum.Value.fromAddress(assetAddress),
-                        ethereum.Value.fromAddress(assetOwner),
-                        ethereum.Value.fromI32(assetPrice),
+                        ethereum.Value.fromTuple(
+                            // app
+                            changetype<ethereum.Tuple>([
+                                ethereum.Value.fromAddress(assetAddress),
+                                ethereum.Value.fromAddress(assetOwner),
+                                ethereum.Value.fromI32(assetPrice),
+                            ]),
+                        ),
+                        ethereum.Value.fromTuple(
+                            // dataset
+                            changetype<ethereum.Tuple>([
+                                ethereum.Value.fromAddress(assetAddress),
+                                ethereum.Value.fromAddress(assetOwner),
+                                ethereum.Value.fromI32(assetPrice),
+                            ]),
+                        ),
+                        ethereum.Value.fromTuple(
+                            // workerpool
+                            changetype<ethereum.Tuple>([
+                                ethereum.Value.fromAddress(assetAddress),
+                                ethereum.Value.fromAddress(assetOwner),
+                                ethereum.Value.fromI32(assetPrice),
+                            ]),
+                        ),
+                        ethereum.Value.fromI32(uint256), // trust
+                        ethereum.Value.fromI32(uint256), // category
+                        ethereum.Value.fromFixedBytes(bytes32), // tag
+                        ethereum.Value.fromAddress(address), // requester
+                        ethereum.Value.fromAddress(address), // beneficiary
+                        ethereum.Value.fromAddress(address), // callback
+                        ethereum.Value.fromString(string), // params
+                        ethereum.Value.fromI32(uint256), // startTime
+                        ethereum.Value.fromI32(uint256), // botFirst
+                        ethereum.Value.fromI32(uint256), // botSize
+                        ethereum.Value.fromI32(uint256), // workerStake
+                        ethereum.Value.fromI32(uint256), // schedulerRewardRatio
+                        ethereum.Value.fromAddress(sponsor), // sponsor
                     ]),
                 ),
-                ethereum.Value.fromTuple(
-                    // dataset
-                    changetype<ethereum.Tuple>([
-                        ethereum.Value.fromAddress(assetAddress),
-                        ethereum.Value.fromAddress(assetOwner),
-                        ethereum.Value.fromI32(assetPrice),
-                    ]),
-                ),
-                ethereum.Value.fromTuple(
-                    // workerpool
-                    changetype<ethereum.Tuple>([
-                        ethereum.Value.fromAddress(assetAddress),
-                        ethereum.Value.fromAddress(assetOwner),
-                        ethereum.Value.fromI32(assetPrice),
-                    ]),
-                ),
-                ethereum.Value.fromI32(uint256), // trust
-                ethereum.Value.fromI32(uint256), // category
-                ethereum.Value.fromFixedBytes(bytes32), // tag
-                ethereum.Value.fromAddress(address), // requester
-                ethereum.Value.fromAddress(address), // beneficiary
-                ethereum.Value.fromAddress(address), // callback
-                ethereum.Value.fromString(string), // params
-                ethereum.Value.fromI32(uint256), // startTime
-                ethereum.Value.fromI32(uint256), // botFirst
-                ethereum.Value.fromI32(uint256), // botSize
-                ethereum.Value.fromI32(uint256), // workerStake
-                ethereum.Value.fromI32(uint256), // schedulerRewardRatio
-                ethereum.Value.fromAddress(address), // sponsor
             ]);
 
         // Create the mock event
         let mockEvent = newTypedMockEventWithParams<OrdersMatched>([
-            new ethereum.EventParam('deal', ethereum.Value.fromFixedBytes(dealId)),
+            new ethereum.EventParam('dealid', ethereum.Value.fromFixedBytes(dealId)),
+            new ethereum.EventParam('appHash', ethereum.Value.fromFixedBytes(appHash)),
+            new ethereum.EventParam('datasetHash', ethereum.Value.fromFixedBytes(datasetHash)),
+            new ethereum.EventParam(
+                'workerpoolHash',
+                ethereum.Value.fromFixedBytes(workerpoolHash),
+            ),
+            new ethereum.EventParam('requestHash', ethereum.Value.fromFixedBytes(requestHash)),
         ]);
         mockEvent.block.timestamp = timestamp;
         mockEvent.address = pocoProxyAddress;
 
         // Call the handler
         handleOrdersMatched(mockEvent);
 
-        /*
-
         // Assert that the OrdersMatched entity was created and has correct fields
         const entityId = mockEvent.block.number
             .toString()
@@ -98,7 +112,6 @@ describe('IexecPoco', () => {
         // Assert that a transaction was logged (if applicable)
         const transactionId = mockEvent.transaction.hash.toHex();
         assert.fieldEquals('Transaction', transactionId, 'id', transactionId);
-        */
     });
 });