Merge branch 'master' into 'master_060'

Author: axic

.gitignore

@@ -10,7 +10,7 @@ pids
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 
-# Coverage directory used by tools like istanbul
+# Coverage directory used by tools like istanbul/nyc
 coverage
 
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)

.istanbul.yml

@@ -1,10 +1,13 @@
+var assert = require('assert');
 var keccak256 = require('js-sha3').keccak256;
 
 function libraryHashPlaceholder (input) {
   return '$' + keccak256(input).slice(0, 34) + '$';
 }
 
 var linkBytecode = function (bytecode, libraries) {
+  assert(typeof bytecode === 'string');
+  assert(typeof libraries === 'object');
   // NOTE: for backwards compatibility support old compiler which didn't use file names
   var librariesComplete = {};
   for (var libraryName in libraries) {
@@ -52,6 +55,7 @@ var linkBytecode = function (bytecode, libraries) {
 };
 
 var findLinkReferences = function (bytecode) {
+  assert(typeof bytecode === 'string');
   // find 40 bytes in the pattern of __...<36 digits>...__
   // e.g. __Lib.sol:L_____________________________
   var linkReferences = {};

linker.js

@@ -11,7 +11,7 @@
     "prepublish": "node downloadCurrentVersion.js && node verifyVersion.js",
     "pretest": "npm run lint",
     "test": "tape ./test/index.js",
-    "coverage": "node ./node_modules/istanbul/lib/cli.js cover ./node_modules/tape/bin/tape ./test/index.js",
+    "coverage": "node ./node_modules/nyc/bin/nyc.js --reporter=lcov --reporter=text-summary ./node_modules/tape/bin/tape ./test/index.js",
     "coveralls": "npm run coverage && node ./node_modules/coveralls/bin/coveralls.js <coverage/lcov.info"
   },
   "repository": {
@@ -52,7 +52,7 @@
   },
   "devDependencies": {
     "coveralls": "^3.0.0",
-    "istanbul": "^0.4.5",
+    "nyc": "^14.1.0",
     "semistandard": "^12.0.0",
     "tape": "^4.11.0",
     "tape-spawn": "^1.4.2"
@@ -61,5 +61,10 @@
     "ignore": [
       "soljson.js"
     ]
+  },
+  "nyc": {
+    "exclude": [
+      "soljson.js"
+    ]
   }
 }