From 387363283ca03ac1d6c9be5b7be2107790bbf79d Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 22 Jan 2018 21:53:32 +0100
Subject: Remove truffle from tests

---
 packages/contracts/util/order.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'packages/contracts/util/order.ts')

diff --git a/packages/contracts/util/order.ts b/packages/contracts/util/order.ts
index e202d485b..702b2312c 100644
--- a/packages/contracts/util/order.ts
+++ b/packages/contracts/util/order.ts
@@ -1,4 +1,5 @@
 import { BigNumber, promisify } from '@0xproject/utils';
+import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import ethUtil = require('ethereumjs-util');
 import * as _ from 'lodash';
 import Web3 = require('web3');
@@ -12,8 +13,10 @@ const web3: Web3 = (global as any).web3;
 
 export class Order {
     public params: OrderParams;
-    constructor(params: OrderParams) {
+    private _web3Wrapper: Web3Wrapper;
+    constructor(web3Wrapper: Web3Wrapper, params: OrderParams) {
         this.params = params;
+        this._web3Wrapper = web3Wrapper;
     }
     public isValidSignature() {
         const { v, r, s } = this.params;
@@ -32,7 +35,7 @@ export class Order {
     }
     public async signAsync() {
         const orderHash = this._getOrderHash();
-        const signature = await promisify<string>(web3.eth.sign)(this.params.maker, orderHash);
+        const signature = await this._web3Wrapper.signTransactionAsync(this.params.maker, orderHash);
         const { v, r, s } = ethUtil.fromRpcSig(signature);
         this.params = _.assign(this.params, {
             orderHashHex: orderHash,
-- 
cgit v1.2.3


From 1e9147b8bb45a251eefdead23573a9e8d68fc34b Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Thu, 25 Jan 2018 15:12:46 +0100
Subject: Normalize the dependencies

---
 packages/contracts/util/order.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'packages/contracts/util/order.ts')

diff --git a/packages/contracts/util/order.ts b/packages/contracts/util/order.ts
index 702b2312c..57bb2bcbf 100644
--- a/packages/contracts/util/order.ts
+++ b/packages/contracts/util/order.ts
@@ -1,16 +1,11 @@
-import { BigNumber, promisify } from '@0xproject/utils';
+import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import ethUtil = require('ethereumjs-util');
 import * as _ from 'lodash';
-import Web3 = require('web3');
 
 import { crypto } from './crypto';
 import { OrderParams } from './types';
 
-// In order to benefit from type-safety, we re-assign the global web3 instance injected by Truffle
-// with type `any` to a variable of type `Web3`.
-const web3: Web3 = (global as any).web3;
-
 export class Order {
     public params: OrderParams;
     private _web3Wrapper: Web3Wrapper;
-- 
cgit v1.2.3