m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 09:57:02 +01:00
Code

Set default getFetchWithTimeout default timeout value (#14218)

Browse Source
This commit is contained in:
David Walsh 2022-07-19 11:13:45 -05:00 committed by GitHub
parent 7d321c48e0
commit 95adbc245c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/scripts/controllers/incoming-transactions.js
View File

@ -18,9 +18,8 @@ import {
RINKEBY_CHAIN_ID, RINKEBY_CHAIN_ID,
ROPSTEN_CHAIN_ID, ROPSTEN_CHAIN_ID,
} from '../../../shared/constants/network'; } from '../../../shared/constants/network';
import { SECOND } from '../../../shared/constants/time';
const fetchWithTimeout = getFetchWithTimeout(SECOND * 30); const fetchWithTimeout = getFetchWithTimeout();
/** /**
* @typedef {import('../../../shared/constants/transaction').TransactionMeta} TransactionMeta * @typedef {import('../../../shared/constants/transaction').TransactionMeta} TransactionMeta

3
app/scripts/controllers/network/network.js
View File

@ -20,7 +20,6 @@ import {
INFURA_BLOCKED_KEY, INFURA_BLOCKED_KEY,
TEST_NETWORK_TICKER_MAP, TEST_NETWORK_TICKER_MAP,
} from '../../../../shared/constants/network'; } from '../../../../shared/constants/network';
import { SECOND } from '../../../../shared/constants/time';
import { import {
isPrefixedFormattedHexString, isPrefixedFormattedHexString,
isSafeChainId, isSafeChainId,
@ -31,7 +30,7 @@ import createInfuraClient from './createInfuraClient';
import createJsonRpcClient from './createJsonRpcClient'; import createJsonRpcClient from './createJsonRpcClient';
const env = process.env.METAMASK_ENV; const env = process.env.METAMASK_ENV;
const fetchWithTimeout = getFetchWithTimeout(SECOND * 30); const fetchWithTimeout = getFetchWithTimeout();
let defaultProviderConfigOpts; let defaultProviderConfigOpts;
if (process.env.IN_TEST) { if (process.env.IN_TEST) {

3
app/scripts/lib/buy-url.js
View File

@ -9,7 +9,6 @@ import {
ROPSTEN_CHAIN_ID, ROPSTEN_CHAIN_ID,
BUYABLE_CHAINS_MAP, BUYABLE_CHAINS_MAP,
} from '../../../shared/constants/network'; } from '../../../shared/constants/network';
import { SECOND } from '../../../shared/constants/time';
import getFetchWithTimeout from '../../../shared/modules/fetch-with-timeout'; import getFetchWithTimeout from '../../../shared/modules/fetch-with-timeout';
import { import {
TRANSAK_API_KEY, TRANSAK_API_KEY,
@ -17,7 +16,7 @@ import {
COINBASEPAY_API_KEY, COINBASEPAY_API_KEY,
} from '../constants/on-ramp'; } from '../constants/on-ramp';
const fetchWithTimeout = getFetchWithTimeout(SECOND * 30); const fetchWithTimeout = getFetchWithTimeout();
/** /**
* Create a Wyre purchase URL. * Create a Wyre purchase URL.

3
app/scripts/lib/ens-ipfs/setup.js
View File

@ -2,11 +2,10 @@ import base32Encode from 'base32-encode';
import base64 from 'base64-js'; import base64 from 'base64-js';
import browser from 'webextension-polyfill'; import browser from 'webextension-polyfill';
import { SECOND } from '../../../../shared/constants/time';
import getFetchWithTimeout from '../../../../shared/modules/fetch-with-timeout'; import getFetchWithTimeout from '../../../../shared/modules/fetch-with-timeout';
import resolveEnsToIpfsContentId from './resolver'; import resolveEnsToIpfsContentId from './resolver';
const fetchWithTimeout = getFetchWithTimeout(SECOND * 30); const fetchWithTimeout = getFetchWithTimeout();
const supportedTopLevelDomains = ['eth']; const supportedTopLevelDomains = ['eth'];

3
app/scripts/lib/network-store.js
View File

@ -1,8 +1,7 @@
import log from 'loglevel'; import log from 'loglevel';
import { SECOND } from '../../../shared/constants/time';
import getFetchWithTimeout from '../../../shared/modules/fetch-with-timeout'; import getFetchWithTimeout from '../../../shared/modules/fetch-with-timeout';
const fetchWithTimeout = getFetchWithTimeout(SECOND * 30); const fetchWithTimeout = getFetchWithTimeout();
const FIXTURE_SERVER_HOST = 'localhost'; const FIXTURE_SERVER_HOST = 'localhost';
const FIXTURE_SERVER_PORT = 12345; const FIXTURE_SERVER_PORT = 12345;

3
shared/modules/fetch-with-timeout.js
View File

@ -1,6 +1,7 @@
import { memoize } from 'lodash'; import { memoize } from 'lodash';
import { SECOND } from '../constants/time';
const getFetchWithTimeout = memoize((timeout) => { const getFetchWithTimeout = memoize((timeout = SECOND * 30) => {
if (!Number.isInteger(timeout) || timeout < 1) { if (!Number.isInteger(timeout) || timeout < 1) {
throw new Error('Must specify positive integer timeout.'); throw new Error('Must specify positive integer timeout.');
} }

8
shared/modules/fetch-with-timeout.test.js
View File

@ -6,7 +6,7 @@ describe('getFetchWithTimeout', () => {
it('fetches a url', async () => { it('fetches a url', async () => {
nock('https://api.infura.io').get('/money').reply(200, '{"hodl": false}'); nock('https://api.infura.io').get('/money').reply(200, '{"hodl": false}');
const fetchWithTimeout = getFetchWithTimeout(SECOND * 30); const fetchWithTimeout = getFetchWithTimeout();
const response = await ( const response = await (
await fetchWithTimeout('https://api.infura.io/money') await fetchWithTimeout('https://api.infura.io/money')
).json(); ).json();
@ -46,15 +46,9 @@ describe('getFetchWithTimeout', () => {
}); });
it('throws on invalid timeout', async () => { it('throws on invalid timeout', async () => {
await expect(() => getFetchWithTimeout()).toThrow(
'Must specify positive integer timeout.',
);
await expect(() => getFetchWithTimeout(-1)).toThrow( await expect(() => getFetchWithTimeout(-1)).toThrow(
'Must specify positive integer timeout.', 'Must specify positive integer timeout.',
); );
await expect(() => getFetchWithTimeout({})).toThrow(
'Must specify positive integer timeout.',
);
await expect(() => getFetchWithTimeout(true)).toThrow( await expect(() => getFetchWithTimeout(true)).toThrow(
'Must specify positive integer timeout.', 'Must specify positive integer timeout.',
); );

3
shared/modules/rpc.utils.js
View File

@ -1,7 +1,6 @@
import { SECOND } from '../constants/time';
import getFetchWithTimeout from './fetch-with-timeout'; import getFetchWithTimeout from './fetch-with-timeout';
const fetchWithTimeout = getFetchWithTimeout(SECOND * 30); const fetchWithTimeout = getFetchWithTimeout();
/** /**
* Makes a JSON RPC request to the given URL, with the given RPC method and params. * Makes a JSON RPC request to the given URL, with the given RPC method and params.

3
ui/helpers/utils/i18n-helper.js
View File

@ -3,10 +3,9 @@ import React from 'react';
import log from 'loglevel'; import log from 'loglevel';
import * as Sentry from '@sentry/browser'; import * as Sentry from '@sentry/browser';
import { SECOND } from '../../../shared/constants/time';
import getFetchWithTimeout from '../../../shared/modules/fetch-with-timeout'; import getFetchWithTimeout from '../../../shared/modules/fetch-with-timeout';
const fetchWithTimeout = getFetchWithTimeout(SECOND * 30); const fetchWithTimeout = getFetchWithTimeout();
const warned = {}; const warned = {};
const missingMessageErrors = {}; const missingMessageErrors = {};