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

Ran prettier

Browse Source
This commit is contained in:
Greg Hysen
2018-04-16 18:29:47 -07:00
committed by Amir Bandeali
parent 3b7068e8d0
commit f4589b5bd4
4 changed files with 15 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/contracts/test/asset_proxy_dispatcher/dispatcher.ts
View File

@@ -57,21 +57,13 @@ describe('AssetProxyDispatcher', () => {
});
// Deploy ERC20 Proxy
const erc20ProxyInstance = await deployer.deployAsync(ContractName.ERC20Proxy);
erc20Proxy = new ERC20ProxyContract(
erc20ProxyInstance.abi,
erc20ProxyInstance.address,
provider,
);
erc20Proxy = new ERC20ProxyContract(erc20ProxyInstance.abi, erc20ProxyInstance.address, provider);
await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, {
from: owner,
});
// Deploy ERC721 Proxy
const erc721ProxyInstance = await deployer.deployAsync(ContractName.ERC721Proxy);
erc721Proxy = new ERC721ProxyContract(
erc721ProxyInstance.abi,
erc721ProxyInstance.address,
provider,
);
erc721Proxy = new ERC721ProxyContract(erc721ProxyInstance.abi, erc721ProxyInstance.address, provider);
await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, {
from: owner,
});

37
packages/contracts/test/asset_proxy_dispatcher/proxies.ts
View File

@@ -48,21 +48,13 @@ describe('Asset Transfer Proxies', () => {
takerAddress = accounts[4];
// Deploy ERC20 Proxy
const erc20ProxyInstance = await deployer.deployAsync(ContractName.ERC20Proxy);
erc20Proxy = new ERC20ProxyContract(
erc20ProxyInstance.abi,
erc20ProxyInstance.address,
provider,
);
erc20Proxy = new ERC20ProxyContract(erc20ProxyInstance.abi, erc20ProxyInstance.address, provider);
await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcherAddress, {
from: owner,
});
// Deploy ERC721 Proxy
const erc721ProxyInstance = await deployer.deployAsync(ContractName.ERC721Proxy);
erc721Proxy = new ERC721ProxyContract(
erc721ProxyInstance.abi,
erc721ProxyInstance.address,
provider,
);
erc721Proxy = new ERC721ProxyContract(erc721ProxyInstance.abi, erc721ProxyInstance.address, provider);
await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcherAddress, {
from: owner,
});
@@ -112,10 +104,7 @@ describe('Asset Transfer Proxies', () => {
});
it('should successfully encode/decode metadata padded with zeros', async () => {
const metadata = await erc20Proxy.encodeMetadata.callAsync(
AssetProxyId.ERC20,
testAddressPaddedWithZeros,
);
const metadata = await erc20Proxy.encodeMetadata.callAsync(AssetProxyId.ERC20, testAddressPaddedWithZeros);
const address = await erc20Proxy.decodeMetadata.callAsync(metadata);
expect(address).to.be.equal(testAddressPaddedWithZeros);
});
@@ -195,13 +184,9 @@ describe('Asset Transfer Proxies', () => {
// Perform a transfer from makerAddress to takerAddress
const amount = new BigNumber(10);
return expect(
erc20Proxy.transferFrom.sendTransactionAsync(
encodedProxyMetadata,
makerAddress,
takerAddress,
amount,
{ from: notAuthorized },
),
erc20Proxy.transferFrom.sendTransactionAsync(encodedProxyMetadata, makerAddress, takerAddress, amount, {
from: notAuthorized,
}),
).to.be.rejectedWith(constants.REVERT);
});
});
@@ -314,13 +299,9 @@ describe('Asset Transfer Proxies', () => {
// Perform a transfer; expect this to fail.
const amount = new BigNumber(1);
return expect(
erc20Proxy.transferFrom.sendTransactionAsync(
encodedProxyMetadata,
makerAddress,
takerAddress,
amount,
{ from: notAuthorized },
),
erc20Proxy.transferFrom.sendTransactionAsync(encodedProxyMetadata, makerAddress, takerAddress, amount, {
from: notAuthorized,
}),
).to.be.rejectedWith(constants.REVERT);
});

12
packages/contracts/test/exchange/core.ts
View File

@@ -103,11 +103,7 @@ describe('Exchange', () => {
);
// Deploy ERC20 Proxy
const erc20ProxyInstance = await deployer.deployAsync(ContractName.ERC20Proxy);
erc20Proxy = new ERC20ProxyContract(
erc20ProxyInstance.abi,
erc20ProxyInstance.address,
provider,
);
erc20Proxy = new ERC20ProxyContract(erc20ProxyInstance.abi, erc20ProxyInstance.address, provider);
await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, {
from: owner,
});
@@ -119,11 +115,7 @@ describe('Exchange', () => {
);
// Deploy ERC721 Proxy
const erc721ProxyInstance = await deployer.deployAsync(ContractName.ERC721Proxy);
erc721Proxy = new ERC721ProxyContract(
erc721ProxyInstance.abi,
erc721ProxyInstance.address,
provider,
);
erc721Proxy = new ERC721ProxyContract(erc721ProxyInstance.abi, erc721ProxyInstance.address, provider);
await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, {
from: owner,
});

12
packages/contracts/test/exchange/wrapper.ts
View File

@@ -84,11 +84,7 @@ describe('Exchange', () => {
);
// Deploy ERC20 Proxy
const erc20ProxyInstance = await deployer.deployAsync(ContractName.ERC20Proxy);
erc20Proxy = new ERC20ProxyContract(
erc20ProxyInstance.abi,
erc20ProxyInstance.address,
provider,
);
erc20Proxy = new ERC20ProxyContract(erc20ProxyInstance.abi, erc20ProxyInstance.address, provider);
await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, {
from: owner,
});
@@ -100,11 +96,7 @@ describe('Exchange', () => {
);
// Deploy ERC721 Proxy
const erc721ProxyInstance = await deployer.deployAsync(ContractName.ERC721Proxy);
erc721Proxy = new ERC721ProxyContract(
erc721ProxyInstance.abi,
erc721ProxyInstance.address,
provider,
);
erc721Proxy = new ERC721ProxyContract(erc721ProxyInstance.abi, erc721ProxyInstance.address, provider);
await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, {
from: owner,
});