aboutsummaryrefslogtreecommitdiffstats
path: root/src/contract_wrappers
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-06-06 18:37:14 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-06-06 18:37:14 +0800
commitc9fe2b16b9efcef123e8402d38f84a966f49f4f7 (patch)
tree80079de078786c3340172a220eba234c18bf863a /src/contract_wrappers
parentce203d9e9d58c41c737ea3b392c253c0da4714ad (diff)
downloaddexon-sol-tools-c9fe2b16b9efcef123e8402d38f84a966f49f4f7.tar
dexon-sol-tools-c9fe2b16b9efcef123e8402d38f84a966f49f4f7.tar.gz
dexon-sol-tools-c9fe2b16b9efcef123e8402d38f84a966f49f4f7.tar.bz2
dexon-sol-tools-c9fe2b16b9efcef123e8402d38f84a966f49f4f7.tar.lz
dexon-sol-tools-c9fe2b16b9efcef123e8402d38f84a966f49f4f7.tar.xz
dexon-sol-tools-c9fe2b16b9efcef123e8402d38f84a966f49f4f7.tar.zst
dexon-sol-tools-c9fe2b16b9efcef123e8402d38f84a966f49f4f7.zip
Rename senderAccount to takerAddress
Diffstat (limited to 'src/contract_wrappers')
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 35ba7770c..7b0394391 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -115,16 +115,16 @@ export class ExchangeWrapper extends ContractWrapper {
* false forgoes this check and causes the smart contract to throw instead.
*/
public async fillOrderAsync(signedOrder: SignedOrder, fillTakerAmount: BigNumber.BigNumber,
- shouldCheckTransfer: boolean, senderAccount: string): Promise<void> {
+ shouldCheckTransfer: boolean, takerAddress: string): Promise<void> {
assert.doesConformToSchema('signedOrder',
SchemaValidator.convertToJSONSchemaCompatibleObject(signedOrder as object),
signedOrderSchema);
assert.isBigNumber('fillTakerAmount', fillTakerAmount);
assert.isBoolean('shouldCheckTransfer', shouldCheckTransfer);
- await assert.isSenderAccountHexAsync('senderAccount', senderAccount, this.web3Wrapper);
+ await assert.isSenderAccountHexAsync('takerAddress', takerAddress, this.web3Wrapper);
const exchangeInstance = await this.getExchangeContractAsync();
- await this.validateFillOrderAndThrowIfInvalidAsync(signedOrder, fillTakerAmount, senderAccount);
+ await this.validateFillOrderAndThrowIfInvalidAsync(signedOrder, fillTakerAmount, takerAddress);
const orderAddresses: OrderAddresses = [
signedOrder.maker,
@@ -150,7 +150,7 @@ export class ExchangeWrapper extends ContractWrapper {
signedOrder.ecSignature.r,
signedOrder.ecSignature.s,
{
- from: senderAccount,
+ from: takerAddress,
},
);
const response: ContractResponse = await exchangeInstance.fill(
@@ -162,7 +162,7 @@ export class ExchangeWrapper extends ContractWrapper {
signedOrder.ecSignature.r,
signedOrder.ecSignature.s,
{
- from: senderAccount,
+ from: takerAddress,
gas,
},
);