crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove TestValidatorWallet DataType

Browse Source
This commit is contained in:
Amir Bandeali
2019-08-29 23:59:00 -07:00
parent 5f8e092c96
commit c156bfc534
4 changed files with 22 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contracts/exchange/test/core.ts
View File

@@ -47,7 +47,6 @@ import {
ExchangeWrapper,
TestValidatorWalletContract,
ValidatorWalletAction,
ValidatorWalletDataType,
} from '../src';
import { FillOrderWrapper } from './assertion_wrappers/fill_order_wrapper';
@@ -267,7 +266,6 @@ blockchainTests.resets('Exchange core', () => {
// Allow the signature check for the first fill.
await validatorWallet.prepare.awaitTransactionSuccessAsync(
orderHashHex,
ValidatorWalletDataType.Order,
ValidatorWalletAction.Accept,
constants.NULL_BYTES,
);
@@ -276,7 +274,6 @@ blockchainTests.resets('Exchange core', () => {
// Reject the signature check for the second fill.
await validatorWallet.prepare.awaitTransactionSuccessAsync(
orderHashHex,
ValidatorWalletDataType.Order,
ValidatorWalletAction.Reject,
constants.NULL_BYTES,
);
@@ -300,7 +297,6 @@ blockchainTests.resets('Exchange core', () => {
// Allow the signature check for the first fill.
await validatorWallet.prepare.awaitTransactionSuccessAsync(
orderHashHex,
ValidatorWalletDataType.Order,
ValidatorWalletAction.Accept,
constants.NULL_BYTES,
);
@@ -309,7 +305,6 @@ blockchainTests.resets('Exchange core', () => {
// Reject the signature check for the second fill.
await validatorWallet.prepare.awaitTransactionSuccessAsync(
orderHashHex,
ValidatorWalletDataType.Order,
ValidatorWalletAction.Reject,
constants.NULL_BYTES,
);
@@ -333,7 +328,6 @@ blockchainTests.resets('Exchange core', () => {
// Allow the signature check for the first fill.
await validatorWallet.prepare.awaitTransactionSuccessAsync(
orderHashHex,
ValidatorWalletDataType.Order,
ValidatorWalletAction.Accept,
constants.NULL_BYTES,
);
@@ -342,7 +336,6 @@ blockchainTests.resets('Exchange core', () => {
// Reject the signature check for the second fill.
await validatorWallet.prepare.awaitTransactionSuccessAsync(
orderHashHex,
ValidatorWalletDataType.Order,
ValidatorWalletAction.Reject,
constants.NULL_BYTES,
);

5
contracts/exchange/test/signature_validator.ts
View File

@@ -29,7 +29,7 @@ import {
TestValidatorWalletContract,
} from '../src';
import { ValidatorWalletAction, ValidatorWalletDataType } from './utils';
import { ValidatorWalletAction } from './utils';
// tslint:disable:no-unnecessary-type-assertion
blockchainTests.resets('MixinSignatureValidator', env => {
@@ -333,7 +333,6 @@ blockchainTests.resets('MixinSignatureValidator', env => {
if (validatorAction !== undefined) {
await validatorWallet.prepare.awaitTransactionSuccessAsync(
_hashHex,
ValidatorWalletDataType.None,
validatorAction,
expectedSignatureHashHex,
);
@@ -458,7 +457,6 @@ blockchainTests.resets('MixinSignatureValidator', env => {
if (validatorAction !== undefined) {
await validatorWallet.prepare.awaitTransactionSuccessAsync(
orderHashHex,
ValidatorWalletDataType.Order,
validatorAction,
expectedSignatureHashHex,
);
@@ -755,7 +753,6 @@ blockchainTests.resets('MixinSignatureValidator', env => {
if (validatorAction !== undefined) {
await validatorWallet.prepare.awaitTransactionSuccessAsync(
transactionHashHex,
ValidatorWalletDataType.ZeroExTransaction,
validatorAction,
expectedSignatureHashHex,
);

7
contracts/exchange/test/utils/constants.ts
View File

@@ -40,10 +40,3 @@ export enum ValidatorWalletAction {
ReturnNothing = 6,
NTypes = 7,
}
export enum ValidatorWalletDataType {
None = 0,
Order = 1,
ZeroExTransaction = 2,
NTypes = 3,
}