From 357716258f254593ac2fc6195c694be2fa0a8896 Mon Sep 17 00:00:00 2001
From: Nam Chu Hoai <nambrot@googlemail.com>
Date: Wed, 13 Nov 2019 16:16:40 -0800
Subject: [PATCH 1/2] Change the event we emit when selecting issuers

---
 .../contracts/identity/Attestations.sol       | 16 ++++++------
 .../protocol/test/identity/attestations.ts    | 26 ++++++++++---------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/packages/protocol/contracts/identity/Attestations.sol b/packages/protocol/contracts/identity/Attestations.sol
index 1551fe80c10..8bf89016537 100644
--- a/packages/protocol/contracts/identity/Attestations.sol
+++ b/packages/protocol/contracts/identity/Attestations.sol
@@ -98,7 +98,7 @@ contract Attestations is
   event AttestationIssuersSelected(
     bytes32 indexed identifier,
     address indexed account,
-    uint256 attestationsRequested,
+    address indexed issuer,
     address attestationRequestFeeToken
   );
 
@@ -204,13 +204,6 @@ contract Attestations is
     );
 
     addIncompleteAttestations(identifier);
-    emit AttestationIssuersSelected(
-      identifier,
-      msg.sender,
-      state.unselectedRequests[msg.sender].attestationsRequested,
-      state.unselectedRequests[msg.sender].attestationRequestFeeToken
-    );
-
     delete state.unselectedRequests[msg.sender];
   }
 
@@ -590,6 +583,13 @@ contract Attestations is
       attestation.blockNumber = unselectedRequest.blockNumber;
       attestation.attestationRequestFeeToken = unselectedRequest.attestationRequestFeeToken;
       state.selectedIssuers.push(issuer);
+
+      emit AttestationIssuersSelected(
+        identifier,
+        msg.sender,
+        issuer,
+        unselectedRequest.attestationRequestFeeToken
+      );
     }
   }
 
diff --git a/packages/protocol/test/identity/attestations.ts b/packages/protocol/test/identity/attestations.ts
index 6b712d66c50..6cc22d0c2ba 100644
--- a/packages/protocol/test/identity/attestations.ts
+++ b/packages/protocol/test/identity/attestations.ts
@@ -459,19 +459,21 @@ contract('Attestations', (accounts: string[]) => {
           assertEqualBN(actualAttestationsRequested, 0)
         })
 
-        it('should emit the AttestationIssuersSelected event', async () => {
+        it('should emit the AttestationIssuerSelected event', async () => {
           const response = await attestations.selectIssuers(phoneHash)
-
-          assert.lengthOf(response.logs, 1)
-          const event = response.logs[0]
-          assertLogMatches2(event, {
-            event: 'AttestationIssuersSelected',
-            args: {
-              identifier: phoneHash,
-              account: caller,
-              attestationsRequested: new BigNumber(attestationsRequested),
-              attestationRequestFeeToken: mockStableToken.address,
-            },
+          const issuers = await attestations.getAttestationIssuers(phoneHash, caller)
+          assert.lengthOf(response.logs, 3)
+
+          issuers.forEach((issuer, index) => {
+            assertLogMatches2(response.logs[index], {
+              event: 'AttestationIssuersSelected',
+              args: {
+                identifier: phoneHash,
+                account: caller,
+                issuer,
+                attestationRequestFeeToken: mockStableToken.address,
+              },
+            })
           })
         })
 

From 985c70257b891747d415edfcd53791e0c7ed6cee Mon Sep 17 00:00:00 2001
From: Nam Chu Hoai <nambrot@googlemail.com>
Date: Thu, 14 Nov 2019 10:32:21 -0800
Subject: [PATCH 2/2] Singularize name

---
 packages/protocol/contracts/identity/Attestations.sol | 4 ++--
 packages/protocol/test/identity/attestations.ts       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/protocol/contracts/identity/Attestations.sol b/packages/protocol/contracts/identity/Attestations.sol
index 8bf89016537..c3758e906b0 100644
--- a/packages/protocol/contracts/identity/Attestations.sol
+++ b/packages/protocol/contracts/identity/Attestations.sol
@@ -95,7 +95,7 @@ contract Attestations is
     address attestationRequestFeeToken
   );
 
-  event AttestationIssuersSelected(
+  event AttestationIssuerSelected(
     bytes32 indexed identifier,
     address indexed account,
     address indexed issuer,
@@ -584,7 +584,7 @@ contract Attestations is
       attestation.attestationRequestFeeToken = unselectedRequest.attestationRequestFeeToken;
       state.selectedIssuers.push(issuer);
 
-      emit AttestationIssuersSelected(
+      emit AttestationIssuerSelected(
         identifier,
         msg.sender,
         issuer,
diff --git a/packages/protocol/test/identity/attestations.ts b/packages/protocol/test/identity/attestations.ts
index 6cc22d0c2ba..ebed62fd29a 100644
--- a/packages/protocol/test/identity/attestations.ts
+++ b/packages/protocol/test/identity/attestations.ts
@@ -466,7 +466,7 @@ contract('Attestations', (accounts: string[]) => {
 
           issuers.forEach((issuer, index) => {
             assertLogMatches2(response.logs[index], {
-              event: 'AttestationIssuersSelected',
+              event: 'AttestationIssuerSelected',
               args: {
                 identifier: phoneHash,
                 account: caller,