From 3d58b38e4e8565e7ee10e4d6c9f57cd745957ab4 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 7 May 2018 22:11:09 +0200
Subject: Remove deployer from metacoin and contract tests

---
 packages/deployer/README.md       |  3 +--
 packages/deployer/src/compiler.ts | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'packages/deployer')

diff --git a/packages/deployer/README.md b/packages/deployer/README.md
index ef0ddd59d..4c7de2cb0 100644
--- a/packages/deployer/README.md
+++ b/packages/deployer/README.md
@@ -29,13 +29,12 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol
 **Import**
 
 ```typescript
-import { Deployer, Compiler } from '@0xproject/deployer';
+import { Compiler } from '@0xproject/deployer';
 ```
 
 or
 
 ```javascript
-var Deployer = require('@0xproject/deployer').Deployer;
 var Compiler = require('@0xproject/deployer').Compiler;
 ```
 
diff --git a/packages/deployer/src/compiler.ts b/packages/deployer/src/compiler.ts
index e81df3c0a..efb30091b 100644
--- a/packages/deployer/src/compiler.ts
+++ b/packages/deployer/src/compiler.ts
@@ -134,7 +134,7 @@ export class Compiler {
             const isUserOnLatestVersion = currentArtifact.schemaVersion === constants.LATEST_ARTIFACT_VERSION;
             const didCompilerSettingsChange = !_.isEqual(currentArtifact.compiler.settings, this._compilerSettings);
             const didSourceChange = currentArtifact.sourceTreeHashHex !== sourceTreeHashHex;
-            shouldCompile = isUserOnLatestVersion || didCompilerSettingsChange || didSourceChange;
+            shouldCompile = !isUserOnLatestVersion || didCompilerSettingsChange || didSourceChange;
         }
         if (!shouldCompile) {
             return;
@@ -203,6 +203,20 @@ export class Compiler {
                 }. Please make sure your contract has the same name as it's file name`,
             );
         }
+        if (!_.isUndefined(compiledData.evm)) {
+            if (!_.isUndefined(compiledData.evm.bytecode) && !_.isUndefined(compiledData.evm.bytecode.object)) {
+                compiledData.evm.bytecode.object = ethUtil.addHexPrefix(compiledData.evm.bytecode.object);
+            }
+            if (
+                !_.isUndefined(compiledData.evm.deployedBytecode) &&
+                !_.isUndefined(compiledData.evm.deployedBytecode.object)
+            ) {
+                compiledData.evm.deployedBytecode.object = ethUtil.addHexPrefix(
+                    compiledData.evm.deployedBytecode.object,
+                );
+            }
+        }
+
         const sourceCodes = _.mapValues(
             compiled.sources,
             (_1, sourceFilePath) => this._resolver.resolve(sourceFilePath).source,
-- 
cgit v1.2.3