From 4d2f8d538cf9954c43b5165f3dea3c5e35ef6faf Mon Sep 17 00:00:00 2001
From: soloseng <102702451+soloseng@users.noreply.github.com>
Date: Thu, 5 Oct 2023 14:09:46 -0400
Subject: [PATCH 1/2] fixed fetch import

---
 .../combiner/test/end-to-end/domain.test.ts                     | 2 +-
 .../phone-number-privacy/combiner/test/end-to-end/pnp.test.ts   | 2 +-
 .../phone-number-privacy/combiner/test/end-to-end/resources.ts  | 1 -
 .../signer/test/end-to-end/disabled-apis.test.ts                | 2 +-
 .../phone-number-privacy/signer/test/end-to-end/domain.test.ts  | 2 +-
 .../phone-number-privacy/signer/test/end-to-end/pnp.test.ts     | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/phone-number-privacy/combiner/test/end-to-end/domain.test.ts b/packages/phone-number-privacy/combiner/test/end-to-end/domain.test.ts
index 6ce612b02..57ad88bb4 100644
--- a/packages/phone-number-privacy/combiner/test/end-to-end/domain.test.ts
+++ b/packages/phone-number-privacy/combiner/test/end-to-end/domain.test.ts
@@ -30,7 +30,7 @@ import {
 } from '@celo/phone-number-privacy-common'
 import { defined, noNumber, noString } from '@celo/utils/lib/sign-typed-data-utils'
 import * as crypto from 'crypto'
-import 'isomorphic-fetch'
+import fetch from 'node-fetch'
 import { getCombinerVersion } from '../../src'
 import { getTestContextName } from './resources'
 
