Merge in work from MrRefactoring's branch

Author: eggplantzzz

packages/core/lib/repl.js

@@ -69,7 +69,7 @@ ReplManager.prototype.start = function(options) {
 
  // Bubble the internal repl's reset event
  this.repl.on("reset", function() {
- process.stdout.write('\u001B[2J\u001B[0;0f');
+ process.stdout.write("\u001B[2J\u001B[0;0f");
  self.emit("reset");
  });
 

packages/core/lib/testing/testresolver.js

@@ -27,15 +27,13 @@ TestResolver.prototype.require = function(import_path) {
  return result;
 };
 
-TestResolver.prototype.resolve = function(
- importPath,
- importedFrom,
- callback
-) {
+TestResolver.prototype.resolve = function(importPath, importedFrom, callback) {
  var self = this;
- this.source.resolve(importPath)
+ this.source
+ .resolve(importPath)
  .then(result => {
- if (result && result.body) return callback(null, result.body, result.resolvedPath);
+ if (result && result.body)
+ return callback(null, result.body, result.resolvedPath);
  self.resolver.resolve(importPath, importedFrom, callback);
  })
  .catch(callback);

packages/core/lib/testing/testsource.js

@@ -22,9 +22,7 @@ TestSource.prototype.resolve = async function(importPath) {
  const buildDirFiles = (abstractionFiles = fse.readdirSync(
  self.config.contracts_build_directory
  ));
- abstractionFiles = buildDirFiles.filter(file =>
- file.match(/^.*.json$/)
- );
+ abstractionFiles = buildDirFiles.filter(file => file.match(/^.*.json$/));
 
  const mapping = {};
 

packages/resolver/index.js

@@ -46,7 +46,8 @@ Resolver.prototype.resolve = function(import_path, imported_from, callback) {
  },
  function(next) {
  source = self.sources[current_index];
- source.resolve(import_path, imported_from)
+ source
+ .resolve(import_path, imported_from)
  .then(result => {
  if (result.body) {
  resolved_body = result.body;