Fix host url

Author: r0qs

downloadCurrentVersion.ts

@@ -5,11 +5,11 @@
 
 import downloader from './downloader';
 const pkg = require('./package.json');
-const BIN_URL = 'https://binaries.soliditylang.org/bin';
+const DEFAULT_HOST = 'https://binaries.soliditylang.org';
 
-async function download (version, binURL = BIN_URL) {
+async function download (version, host = DEFAULT_HOST) {
   try {
-    const list = JSON.parse(await downloader.getVersionList(`${binURL}/list.json`));
+    const list = JSON.parse(await downloader.getVersionList(host));
     const releaseFileName = list.releases[version];
     const expectedFile = list.builds.filter(function (entry) { return entry.path === releaseFileName; })[0];
 
@@ -18,7 +18,7 @@ async function download (version, binURL = BIN_URL) {
     }
 
     const expectedHash = expectedFile.keccak256;
-    await downloader.downloadBinary(binURL, 'soljson.js', releaseFileName, expectedHash);
+    await downloader.downloadBinary(host, 'soljson.js', releaseFileName, expectedHash);
   } catch (err) {
     console.log(err.message);
     process.exit(1);

downloader.ts

@@ -3,12 +3,12 @@ import { https } from 'follow-redirects';
 import MemoryStream from 'memorystream';
 import { keccak256 } from 'js-sha3';
 
-function getVersionList (url: string): Promise<string> {
+function getVersionList (host: string): Promise<string> {
   console.log('Retrieving available version list...');
 
   return new Promise<string>((resolve, reject) => {
     const mem = new MemoryStream(null, { readable: false });
-    https.get(url, function (response) {
+    https.get(`${host}/bin/list.json`, function (response) {
       if (response.statusCode !== 200) {
         reject(new Error('Error downloading file: ' + response.statusCode));
       }
@@ -22,7 +22,7 @@ function getVersionList (url: string): Promise<string> {
   });
 }
 
-function downloadBinary (binURL: string, outputName: string, releaseFile: string, expectedHash: string): Promise<void> {
+function downloadBinary (host: string, outputName: string, releaseFile: string, expectedHash: string): Promise<void> {
   console.log('Downloading version', releaseFile);
 
   return new Promise<void>((resolve, reject) => {
@@ -37,7 +37,7 @@ function downloadBinary (binURL: string, outputName: string, releaseFile: string
     });
 
     const file = fs.createWriteStream(outputName, { encoding: 'binary' });
-    https.get(`${binURL}/${releaseFile}`, function (response) {
+    https.get(`${host}/bin/${releaseFile}`, function (response) {
       if (response.statusCode !== 200) {
         reject(new Error('Error downloading file: ' + response.statusCode));
       }

test/downloader.ts

@@ -32,12 +32,12 @@ function generateTestFile (t: tape.Test, content: string): tmp.FileResult {
   return file;
 }
 
-function versionListMock (url: string): nock.Interceptor {
-  return nock(url).get('/bin/list.json');
+function versionListMock (host: string): nock.Interceptor {
+  return nock(host).get('/bin/list.json');
 }
 
-function downloadBinaryMock (url: string, filename: string): nock.Interceptor {
-  return nock(url).get(`/bin/${path.basename(filename)}`);
+function downloadBinaryMock (host: string, filename: string): nock.Interceptor {
+  return nock(host).get(`/bin/${path.basename(filename)}`);
 }
 
 function defaultListener (req: any, res: any): void {
@@ -73,7 +73,7 @@ tape('Download version list', async function (t) {
 
     try {
       const list = JSON.parse(
-        await downloader.getVersionList(`${server.origin}/bin/list.json`)
+        await downloader.getVersionList(server.origin)
       );
       const expected = require(dummyListPath);
       st.deepEqual(list, expected, 'list should match');
@@ -88,7 +88,7 @@ tape('Download version list', async function (t) {
     versionListMock(server.origin).reply(404);
 
     try {
-      await downloader.getVersionList(`${server.origin}/bin/list.json`);
+      await downloader.getVersionList(server.origin);
       st.fail('should throw file not found error');
     } catch (err) {
       st.equal(err.message, 'Error downloading file: 404', 'should throw file not found error');
@@ -123,7 +123,7 @@ tape('Download binary', async function (t) {
 
     try {
       await downloader.downloadBinary(
-        `${server.origin}/bin`,
+        server.origin,
         targetFilename,
         file.name,
         hash(file.name)
@@ -148,7 +148,7 @@ tape('Download binary', async function (t) {
 
     try {
       await downloader.downloadBinary(
-        `${server.origin}/bin`,
+        server.origin,
         targetFilename,
         'test.js',
         `0x${keccak256('something')}`
@@ -176,7 +176,7 @@ tape('Download binary', async function (t) {
 
     try {
       await downloader.downloadBinary(
-        `${server.origin}/bin`,
+        server.origin,
         targetFilename,
         file.name,
         `0x${keccak256('something')}`