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

ignore generated wrappers and asset-swapper (#591)

Browse Source
This commit is contained in:
eobbad
2022-09-26 16:05:55 -04:00
committed by GitHub
parent c9b1aac8a5
commit b6597df84f
17 changed files with 43 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/zero-ex/test/artifacts.ts
View File

@@ -389,7 +389,8 @@ export const artifacts = {
TestNoEthRecipient: TestNoEthRecipient as ContractArtifact,
TestOrderSignerRegistryWithContractWallet: TestOrderSignerRegistryWithContractWallet as ContractArtifact,
TestPermissionlessTransformerDeployerSuicidal: TestPermissionlessTransformerDeployerSuicidal as ContractArtifact,
TestPermissionlessTransformerDeployerTransformer: TestPermissionlessTransformerDeployerTransformer as ContractArtifact,
TestPermissionlessTransformerDeployerTransformer:
TestPermissionlessTransformerDeployerTransformer as ContractArtifact,
TestPropertyValidator: TestPropertyValidator as ContractArtifact,
TestRfqOriginRegistration: TestRfqOriginRegistration as ContractArtifact,
TestSimpleFunctionRegistryFeatureImpl1: TestSimpleFunctionRegistryFeatureImpl1 as ContractArtifact,

18
contracts/zero-ex/test/features/native_orders_feature_test.ts
View File

@@ -61,15 +61,8 @@ blockchainTests.resets('NativeOrdersFeature', env => {
before(async () => {
let owner;
[
owner,
maker,
taker,
notMaker,
notTaker,
contractWalletOwner,
contractWalletSigner,
] = await env.getAccountAddressesAsync();
[owner, maker, taker, notMaker, notTaker, contractWalletOwner, contractWalletSigner] =
await env.getAccountAddressesAsync();
[makerToken, takerToken, wethToken] = await Promise.all(
[...new Array(3)].map(async () =>
TestMintableERC20TokenContract.deployFrom0xArtifactAsync(
@@ -761,11 +754,8 @@ blockchainTests.resets('NativeOrdersFeature', env => {
receipt: undefined,
...opts,
};
const {
makerTokenFilledAmount,
takerTokenFilledAmount,
takerTokenFeeFilledAmount,
} = computeLimitOrderFilledAmounts(order, takerTokenFillAmount, takerTokenAlreadyFilledAmount);
const { makerTokenFilledAmount, takerTokenFilledAmount, takerTokenFeeFilledAmount } =
computeLimitOrderFilledAmounts(order, takerTokenFillAmount, takerTokenAlreadyFilledAmount);
const makerBalance = await takerToken.balanceOf(maker).callAsync();
const takerBalance = await makerToken.balanceOf(taker).callAsync();
const feeRecipientBalance = await takerToken.balanceOf(order.feeRecipient).callAsync();

13
contracts/zero-ex/test/features/otc_orders_test.ts
View File

@@ -42,17 +42,8 @@ blockchainTests.resets('OtcOrdersFeature', env => {
// Useful for ETH balance accounting
const txDefaults = { ...env.txDefaults, gasPrice: 0 };
let owner;
[
owner,
maker,
taker,
notMaker,
notTaker,
contractWalletOwner,
contractWalletSigner,
txOrigin,
notTxOrigin,
] = await env.getAccountAddressesAsync();
[owner, maker, taker, notMaker, notTaker, contractWalletOwner, contractWalletSigner, txOrigin, notTxOrigin] =
await env.getAccountAddressesAsync();
[makerToken, takerToken] = await Promise.all(
[...new Array(2)].map(async () =>
TestMintableERC20TokenContract.deployFrom0xArtifactAsync(

24
contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts
View File

@@ -334,17 +334,13 @@ blockchainTests.resets('FillQuoteTransformer', env => {
async function getBalancesAsync(owner: string): Promise<Balances> {
const balances = { ...ZERO_BALANCES };
[
balances.makerTokenBalance,
balances.takerTokensBalance,
balances.takerFeeBalance,
balances.ethBalance,
] = await Promise.all([
makerToken.balanceOf(owner).callAsync(),
takerToken.balanceOf(owner).callAsync(),
takerFeeToken.balanceOf(owner).callAsync(),
env.web3Wrapper.getBalanceInWeiAsync(owner),
]);
[balances.makerTokenBalance, balances.takerTokensBalance, balances.takerFeeBalance, balances.ethBalance] =
await Promise.all([
makerToken.balanceOf(owner).callAsync(),
takerToken.balanceOf(owner).callAsync(),
takerFeeToken.balanceOf(owner).callAsync(),
env.web3Wrapper.getBalanceInWeiAsync(owner),
]);
return balances;
}
@@ -365,11 +361,7 @@ blockchainTests.resets('FillQuoteTransformer', env => {
function normalizeFillAmount(raw: BigNumber, balance: BigNumber): BigNumber {
if (raw.gte(HIGH_BIT)) {
return raw
.minus(HIGH_BIT)
.div('1e18')
.times(balance)
.integerValue(BigNumber.ROUND_DOWN);
return raw.minus(HIGH_BIT).div('1e18').times(balance).integerValue(BigNumber.ROUND_DOWN);
}
return raw;
}

7
contracts/zero-ex/test/utils/orders.ts
View File

@@ -217,11 +217,8 @@ export class NativeOrdersTestEnvironment {
takerTokenFillAmount: BigNumber = order.takerAmount,
takerTokenAlreadyFilledAmount: BigNumber = ZERO,
): IZeroExLimitOrderFilledEventArgs {
const {
makerTokenFilledAmount,
takerTokenFilledAmount,
takerTokenFeeFilledAmount,
} = computeLimitOrderFilledAmounts(order, takerTokenFillAmount, takerTokenAlreadyFilledAmount);
const { makerTokenFilledAmount, takerTokenFilledAmount, takerTokenFeeFilledAmount } =
computeLimitOrderFilledAmounts(order, takerTokenFillAmount, takerTokenAlreadyFilledAmount);
const protocolFee = order.taker !== NULL_ADDRESS ? ZERO : this.protocolFee;
return {
takerTokenFilledAmount,