Update links to etherscan.io

js/src/3rdparty/etherscan/call.js

@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import { stringify } from 'qs';
+import { apiLink } from './links';
 
 const options = {
   method: 'GET',
@@ -24,31 +25,11 @@ const options = {
 };
 
 export function call (module, action, _params, test, netVersion) {
-  let prefix = 'api.';
-
-  switch (netVersion) {
-    case '2':
-    case '3':
-      prefix = 'testnet.';
-      break;
-
-    case '42':
-      prefix = 'kovan.';
-      break;
-
-    case '0':
-    default:
-      if (test) {
-        prefix = 'testnet.';
-      }
-      break;
-  }
-
   const query = stringify(Object.assign({
     module, action
   }, _params || {}));
 
-  return fetch(`https://${prefix}etherscan.io/api?${query}`, options)
+  return fetch(apiLink(query, test, netVersion), options)
     .then((response) => {
       if (!response.ok) {
         throw { code: response.status, message: response.statusText }; // eslint-disable-line

js/src/3rdparty/etherscan/links.js

@@ -15,28 +15,31 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 // NOTE: Keep 'isTestnet' for backwards library compatibility
-export const url = (isTestnet = false, netVersion = '0') => {
-  let prefix = '';
+const getUrlPrefix = (isTestnet = false, netVersion = '0', defaultPrefix = '') => {
+  if (isTestnet) {
+    return 'ropsten.';
+  }
 
   switch (netVersion) {
-    case '2':
+    case '1':
+      return defaultPrefix;
+
     case '3':
-      prefix = 'testnet.';
-      break;
+      return 'ropsten.';
+
+    case '4':
+      return 'rinkeby.';
 
     case '42':
-      prefix = 'kovan.';
-      break;
+      return 'kovan.';
 
-    case '0':
     default:
-      if (isTestnet) {
-        prefix = 'testnet.';
-      }
-      break;
+      return 'testnet.';
   }
+};
 
-  return `https://${prefix}etherscan.io`;
+export const url = (isTestnet = false, netVersion = '0', defaultPrefix = '') => {
+  return `https://${getUrlPrefix(isTestnet, netVersion, defaultPrefix)}etherscan.io`;
 };
 
 export const txLink = (hash, isTestnet = false, netVersion = '0') => {
@@ -46,3 +49,7 @@ export const txLink = (hash, isTestnet = false, netVersion = '0') => {
 export const addressLink = (address, isTestnet = false, netVersion = '0') => {
   return `${url(isTestnet, netVersion)}/address/${address}`;
 };
+
+export const apiLink = (query, isTestnet = false, netVersion = '0') => {
+  return `${url(isTestnet, netVersion, 'api.')}/api?${query}`;
+};

js/src/3rdparty/etherscan/links.spec.js

@@ -0,0 +1,57 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+const { url, txLink, addressLink, apiLink } = require('./links');
+
+describe('etherscan/links', function () {
+  it('builds link with a prefix', () => {
+    expect(url(false, '1', 'api.')).to.be.equal('https://api.etherscan.io');
+  });
+
+  it('builds link to main network', () => {
+    expect(url(false, '1')).to.be.equal('https://etherscan.io');
+  });
+
+  it('builds link to ropsten', () => {
+    expect(url(false, '3')).to.be.equal('https://ropsten.etherscan.io');
+    expect(url(true)).to.be.equal('https://ropsten.etherscan.io');
+  });
+
+  it('builds link to kovan', () => {
+    expect(url(false, '42')).to.be.equal('https://kovan.etherscan.io');
+  });
+
+  it('builds link to rinkeby', () => {
+    expect(url(false, '4')).to.be.equal('https://rinkeby.etherscan.io');
+  });
+
+  it('builds link to the testnet selector for unknown networks', () => {
+    expect(url(false, '10042')).to.be.equal('https://testnet.etherscan.io');
+    expect(url(false, '51224')).to.be.equal('https://testnet.etherscan.io');
+  });
+
+  it('builds transaction link', () => {
+    expect(txLink('aTxHash', false, '1')).to.be.equal('https://etherscan.io/tx/aTxHash');
+  });
+
+  it('builds address link', () => {
+    expect(addressLink('anAddress', false, '1')).to.be.equal('https://etherscan.io/address/anAddress');
+  });
+
+  it('builds api link', () => {
+    expect(apiLink('answer=42', false, '1')).to.be.equal('https://api.etherscan.io/api?answer=42');
+  });
+});