From 0e3544e1f997d57089023e65ea9030270914e8eb Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Tue, 17 Apr 2018 12:01:33 -0700 Subject: Miscellaneous style changes to the contracts package; specifically tests --- packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol | 2 +- packages/contracts/src/utils/types.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/contracts/src') diff --git a/packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol b/packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol index 90f3b32d7..f78d9baec 100644 --- a/packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol +++ b/packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol @@ -70,7 +70,7 @@ contract LibBytes { // Read address from array memory assembly { - // 1. Add index to to address of bytes array + // 1. Add index to address of bytes array // 2. Load 32-byte word from memory // 3. Apply 20-byte mask to obtain address result := and(mload(add(b, index)), 0xffffffffffffffffffffffffffffffffffffffff) diff --git a/packages/contracts/src/utils/types.ts b/packages/contracts/src/utils/types.ts index 5bb1a36d4..0e30ddaee 100644 --- a/packages/contracts/src/utils/types.ts +++ b/packages/contracts/src/utils/types.ts @@ -51,8 +51,8 @@ export interface DefaultOrderParams { takerTokenAddress: string; makerTokenAmount: BigNumber; takerTokenAmount: BigNumber; - makerFeeAmount: BigNumber; - takerFeeAmount: BigNumber; + makerFee: BigNumber; + takerFee: BigNumber; makerAssetData: string; takerAssetData: string; } -- cgit