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

Refactor contracts-* exports so none in test dir so npmignore works as intended

Browse Source
This commit is contained in:
fabioberger
2019-11-11 21:49:29 +00:00
parent 67e7b5c124
commit 6324a92ec5
64 changed files with 72 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/coordinator/test/libs.ts
View File

@@ -2,7 +2,7 @@ import { blockchainTests, constants, expect, randomAddress } from '@0x/contracts
import { transactionHashUtils } from '@0x/order-utils';
import { BigNumber } from '@0x/utils';
import { hashUtils } from './utils/hash_utils';
import { hashUtils } from '../src/hash_utils';
import { artifacts } from './artifacts';

2
contracts/coordinator/test/mixins.ts
View File

@@ -13,7 +13,7 @@ import { CoordinatorRevertErrors, transactionHashUtils } from '@0x/order-utils';
import { SignatureType, SignedOrder } from '@0x/types';
import { BigNumber, LibBytesRevertErrors } from '@0x/utils';
import { ApprovalFactory } from './utils/approval_factory';
import { ApprovalFactory } from '../src/approval_factory';
import { artifacts } from './artifacts';

29
contracts/coordinator/test/utils/approval_factory.ts
View File

@@ -1,29 +0,0 @@
import { hexConcat, signingUtils } from '@0x/contracts-test-utils';
import { SignatureType, SignedZeroExTransaction } from '@0x/types';
import { hashUtils, SignedCoordinatorApproval } from './index';
export class ApprovalFactory {
private readonly _privateKey: Buffer;
private readonly _verifyingContractAddress: string;
constructor(privateKey: Buffer, verifyingContract: string) {
this._privateKey = privateKey;
this._verifyingContractAddress = verifyingContract;
}
public newSignedApproval(
transaction: SignedZeroExTransaction,
txOrigin: string,
signatureType: SignatureType = SignatureType.EthSign,
): SignedCoordinatorApproval {
const approvalHashBuff = hashUtils.getApprovalHashBuffer(transaction, this._verifyingContractAddress, txOrigin);
const signatureBuff = signingUtils.signMessage(approvalHashBuff, this._privateKey, signatureType);
const signedApproval = {
txOrigin,
transaction,
signature: hexConcat(signatureBuff),
};
return signedApproval;
}
}

16
contracts/coordinator/test/utils/hash_utils.ts
View File

@@ -1,16 +0,0 @@
import { hexConcat } from '@0x/contracts-test-utils';
import { eip712Utils } from '@0x/order-utils';
import { SignedZeroExTransaction } from '@0x/types';
import { signTypedDataUtils } from '@0x/utils';
export const hashUtils = {
getApprovalHashBuffer(transaction: SignedZeroExTransaction, verifyingContract: string, txOrigin: string): Buffer {
const typedData = eip712Utils.createCoordinatorApprovalTypedData(transaction, verifyingContract, txOrigin);
const hashBuffer = signTypedDataUtils.generateTypedDataHash(typedData);
return hashBuffer;
},
getApprovalHashHex(transaction: SignedZeroExTransaction, verifyingContract: string, txOrigin: string): string {
const hashHex = hexConcat(hashUtils.getApprovalHashBuffer(transaction, verifyingContract, txOrigin));
return hashHex;
},
};

3
contracts/coordinator/test/utils/index.ts
View File

@@ -1,3 +0,0 @@
export { hashUtils } from './hash_utils';
export { ApprovalFactory } from './approval_factory';
export * from './types';

10
contracts/coordinator/test/utils/types.ts
View File

@@ -1,10 +0,0 @@
import { SignedZeroExTransaction } from '@0x/types';
export interface CoordinatorApproval {
transaction: SignedZeroExTransaction;
txOrigin: string;
}
export interface SignedCoordinatorApproval extends CoordinatorApproval {
signature: string;
}