Add extra tests

0xProject · Sep 23, 2019 · 00ce470 · 00ce470
1 parent e74b546
commit 00ce470
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 4 deletions.
diff --git a/contracts/multisig/test/asset_proxy_owner.ts b/contracts/multisig/test/asset_proxy_owner.ts
@@ -112,6 +112,22 @@ blockchainTests.resets('AssetProxyOwner', env => {
             );
             await expect(tx).to.revertWith(RevertReason.EqualLengthsRequired);
         });
+        it('should fail if functionCallTimeLockSeconds.length != destinations.length', async () => {
+            const reg = createFunctionRegistration(2, 1, 1);
+            const tx = TestAssetProxyOwnerContract.deployFrom0xArtifactAsync(
+                artifacts.TestAssetProxyOwner,
+                env.provider,
+                env.txDefaults,
+                artifacts,
+                reg.functionSelectors,
+                reg.destinations,
+                reg.functionCallTimeLockSeconds,
+                signerAddresses,
+                new BigNumber(REQUIRED_SIGNERS),
+                new BigNumber(DEFAULT_TIME_LOCK),
+            );
+            await expect(tx).to.revertWith(RevertReason.EqualLengthsRequired);
+        });
         it('should allow no function calls to be registered', async () => {
             const tx = TestAssetProxyOwnerContract.deployFrom0xArtifactAsync(
                 artifacts.TestAssetProxyOwner,
@@ -178,6 +194,7 @@ blockchainTests.resets('AssetProxyOwner', env => {
                 reg.functionSelectors[0],
                 reg.destinations[0],
                 reg.functionCallTimeLockSeconds[0],
+                { from: signerAddresses[0] },
             );
             expect(tx).to.revertWith(RevertReason.OnlyCallableByWallet);
         });
@@ -291,6 +308,23 @@ blockchainTests.resets('AssetProxyOwner', env => {
             );
             expect(result).to.revertWith(RevertReason.CustomTimeLockIncomplete);
         });
+        it('should revert if a registered function is called before the custom timelock and after the default timelock', async () => {
+            const reg = createFunctionRegistration(1, 1, 1);
+            await assetProxyOwner.registerFunctionCallBypassWallet.awaitTransactionSuccessAsync(
+                true,
+                reg.functionSelectors[0],
+                reg.destinations[0],
+                new BigNumber(DEFAULT_TIME_LOCK).times(2),
+            );
+            const latestTimestamp = await getLatestBlockTimestampAsync();
+            const transactionConfirmationTime = new BigNumber(latestTimestamp).minus(DEFAULT_TIME_LOCK);
+            const result = assetProxyOwner.assertValidFunctionCall.callAsync(
+                transactionConfirmationTime,
+                reg.functionSelectors[0],
+                reg.destinations[0],
+            );
+            expect(result).to.revertWith(RevertReason.CustomTimeLockIncomplete);
+        });
         it('should be successful if an unregistered function is called after the default timelock', async () => {
             const latestTimestamp = await getLatestBlockTimestampAsync();
             const transactionConfirmationTime = new BigNumber(latestTimestamp).minus(DEFAULT_TIME_LOCK);
@@ -369,6 +403,15 @@ blockchainTests.resets('AssetProxyOwner', env => {
             });
             expect(tx).to.revertWith(RevertReason.TxNotFullyConfirmed);
         });
+        it('should revert if the transaction is not confirmed by the required amount of signers and called by the submitter', async () => {
+            const data = [hexRandom()];
+            const destinations = [receiver.address];
+            const results = await assetProxyOwnerWrapper.submitTransactionAsync(data, destinations, signerAddresses[0]);
+            const tx = assetProxyOwner.executeTransaction.awaitTransactionSuccessAsync(results.txId, {
+                from: signerAddresses[0],
+            });
+            expect(tx).to.revertWith(RevertReason.TxNotFullyConfirmed);
+        });
         it('should be able to execute an unregistered function after the default timelock with no value', async () => {
             const data = [hexRandom()];
             const destinations = [receiver.address];

diff --git a/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts b/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts
@@ -1,6 +1,7 @@
 import { constants, hexRandom, increaseTimeAndMineBlockAsync } from '@0x/contracts-test-utils';
 import { AbiEncoder, BigNumber } from '@0x/utils';
 import { LogWithDecodedArgs, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
+import * as _ from 'lodash';
 
 import { AssetProxyOwnerContract, AssetProxyOwnerSubmissionEventArgs, TestAssetProxyOwnerContract } from '../../src';
 
@@ -33,12 +34,15 @@ export class AssetProxyOwnerWrapper {
         destinations: string[],
         signerAddresses: string[],
         increaseTimeSeconds: number,
-        opts: { values?: BigNumber[]; executeFromAddress?: string } = {},
+        opts: { values?: BigNumber[]; executeFromAddress?: string; requiredSignatures?: number } = {},
     ): Promise<{ executionTxReceipt: TransactionReceiptWithDecodedLogs; txId: BigNumber }> {
         const submitResults = await this.submitTransactionAsync(data, destinations, signerAddresses[0], opts);
-        await this._assetProxyOwner.confirmTransaction.awaitTransactionSuccessAsync(submitResults.txId, {
-            from: signerAddresses[1],
-        });
+        const requiredSignatures = opts.requiredSignatures === undefined ? 2 : opts.requiredSignatures;
+        for (const index of _.range(1, requiredSignatures)) {
+            await this._assetProxyOwner.confirmTransaction.awaitTransactionSuccessAsync(submitResults.txId, {
+                from: signerAddresses[index],
+            });
+        }
         await increaseTimeAndMineBlockAsync(increaseTimeSeconds);
         const executionTxReceipt = await this._assetProxyOwner.executeTransaction.awaitTransactionSuccessAsync(
             submitResults.txId,