aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-11-30 08:30:51 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-12-19 05:36:05 +0800
commit37a1271af256af2c0a64b947b3c212a749b540b0 (patch)
treed1d5bc29cb7a63622177127ea88f3a6bbbd4a555 /packages
parent743c4c36eb6300866a0bd0c8a4bf39a3ce7b31c2 (diff)
downloaddexon-sol-tools-37a1271af256af2c0a64b947b3c212a749b540b0.tar
dexon-sol-tools-37a1271af256af2c0a64b947b3c212a749b540b0.tar.gz
dexon-sol-tools-37a1271af256af2c0a64b947b3c212a749b540b0.tar.bz2
dexon-sol-tools-37a1271af256af2c0a64b947b3c212a749b540b0.tar.lz
dexon-sol-tools-37a1271af256af2c0a64b947b3c212a749b540b0.tar.xz
dexon-sol-tools-37a1271af256af2c0a64b947b3c212a749b540b0.tar.zst
dexon-sol-tools-37a1271af256af2c0a64b947b3c212a749b540b0.zip
fillOrder -> executeTransaction rename
Diffstat (limited to 'packages')
-rw-r--r--packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol2
-rw-r--r--packages/contracts/test/extensions/compliant_forwarder.ts10
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol b/packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol
index f34ee699d..7a4c8d2f6 100644
--- a/packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol
+++ b/packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol
@@ -38,7 +38,7 @@ contract CompliantForwarder {
COMPLIANCE_TOKEN = IERC721Token(complianceToken);
}
- function fillOrder(
+ function executeTransaction(
uint256 salt,
address signerAddress,
bytes signedFillOrderTransaction,
diff --git a/packages/contracts/test/extensions/compliant_forwarder.ts b/packages/contracts/test/extensions/compliant_forwarder.ts
index 61bbe020c..c962d82ac 100644
--- a/packages/contracts/test/extensions/compliant_forwarder.ts
+++ b/packages/contracts/test/extensions/compliant_forwarder.ts
@@ -193,7 +193,7 @@ describe.only(ContractName.CompliantForwarder, () => {
erc20Balances = await erc20Wrapper.getBalancesAsync();
});
it('should transfer the correct amounts when maker and taker are compliant', async () => {
- await compliantForwarderInstance.fillOrder.sendTransactionAsync(
+ await compliantForwarderInstance.executeTransaction.sendTransactionAsync(
compliantSignedFillOrderTx.salt,
compliantSignedFillOrderTx.signerAddress,
compliantSignedFillOrderTx.data,
@@ -241,7 +241,7 @@ describe.only(ContractName.CompliantForwarder, () => {
const txDataBufWithBadSelector = Buffer.concat([badSelectorBuf, txDataBufMinusSelector]);
const txDataBufWithBadSelectorHex = ethUtil.bufferToHex(txDataBufWithBadSelector);
// Call compliant forwarder
- return expectTransactionFailedWithoutReasonAsync(compliantForwarderInstance.fillOrder.sendTransactionAsync(
+ return expectTransactionFailedWithoutReasonAsync(compliantForwarderInstance.executeTransaction.sendTransactionAsync(
compliantSignedFillOrderTx.salt,
compliantSignedFillOrderTx.signerAddress,
txDataBufWithBadSelectorHex,
@@ -266,7 +266,7 @@ describe.only(ContractName.CompliantForwarder, () => {
signedOrderWithoutExchangeAddressData,
);
// Call compliant forwarder
- return expectTransactionFailedWithoutReasonAsync(compliantForwarderInstance.fillOrder.sendTransactionAsync(
+ return expectTransactionFailedWithoutReasonAsync(compliantForwarderInstance.executeTransaction.sendTransactionAsync(
signedFillOrderTx.salt,
signedFillOrderTx.signerAddress,
signedFillOrderTx.data,
@@ -275,7 +275,7 @@ describe.only(ContractName.CompliantForwarder, () => {
});
it('should revert if taker address is not compliant (does not hold a Yes Token)', async () => {
return expectTransactionFailedAsync(
- compliantForwarderInstance.fillOrder.sendTransactionAsync(
+ compliantForwarderInstance.executeTransaction.sendTransactionAsync(
compliantSignedFillOrderTx.salt,
nonCompliantAddress,
compliantSignedFillOrderTx.data,
@@ -303,7 +303,7 @@ describe.only(ContractName.CompliantForwarder, () => {
);
// Call compliant forwarder
return expectTransactionFailedAsync(
- compliantForwarderInstance.fillOrder.sendTransactionAsync(
+ compliantForwarderInstance.executeTransaction.sendTransactionAsync(
signedFillOrderTx.salt,
signedFillOrderTx.signerAddress,
signedFillOrderTx.data,