From 7e7134b99d3f591acf53bc294def303aa1fb0169 Mon Sep 17 00:00:00 2001
From: Mark Spanbroek <mark@spanbroek.net>
Date: Mon, 21 Feb 2022 14:18:28 +0100
Subject: [PATCH] Allow events to be filtered by request id

---
 contracts/Marketplace.sol | 10 +++++-----
 test/Marketplace.test.js  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contracts/Marketplace.sol b/contracts/Marketplace.sol
index 4f00c1c..669383c 100644
--- a/contracts/Marketplace.sol
+++ b/contracts/Marketplace.sol
@@ -56,7 +56,7 @@ contract Marketplace is Collateral {
 
     _lock(msg.sender, offer.requestId);
 
-    emit StorageOffered(id, offer);
+    emit StorageOffered(id, offer, offer.requestId);
   }
 
   function selectOffer(bytes32 id) public marketplaceInvariant {
@@ -82,7 +82,7 @@ contract Marketplace is Collateral {
     funds.balance -= difference;
     token.transfer(request.client, difference);
 
-    emit OfferSelected(id);
+    emit OfferSelected(id, offer.requestId);
   }
 
   struct Request {
@@ -108,9 +108,9 @@ contract Marketplace is Collateral {
     uint256 expiry;
   }
 
-  event StorageRequested(bytes32 id, Request request);
-  event StorageOffered(bytes32 id, Offer offer);
-  event OfferSelected(bytes32 id);
+  event StorageRequested(bytes32 requestId, Request request);
+  event StorageOffered(bytes32 offerId, Offer offer, bytes32 indexed requestId);
+  event OfferSelected(bytes32 offerId, bytes32 indexed requestId);
 
   modifier marketplaceInvariant() {
     MarketplaceFunds memory oldFunds = funds;
diff --git a/test/Marketplace.test.js b/test/Marketplace.test.js
index ed5a41b..1ed2526 100644
--- a/test/Marketplace.test.js
+++ b/test/Marketplace.test.js
@@ -88,7 +88,7 @@ describe("Marketplace", function () {
     it("emits event when storage is offered", async function () {
       await expect(marketplace.offerStorage(offer))
         .to.emit(marketplace, "StorageOffered")
-        .withArgs(offerId(offer), offerToArray(offer))
+        .withArgs(offerId(offer), offerToArray(offer), requestId(request))
     })
 
     it("locks collateral of host", async function () {
@@ -166,7 +166,7 @@ describe("Marketplace", function () {
     it("emits event when offer is selected", async function () {
       await expect(marketplace.selectOffer(offerId(offer)))
         .to.emit(marketplace, "OfferSelected")
-        .withArgs(offerId(offer))
+        .withArgs(offerId(offer), requestId(request))
     })
 
     it("returns price difference to client", async function () {