diff --git a/test/e2e/fetch-mocks.json b/test/e2e/fetch-mocks.json index 61ab1392a..1be8290be 100644 --- a/test/e2e/fetch-mocks.json +++ b/test/e2e/fetch-mocks.json @@ -5916,14 +5916,6 @@ "hpa_coef": -0.0243 } ], - "gasExpress": { - "safeLow": 2, - "standard": 3, - "fast": 10, - "fastest": 52, - "block_time": 15, - "blockNum": 6693030 - }, "metametrics": { "mockMetaMetricsResponse": true } diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js index 1f0498525..943a9c46e 100644 --- a/test/e2e/helpers.js +++ b/test/e2e/helpers.js @@ -91,8 +91,6 @@ async function setupFetchMocking (driver) { return { json: async () => clone(fetchMockResponses.ethGasPredictTable) } } else if (url.match(/chromeextensionmm/)) { return { json: async () => clone(fetchMockResponses.metametrics) } - } else if (url === 'https://dev.blockscale.net/api/gasexpress.json') { - return { json: async () => clone(fetchMockResponses.gasExpress) } } return window.origFetch(...args) } diff --git a/test/integration/lib/confirm-sig-requests.js b/test/integration/lib/confirm-sig-requests.js index 65cec89e7..b5b4e171f 100644 --- a/test/integration/lib/confirm-sig-requests.js +++ b/test/integration/lib/confirm-sig-requests.js @@ -28,8 +28,6 @@ async function runConfirmSigRequestsTest (assert) { return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.ethGasBasic)) }) } else if (args[0] === 'https://ethgasstation.info/json/predictTable.json') { return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.ethGasPredictTable)) }) - } else if (args[0] === 'https://dev.blockscale.net/api/gasexpress.json') { - return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.gasExpress)) }) } else if (args[0].match(/chromeextensionmm/)) { return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.metametrics)) }) } diff --git a/test/integration/lib/currency-localization.js b/test/integration/lib/currency-localization.js index 748590205..dcd192341 100644 --- a/test/integration/lib/currency-localization.js +++ b/test/integration/lib/currency-localization.js @@ -27,8 +27,6 @@ async function runCurrencyLocalizationTest (assert) { return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.ethGasBasic)) }) } else if (args[0] === 'https://ethgasstation.info/json/predictTable.json') { return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.ethGasPredictTable)) }) - } else if (args[0] === 'https://dev.blockscale.net/api/gasexpress.json') { - return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.gasExpress)) }) } else if (args[0].match(/chromeextensionmm/)) { return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.metametrics)) }) } diff --git a/test/integration/lib/tx-list-items.js b/test/integration/lib/tx-list-items.js index 105e3d687..9f614a7a5 100644 --- a/test/integration/lib/tx-list-items.js +++ b/test/integration/lib/tx-list-items.js @@ -32,8 +32,6 @@ async function runTxListItemsTest (assert) { return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.ethGasBasic)) }) } else if (args[0] === 'https://ethgasstation.info/json/predictTable.json') { return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.ethGasPredictTable)) }) - } else if (args[0] === 'https://dev.blockscale.net/api/gasexpress.json') { - return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.gasExpress)) }) } else if (args[0].match(/chromeextensionmm/)) { return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.metametrics)) }) } diff --git a/ui/app/ducks/gas/gas-duck.test.js b/ui/app/ducks/gas/gas-duck.test.js index 0ae68628e..5d62db9c2 100644 --- a/ui/app/ducks/gas/gas-duck.test.js +++ b/ui/app/ducks/gas/gas-duck.test.js @@ -67,7 +67,7 @@ describe('Gas Duck', () => { { expectedTime: 1, expectedWait: 0.5, gasprice: 20, somethingElse: 'foobar' }, ] const fakeFetch = (url) => new Promise(resolve => { - const dataToResolve = url.match(/ethgasAPI|gasexpress/) + const dataToResolve = url.match(/ethgasAPI/) ? mockEthGasApiResponse : mockPredictTableResponse resolve({