Merge pull request #150 from ethereum/linker

Split linker helper into its own file

Author: axic

linker.js

@@ -0,0 +1,26 @@
+var linkBytecode = function (bytecode, libraries) {
+  for (var libraryName in libraries) {
+    // truncate to 37 characters
+    var internalName = libraryName.slice(0, 36);
+    // prefix and suffix with __
+    var libLabel = '__' + internalName + Array(37 - internalName.length).join('_') + '__';
+
+    var hexAddress = libraries[libraryName];
+    if (hexAddress.slice(0, 2) !== '0x' || hexAddress.length > 42) {
+      throw new Error('Invalid address specified for ' + libraryName);
+    }
+    // remove 0x prefix
+    hexAddress = hexAddress.slice(2);
+    hexAddress = Array(40 - hexAddress.length + 1).join('0') + hexAddress;
+
+    while (bytecode.indexOf(libLabel) >= 0) {
+      bytecode = bytecode.replace(libLabel, hexAddress);
+    }
+  }
+
+  return bytecode;
+};
+
+module.exports = {
+  linkBytecode: linkBytecode
+};

wrapper.js

@@ -1,4 +1,5 @@
 var translate = require('./translate.js');
+var linker = require('./linker.js');
 var requireFromString = require('require-from-string');
 var https = require('https');
 var MemoryStream = require('memorystream');
@@ -153,29 +154,6 @@ function setupMethods (soljson) {
     return translateOutput(compileJSON(sources[0], isOptimizerEnabled(input)));
   };
 
-  var linkBytecode = function (bytecode, libraries) {
-    for (var libraryName in libraries) {
-      // truncate to 37 characters
-      var internalName = libraryName.slice(0, 36);
-      // prefix and suffix with __
-      var libLabel = '__' + internalName + Array(37 - internalName.length).join('_') + '__';
-
-      var hexAddress = libraries[libraryName];
-      if (hexAddress.slice(0, 2) !== '0x' || hexAddress.length > 42) {
-        throw new Error('Invalid address specified for ' + libraryName);
-      }
-      // remove 0x prefix
-      hexAddress = hexAddress.slice(2);
-      hexAddress = Array(40 - hexAddress.length + 1).join('0') + hexAddress;
-
-      while (bytecode.indexOf(libLabel) >= 0) {
-        bytecode = bytecode.replace(libLabel, hexAddress);
-      }
-    }
-
-    return bytecode;
-  };
-
   var version = soljson.cwrap('version', 'string', []);
 
   var license = function () {
@@ -192,7 +170,7 @@ function setupMethods (soljson) {
     compile: compile,
     compileStandard: compileStandard,
     compileStandardWrapper: compileStandardWrapper,
-    linkBytecode: linkBytecode,
+    linkBytecode: linker.linkBytecode,
     supportsMulti: compileJSONMulti !== null,
     supportsImportCallback: compileJSONCallback !== null,
     supportsStandard: compileStandard !== null,