diff --git a/common/reducers/config/nodes/selectedNode.ts b/common/reducers/config/nodes/selectedNode.ts index 3d2fdd00..6d69e6e7 100644 --- a/common/reducers/config/nodes/selectedNode.ts +++ b/common/reducers/config/nodes/selectedNode.ts @@ -20,7 +20,7 @@ interface NodeChangePending { export type State = NodeLoaded | NodeChangePending; export const INITIAL_STATE: NodeLoaded = { - nodeId: 'eth_mew', + nodeId: 'eth_mycrypto', pending: false }; diff --git a/common/reducers/config/nodes/staticNodes.ts b/common/reducers/config/nodes/staticNodes.ts index e3787a5e..b5b9e029 100644 --- a/common/reducers/config/nodes/staticNodes.ts +++ b/common/reducers/config/nodes/staticNodes.ts @@ -5,13 +5,6 @@ import { NonWeb3NodeConfigs, Web3NodeConfigs } from 'types/node'; export type State = NonWeb3NodeConfigs & Web3NodeConfigs; export const INITIAL_STATE: State = { - eth_mew: { - network: 'ETH', - isCustom: false, - lib: new RPCNode('https://api.myetherapi.com/eth'), - service: 'MyEtherWallet', - estimateGas: true - }, eth_mycrypto: { network: 'ETH', isCustom: false, @@ -33,13 +26,6 @@ export const INITIAL_STATE: State = { lib: new InfuraNode('https://mainnet.infura.io/mew'), estimateGas: false }, - rop_mew: { - network: 'Ropsten', - isCustom: false, - service: 'MyEtherWallet', - lib: new RPCNode('https://api.myetherapi.com/rop'), - estimateGas: false - }, rop_infura: { network: 'Ropsten', isCustom: false, diff --git a/shared/types/node.d.ts b/shared/types/node.d.ts index 7b0c15b1..dc30d0bd 100644 --- a/shared/types/node.d.ts +++ b/shared/types/node.d.ts @@ -32,11 +32,9 @@ interface Web3NodeConfig extends StaticNodeConfig { } declare enum StaticNodeId { - ETH_MEW = 'eth_mew', ETH_MYCRYPTO = 'eth_mycrypto', ETH_ETHSCAN = 'eth_ethscan', ETH_INFURA = 'eth_infura', - ROP_MEW = 'rop_mew', ROP_INFURA = 'rop_infura', KOV_ETHSCAN = 'kov_ethscan', RIN_ETHSCAN = 'rin_ethscan', diff --git a/spec/integration/RpcNodeTestConfig.js b/spec/integration/RpcNodeTestConfig.js index 998645c8..f9928c31 100644 --- a/spec/integration/RpcNodeTestConfig.js +++ b/spec/integration/RpcNodeTestConfig.js @@ -1,5 +1,5 @@ module.exports = { - RpcNodes: ['eth_mew', 'etc_epool', 'etc_epool', 'rop_mew'], + RpcNodes: ['eth_mycrypto', 'etc_epool', 'etc_epool', 'rop_mew'], EtherscanNodes: ['eth_ethscan', 'kov_ethscan', 'rin_ethscan'], InfuraNodes: ['eth_infura', 'rop_infura', 'rin_infura'] }; diff --git a/spec/reducers/config/config.spec.ts b/spec/reducers/config/config.spec.ts index 7643e15e..c5a03304 100644 --- a/spec/reducers/config/config.spec.ts +++ b/spec/reducers/config/config.spec.ts @@ -264,7 +264,7 @@ describe('handleNodeChangeIntent*', () => { describe('unsetWeb3Node*', () => { const node = 'web3'; - const alternativeNodeId = 'eth_mew'; + const alternativeNodeId = 'eth_mycrypto'; const gen = unsetWeb3Node(); it('should select getNode', () => { @@ -294,7 +294,7 @@ describe('unsetWeb3Node*', () => { describe('unsetWeb3NodeOnWalletEvent*', () => { const fakeAction = {}; const mockNodeId = 'web3'; - const alternativeNodeId = 'eth_mew'; + const alternativeNodeId = 'eth_mycrypto'; const gen = unsetWeb3NodeOnWalletEvent(fakeAction); it('should select getNode', () => { diff --git a/spec/reducers/config/nodes/selectedNode.spec.ts b/spec/reducers/config/nodes/selectedNode.spec.ts index 395fc5e2..691c5604 100644 --- a/spec/reducers/config/nodes/selectedNode.spec.ts +++ b/spec/reducers/config/nodes/selectedNode.spec.ts @@ -2,14 +2,14 @@ import { changeNodeIntent, changeNode } from 'actions/config'; import { State, selectedNode } from 'reducers/config/nodes/selectedNode'; export const expectedState = { - initialState: { nodeId: 'eth_mew', pending: false }, + initialState: { nodeId: 'eth_mycrypto', pending: false }, nodeChange: { nodeId: 'nodeToChangeTo', pending: false }, - nodeChangeIntent: { nodeId: 'eth_mew', pending: true } + nodeChangeIntent: { nodeId: 'eth_mycrypto', pending: true } }; export const actions = { changeNode: changeNode({ nodeId: 'nodeToChangeTo', networkId: 'networkToChangeTo' }), - changeNodeIntent: changeNodeIntent('eth_mew') + changeNodeIntent: changeNodeIntent('eth_mycrypto') }; describe('selected node reducer', () => { diff --git a/spec/reducers/config/nodes/staticNodes.spec.ts b/spec/reducers/config/nodes/staticNodes.spec.ts index dc4a8576..3454b4f1 100644 --- a/spec/reducers/config/nodes/staticNodes.spec.ts +++ b/spec/reducers/config/nodes/staticNodes.spec.ts @@ -5,13 +5,6 @@ import { Web3NodeConfig } from 'types/node'; import { Web3Service } from 'libs/nodes/web3'; const expectedInitialState = { - eth_mew: { - network: 'ETH', - isCustom: false, - lib: new RPCNode('https://api.myetherapi.com/eth'), - service: 'MyEtherWallet', - estimateGas: true - }, eth_mycrypto: { network: 'ETH', isCustom: false, @@ -33,13 +26,6 @@ const expectedInitialState = { lib: new InfuraNode('https://mainnet.infura.io/mew'), estimateGas: false }, - rop_mew: { - network: 'Ropsten', - isCustom: false, - service: 'MyEtherWallet', - lib: new RPCNode('https://api.myetherapi.com/rop'), - estimateGas: false - }, rop_infura: { network: 'Ropsten', isCustom: false,