Remove unwanted single returns from arrow functions

.eslintrc.js

@@ -52,6 +52,7 @@ module.exports = {
  'default-param-last': 'off',
  'prefer-object-spread': 'error',
  'require-atomic-updates': 'off',
+ 'arrow-body-style': 1,
 
  // This is the same as our default config, but for the noted exceptions
  'spaced-comment': [

app/scripts/background.js

@@ -212,12 +212,8 @@ function setupController(initState, initLangCode) {
  // platform specific api
  platform,
  extension,
- getRequestAccountTabIds: () => {
- return requestAccountTabIds;
- },
- getOpenMetamaskTabsIds: () => {
- return openMetamaskTabsIDs;
- },
+ getRequestAccountTabIds: () => requestAccountTabIds,
+ getOpenMetamaskTabsIds: () => openMetamaskTabsIDs,
  });
 
  setupEnsIpfsResolver({
@@ -291,13 +287,10 @@ function setupController(initState, initLangCode) {
 
  const metamaskBlockedPorts = ['trezor-connect'];
 
- const isClientOpenStatus = () => {
- return (
- popupIsOpen ||
- Boolean(Object.keys(openMetamaskTabsIDs).length) ||
- notificationIsOpen
- );
- };
+ const isClientOpenStatus = () =>
+ popupIsOpen ||
+ Boolean(Object.keys(openMetamaskTabsIDs).length) ||
+ notificationIsOpen;
 
  const onCloseEnvironmentInstances = (isClientOpen, environmentType) => {
  // if all instances of metamask are closed we call a method on the controller to stop gasFeeController polling

app/scripts/controllers/detect-tokens.js

@@ -33,9 +33,9 @@ export default class DetectTokensController {
  this.keyringMemStore = keyringMemStore;
  this.tokenList = tokenList;
  this.selectedAddress = this.preferences?.store.getState().selectedAddress;
- this.tokenAddresses = this.tokensController?.state.tokens.map((token) => {
- return token.address;
- });
+ this.tokenAddresses = this.tokensController?.state.tokens.map(
+ (token) => token.address,
+ );
  this.hiddenTokens = this.tokensController?.state.ignoredTokens;
 
  preferences?.store.subscribe(({ selectedAddress, useTokenDetection }) => {
@@ -49,9 +49,7 @@ export default class DetectTokensController {
  }
  });
  tokensController?.subscribe(({ tokens = [], ignoredTokens = [] }) => {
- this.tokenAddresses = tokens.map((token) => {
- return token.address;
- });
+ this.tokenAddresses = tokens.map((token) => token.address);
  this.hiddenTokens = ignoredTokens;
  });
  }
@@ -119,13 +117,13 @@ export default class DetectTokensController {
  });
 
  await Promise.all(
- tokensWithBalance.map((tokenAddress) => {
- return this.tokensController.addToken(
+ tokensWithBalance.map((tokenAddress) =>
+ this.tokensController.addToken(
  tokenAddress,
  tokenList[tokenAddress].symbol,
  tokenList[tokenAddress].decimals,
- );
- }),
+ ),
+ ),
  );
  }
  }

app/scripts/controllers/network/createJsonRpcClient.js

@@ -10,9 +10,8 @@ import { SECOND } from '../../../../shared/constants/time';
 
 const inTest = process.env.IN_TEST === 'true';
 const blockTrackerOpts = inTest ? { pollingInterval: SECOND } : {};
-const getTestMiddlewares = () => {
- return inTest ? [createEstimateGasDelayTestMiddleware()] : [];
-};
+const getTestMiddlewares = () =>
+ inTest ? [createEstimateGasDelayTestMiddleware()] : [];
 
 export default function createJsonRpcClient({ rpcUrl, chainId }) {
  const fetchMiddleware = createFetchMiddleware({ rpcUrl });

app/scripts/controllers/permissions/permissions-controller.test.js

@@ -29,20 +29,18 @@ const {
  EXTRA_ACCOUNT,
 } = constants;
 
-const initNotifications = () => {
- return Object.values(DOMAINS).reduce((acc, domain) => {
+const initNotifications = () =>
+ Object.values(DOMAINS).reduce((acc, domain) => {
  acc[domain.origin] = [];
  return acc;
  }, {});
-};
 
-const initPermController = (notifications = initNotifications()) => {
- return new PermissionsController({
+const initPermController = (notifications = initNotifications()) =>
+ new PermissionsController({
  ...getPermControllerOpts(),
  notifyDomain: getNotifyDomain(notifications),
  notifyAllDomains: getNotifyAllDomains(notifications),
  });
-};
 
 describe('permissions controller', function () {
  describe('constructor', function () {

app/scripts/controllers/permissions/permissions-log-controller.test.js

@@ -25,12 +25,11 @@ const {
 
 let clock;
 
-const initPermLog = () => {
- return new PermissionsLogController({
+const initPermLog = () =>
+ new PermissionsLogController({
  store: new ObservableStore(),
  restrictedMethods: RESTRICTED_METHODS,
  });
-};
 
 const mockNext = (handler) => {
  if (handler) {

app/scripts/controllers/permissions/permissions-middleware.test.js

@@ -19,19 +19,17 @@ const { CAVEATS, ERRORS, PERMS, RPC_REQUESTS } = getters;
 
 const { ACCOUNTS, DOMAINS, PERM_NAMES } = constants;
 
-const initPermController = () => {
- return new PermissionsController({
+const initPermController = () =>
+ new PermissionsController({
  ...getPermControllerOpts(),
  });
-};
 
 const createApprovalSpies = (permController) => {
  sinon.spy(permController.approvals, '_add');
 };
 
-const getNextApprovalId = (permController) => {
- return permController.approvals._approvals.keys().next().value;
-};
+const getNextApprovalId = (permController) =>
+ permController.approvals._approvals.keys().next().value;
 
 const validatePermission = (perm, name, origin, caveats) => {
  assert.equal(

app/scripts/controllers/permissions/restricted-methods.test.js

@@ -30,9 +30,7 @@ describe('restricted methods', function () {
 
  it('should handle missing identity for first account when sorting', async function () {
  const restrictedMethods = getRestrictedMethods({
- getIdentities: () => {
- return { '0x7e57e2': {} };
- },
+ getIdentities: () => ({ '0x7e57e2': {} }),
  getKeyringAccounts: async () => ['0x7e57e2', '0x7e57e3'],
  });
  const ethAccountsMethod = pify(restrictedMethods.eth_accounts.method);
@@ -49,9 +47,7 @@ describe('restricted methods', function () {
 
  it('should handle missing identity for second account when sorting', async function () {
  const restrictedMethods = getRestrictedMethods({
- getIdentities: () => {
- return { '0x7e57e3': {} };
- },
+ getIdentities: () => ({ '0x7e57e3': {} }),
  getKeyringAccounts: async () => ['0x7e57e2', '0x7e57e3'],
  });
  const ethAccountsMethod = pify(restrictedMethods.eth_accounts.method);
@@ -69,12 +65,11 @@ describe('restricted methods', function () {
  it('should return accounts in keyring order when none are selected', async function () {
  const keyringAccounts = ['0x7e57e2', '0x7e57e3', '0x7e57e4', '0x7e57e5'];
  const restrictedMethods = getRestrictedMethods({
- getIdentities: () => {
- return keyringAccounts.reduce((identities, address) => {
+ getIdentities: () =>
+ keyringAccounts.reduce((identities, address) => {
  identities[address] = {};
  return identities;
- }, {});
- },
+ }, {}),
  getKeyringAccounts: async () => [...keyringAccounts],
  });
  const ethAccountsMethod = pify(restrictedMethods.eth_accounts.method);
@@ -91,12 +86,11 @@ describe('restricted methods', function () {
  it('should return accounts in keyring order when all have same last selected time', async function () {
  const keyringAccounts = ['0x7e57e2', '0x7e57e3', '0x7e57e4', '0x7e57e5'];
  const restrictedMethods = getRestrictedMethods({
- getIdentities: () => {
- return keyringAccounts.reduce((identities, address) => {
+ getIdentities: () =>
+ keyringAccounts.reduce((identities, address) => {
  identities[address] = { lastSelected: 1000 };
  return identities;
- }, {});
- },
+ }, {}),
  getKeyringAccounts: async () => [...keyringAccounts],
  });
  const ethAccountsMethod = pify(restrictedMethods.eth_accounts.method);
@@ -114,12 +108,11 @@ describe('restricted methods', function () {
  const keyringAccounts = ['0x7e57e2', '0x7e57e3', '0x7e57e4', '0x7e57e5'];
  const expectedResult = keyringAccounts.slice().reverse();
  const restrictedMethods = getRestrictedMethods({
- getIdentities: () => {
- return keyringAccounts.reduce((identities, address, index) => {
+ getIdentities: () =>
+ keyringAccounts.reduce((identities, address, index) => {
  identities[address] = { lastSelected: index * 1000 };
  return identities;
- }, {});
- },
+ }, {}),
  getKeyringAccounts: async () => [...keyringAccounts],
  });
  const ethAccountsMethod = pify(restrictedMethods.eth_accounts.method);
@@ -149,15 +142,13 @@ describe('restricted methods', function () {
  '0x7e57e6',
  ];
  const restrictedMethods = getRestrictedMethods({
- getIdentities: () => {
- return {
- '0x7e57e2': { lastSelected: 1000 },
- '0x7e57e3': {},
- '0x7e57e4': { lastSelected: 2000 },
- '0x7e57e5': {},
- '0x7e57e6': {},
- };
- },
+ getIdentities: () => ({
+ '0x7e57e2': { lastSelected: 1000 },
+ '0x7e57e3': {},
+ '0x7e57e4': { lastSelected: 2000 },
+ '0x7e57e5': {},
+ '0x7e57e6': {},
+ }),
  getKeyringAccounts: async () => [...keyringAccounts],
  });
  const ethAccountsMethod = pify(restrictedMethods.eth_accounts.method);

app/scripts/controllers/preferences.js

@@ -73,9 +73,7 @@ export default class PreferencesController {
 
  this._subscribeToInfuraAvailability();
 
- global.setPreference = (key, value) => {
- return this.setFeatureFlag(key, value);
- };
+ global.setPreference = (key, value) => this.setFeatureFlag(key, value);
  }
  // PUBLIC METHODS
 
@@ -336,9 +334,9 @@ export default class PreferencesController {
  */
  async updateRpc(newRpcDetails) {
  const rpcList = this.getFrequentRpcListDetail();
- const index = rpcList.findIndex((element) => {
- return element.rpcUrl === newRpcDetails.rpcUrl;
- });
+ const index = rpcList.findIndex(
+ (element) => element.rpcUrl === newRpcDetails.rpcUrl,
+ );
  if (index > -1) {
  const rpcDetail = rpcList[index];
  const updatedRpc = { ...rpcDetail, ...newRpcDetails };
@@ -419,9 +417,7 @@ export default class PreferencesController {
  ) {
  const rpcList = this.getFrequentRpcListDetail();
 
- const index = rpcList.findIndex((element) => {
- return element.rpcUrl === rpcUrl;
- });
+ const index = rpcList.findIndex((element) => element.rpcUrl === rpcUrl);
  if (index !== -1) {
  rpcList.splice(index, 1);
  }
@@ -443,9 +439,7 @@ export default class PreferencesController {
  */
  removeFromFrequentRpcList(url) {
  const rpcList = this.getFrequentRpcListDetail();
- const index = rpcList.findIndex((element) => {
- return element.rpcUrl === url;
- });
+ const index = rpcList.findIndex((element) => element.rpcUrl === url);
  if (index !== -1) {
  rpcList.splice(index, 1);
  }

app/scripts/controllers/swaps.test.js

@@ -99,11 +99,9 @@ const MOCK_GET_BUFFERED_GAS_LIMIT = async () => ({
 function getMockNetworkController() {
  return {
  store: {
- getState: () => {
- return {
- network: ROPSTEN_NETWORK_ID,
- };
- },
+ getState: () => ({
+ network: ROPSTEN_NETWORK_ID,
+ }),
  },
  on: sinon
  .stub()
@@ -142,20 +140,18 @@ const sandbox = sinon.createSandbox();
 const fetchTradesInfoStub = sandbox.stub();
 const getCurrentChainIdStub = sandbox.stub();
 getCurrentChainIdStub.returns(MAINNET_CHAIN_ID);
-const getEIP1559GasFeeEstimatesStub = sandbox.stub(() => {
- return {
- gasFeeEstimates: {
- high: '150',
- },
- gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY,
- };
-});
+const getEIP1559GasFeeEstimatesStub = sandbox.stub(() => ({
+ gasFeeEstimates: {
+ high: '150',
+ },
+ gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY,
+}));
 
 describe('SwapsController', function () {
  let provider;
 
- const getSwapsController = () => {
- return new SwapsController({
+ const getSwapsController = () =>
+ new SwapsController({
  getBufferedGasLimit: MOCK_GET_BUFFERED_GAS_LIMIT,
  networkController: getMockNetworkController(),
  provider,
@@ -165,7 +161,6 @@ describe('SwapsController', function () {
  getCurrentChainId: getCurrentChainIdStub,
  getEIP1559GasFeeEstimates: getEIP1559GasFeeEstimatesStub,
  });
- };
 
  before(function () {
  const providerResultStub = {

app/scripts/controllers/transactions/pending-tx-tracker.test.js

@@ -172,14 +172,10 @@ describe('PendingTransactionTracker', function () {
  getTransactionReceipt: sinon.stub(),
  },
  nonceTracker: {
- getGlobalLock: async () => {
- return { releaseLock: () => undefined };
- },
+ getGlobalLock: async () => ({ releaseLock: () => undefined }),
  },
  getPendingTransactions: () => txList,
- getCompletedTransactions: () => {
- return [];
- },
+ getCompletedTransactions: () => [],
  publishTransaction: () => undefined,
  confirmTransaction: () => undefined,
  });

app/scripts/controllers/transactions/tx-gas-utils.test.js

@@ -12,9 +12,7 @@ describe('txUtils', function () {
  new Proxy(
  {},
  {
- get: () => {
- return () => undefined;
- },
+ get: () => () => undefined,
  },
  ),
  );

app/scripts/controllers/transactions/tx-state-manager.js

@@ -358,11 +358,9 @@ export default class TransactionStateManager extends EventEmitter {
  // with the provided value". To conform this object to be only methods, we
  // mapValues (lodash) such that every value on the object is a method that
  // returns a boolean.
- const predicateMethods = mapValues(searchCriteria, (predicate) => {
- return typeof predicate === 'function'
- ? predicate
- : (v) => v === predicate;
- });
+ const predicateMethods = mapValues(searchCriteria, (predicate) =>
+ typeof predicate === 'function' ? predicate : (v) => v === predicate,
+ );
 
  // If an initial list is provided we need to change it back into an object
  // first, so that it matches the shape of our state. This is done by the