aboutsummaryrefslogtreecommitdiffstats
path: root/contracts/core/test/utils
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-11-23 23:16:15 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-12-03 19:09:28 +0800
commit91c89d90a5266354b14fe81517424396b0ca18b0 (patch)
tree458a1cbecdfed78f7276df0450e7a3cfbd38f2cb /contracts/core/test/utils
parent980e3cb82f73036f124313d641f63b2b50e98251 (diff)
downloaddexon-sol-tools-91c89d90a5266354b14fe81517424396b0ca18b0.tar
dexon-sol-tools-91c89d90a5266354b14fe81517424396b0ca18b0.tar.gz
dexon-sol-tools-91c89d90a5266354b14fe81517424396b0ca18b0.tar.bz2
dexon-sol-tools-91c89d90a5266354b14fe81517424396b0ca18b0.tar.lz
dexon-sol-tools-91c89d90a5266354b14fe81517424396b0ca18b0.tar.xz
dexon-sol-tools-91c89d90a5266354b14fe81517424396b0ca18b0.tar.zst
dexon-sol-tools-91c89d90a5266354b14fe81517424396b0ca18b0.zip
Use assetProxyOwner instead of the multisig in the core contracts tests
Diffstat (limited to 'contracts/core/test/utils')
-rw-r--r--contracts/core/test/utils/asset_proxy_owner_wrapper.ts (renamed from contracts/core/test/utils/multi_sig_wrapper.ts)26
1 files changed, 14 insertions, 12 deletions
diff --git a/contracts/core/test/utils/multi_sig_wrapper.ts b/contracts/core/test/utils/asset_proxy_owner_wrapper.ts
index 34c9c2578..d5aaaf519 100644
--- a/contracts/core/test/utils/multi_sig_wrapper.ts
+++ b/contracts/core/test/utils/asset_proxy_owner_wrapper.ts
@@ -5,15 +5,14 @@ import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import * as _ from 'lodash';
import { AssetProxyOwnerContract } from '../../generated-wrappers/asset_proxy_owner';
-import { MultiSigWalletContract } from '../../generated-wrappers/multi_sig_wallet';
import { artifacts } from '../../src/artifacts';
-export class MultiSigWrapper {
- private readonly _multiSig: MultiSigWalletContract;
+export class AssetProxyOwnerWrapper {
+ private readonly _assetProxyOwner: AssetProxyOwnerContract;
private readonly _web3Wrapper: Web3Wrapper;
private readonly _logDecoder: LogDecoder;
- constructor(multiSigContract: MultiSigWalletContract, provider: Provider) {
- this._multiSig = multiSigContract;
+ constructor(assetproxyOwnerContract: AssetProxyOwnerContract, provider: Provider) {
+ this._assetProxyOwner = assetproxyOwnerContract;
this._web3Wrapper = new Web3Wrapper(provider);
this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
}
@@ -24,19 +23,19 @@ export class MultiSigWrapper {
opts: { value?: BigNumber } = {},
): Promise<TransactionReceiptWithDecodedLogs> {
const value = _.isUndefined(opts.value) ? new BigNumber(0) : opts.value;
- const txHash = await this._multiSig.submitTransaction.sendTransactionAsync(destination, value, data, {
+ const txHash = await this._assetProxyOwner.submitTransaction.sendTransactionAsync(destination, value, data, {
from,
});
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
return tx;
}
public async confirmTransactionAsync(txId: BigNumber, from: string): Promise<TransactionReceiptWithDecodedLogs> {
- const txHash = await this._multiSig.confirmTransaction.sendTransactionAsync(txId, { from });
+ const txHash = await this._assetProxyOwner.confirmTransaction.sendTransactionAsync(txId, { from });
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
return tx;
}
public async revokeConfirmationAsync(txId: BigNumber, from: string): Promise<TransactionReceiptWithDecodedLogs> {
- const txHash = await this._multiSig.revokeConfirmation.sendTransactionAsync(txId, { from });
+ const txHash = await this._assetProxyOwner.revokeConfirmation.sendTransactionAsync(txId, { from });
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
return tx;
}
@@ -45,7 +44,7 @@ export class MultiSigWrapper {
from: string,
opts: { gas?: number } = {},
): Promise<TransactionReceiptWithDecodedLogs> {
- const txHash = await this._multiSig.executeTransaction.sendTransactionAsync(txId, {
+ const txHash = await this._assetProxyOwner.executeTransaction.sendTransactionAsync(txId, {
from,
gas: opts.gas,
});
@@ -58,9 +57,12 @@ export class MultiSigWrapper {
): Promise<TransactionReceiptWithDecodedLogs> {
// tslint:disable-next-line:no-unnecessary-type-assertion
const txHash = await (this
- ._multiSig as AssetProxyOwnerContract).executeRemoveAuthorizedAddressAtIndex.sendTransactionAsync(txId, {
- from,
- });
+ ._assetProxyOwner as AssetProxyOwnerContract).executeRemoveAuthorizedAddressAtIndex.sendTransactionAsync(
+ txId,
+ {
+ from,
+ },
+ );
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
return tx;
}