diff --git a/packages/phone-number-privacy/combiner/test/end-to-end/pnp.test.ts b/packages/phone-number-privacy/combiner/test/end-to-end/pnp.test.ts
index 63f01d172..a52a9563a 100644
--- a/packages/phone-number-privacy/combiner/test/end-to-end/pnp.test.ts
+++ b/packages/phone-number-privacy/combiner/test/end-to-end/pnp.test.ts
@@ -13,7 +13,7 @@ import {
 import { normalizeAddressWith0x } from '@celo/utils/lib/address'
 import threshold_bls from 'blind-threshold-bls'
 import { randomBytes } from 'crypto'
-import 'isomorphic-fetch'
+import fetch from 'node-fetch'
 import { config as signerConfig } from '../../../signer/src/config'
 import { getCombinerVersion } from '../../src'
 import {
diff --git a/packages/phone-number-privacy/combiner/test/end-to-end/resources.ts b/packages/phone-number-privacy/combiner/test/end-to-end/resources.ts
index bd93afa69..a1a4adf18 100644
--- a/packages/phone-number-privacy/combiner/test/end-to-end/resources.ts
+++ b/packages/phone-number-privacy/combiner/test/end-to-end/resources.ts
@@ -11,7 +11,6 @@ import {
   normalizeAddressWith0x,
   privateKeyToAddress,
 } from '@celo/utils/lib/address'
-import 'isomorphic-fetch'
 
 require('dotenv').config()
 
diff --git a/packages/phone-number-privacy/signer/test/end-to-end/disabled-apis.test.ts b/packages/phone-number-privacy/signer/test/end-to-end/disabled-apis.test.ts
index 1014df19a..85b14405f 100644
--- a/packages/phone-number-privacy/signer/test/end-to-end/disabled-apis.test.ts
+++ b/packages/phone-number-privacy/signer/test/end-to-end/disabled-apis.test.ts
@@ -20,7 +20,7 @@ import {
 } from '@celo/phone-number-privacy-common'
 import { defined, noBool, noNumber, noString } from '@celo/utils/lib/sign-typed-data-utils'
 import { LocalWallet } from '@celo/wallet-local'
-import 'isomorphic-fetch'
+import fetch from 'node-fetch'
 
 require('dotenv').config()
 
diff --git a/packages/phone-number-privacy/signer/test/end-to-end/domain.test.ts b/packages/phone-number-privacy/signer/test/end-to-end/domain.test.ts
index 019da1422..8539831b8 100644
--- a/packages/phone-number-privacy/signer/test/end-to-end/domain.test.ts
+++ b/packages/phone-number-privacy/signer/test/end-to-end/domain.test.ts
@@ -27,7 +27,7 @@ import {
 import { DomainRequest } from '@celo/phone-number-privacy-common/src'
 import { defined, noBool, noNumber, noString } from '@celo/utils/lib/sign-typed-data-utils'
 import { LocalWallet } from '@celo/wallet-local'
-import 'isomorphic-fetch'
+import fetch, { Response } from 'node-fetch'
 import { getTestParamsForContext } from './utils'
 const { ACCOUNT_ADDRESS1, PRIVATE_KEY1 } = TestUtils.Values
 
diff --git a/packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts b/packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts
index 8be4b6f10..0b726d83d 100644
--- a/packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts
+++ b/packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts
@@ -15,7 +15,7 @@ import {
 } from '@celo/phone-number-privacy-common'
 import threshold_bls from 'blind-threshold-bls'
 import { randomBytes } from 'crypto'
-import 'isomorphic-fetch'
+import fetch, { Response } from 'node-fetch'
 import { config } from '../../src/config'
 import { getBlindedPhoneNumber, getTestParamsForContext } from './utils'
 

From 72db04ac398ad65777e67ad6b6ce5d59747f35fa Mon Sep 17 00:00:00 2001
From: soloseng <102702451+soloseng@users.noreply.github.com>
Date: Thu, 5 Oct 2023 14:40:50 -0400
Subject: [PATCH 2/2] revert changes in signer as not needed

---
 .../signer/test/end-to-end/disabled-apis.test.ts               | 3 +--
 .../phone-number-privacy/signer/test/end-to-end/domain.test.ts | 2 +-
 .../phone-number-privacy/signer/test/end-to-end/pnp.test.ts    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/phone-number-privacy/signer/test/end-to-end/disabled-apis.test.ts b/packages/phone-number-privacy/signer/test/end-to-end/disabled-apis.test.ts
index 85b14405f..594c6888a 100644
--- a/packages/phone-number-privacy/signer/test/end-to-end/disabled-apis.test.ts
+++ b/packages/phone-number-privacy/signer/test/end-to-end/disabled-apis.test.ts
@@ -20,8 +20,7 @@ import {
 } from '@celo/phone-number-privacy-common'
 import { defined, noBool, noNumber, noString } from '@celo/utils/lib/sign-typed-data-utils'
 import { LocalWallet } from '@celo/wallet-local'
-import fetch from 'node-fetch'
-
+import 'isomorphic-fetch'
 require('dotenv').config()
 
 const { ACCOUNT_ADDRESS1, BLINDED_PHONE_NUMBER, PRIVATE_KEY1 } = TestUtils.Values
diff --git a/packages/phone-number-privacy/signer/test/end-to-end/domain.test.ts b/packages/phone-number-privacy/signer/test/end-to-end/domain.test.ts
index 8539831b8..019da1422 100644
--- a/packages/phone-number-privacy/signer/test/end-to-end/domain.test.ts
+++ b/packages/phone-number-privacy/signer/test/end-to-end/domain.test.ts
@@ -27,7 +27,7 @@ import {
 import { DomainRequest } from '@celo/phone-number-privacy-common/src'
 import { defined, noBool, noNumber, noString } from '@celo/utils/lib/sign-typed-data-utils'
 import { LocalWallet } from '@celo/wallet-local'
-import fetch, { Response } from 'node-fetch'
+import 'isomorphic-fetch'
 import { getTestParamsForContext } from './utils'
 const { ACCOUNT_ADDRESS1, PRIVATE_KEY1 } = TestUtils.Values
 
diff --git a/packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts b/packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts
index 0b726d83d..8be4b6f10 100644
--- a/packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts
+++ b/packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts
@@ -15,7 +15,7 @@ import {
 } from '@celo/phone-number-privacy-common'
 import threshold_bls from 'blind-threshold-bls'
 import { randomBytes } from 'crypto'
-import fetch, { Response } from 'node-fetch'
+import 'isomorphic-fetch'
 import { config } from '../../src/config'
 import { getBlindedPhoneNumber, getTestParamsForContext } from './utils'