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

renamed perUnitValue to valueMultiplier

Browse Source
This commit is contained in:
Greg Hysen
2019-03-15 14:36:21 -07:00
parent 6a7530d741
commit 63ba764de8
1 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
contracts/asset-proxy/test/erc1155_proxy.ts
View File

@@ -37,8 +37,8 @@ describe('ERC1155Proxy', () => {
const receiverContractInitialFungibleBalance = new BigNumber(0); const receiverContractInitialFungibleBalance = new BigNumber(0);
const fungibleValueToTransferSmall = spenderInitialFungibleBalance.div(100); const fungibleValueToTransferSmall = spenderInitialFungibleBalance.div(100);
const fungibleValueToTransferLarge = spenderInitialFungibleBalance.div(4); const fungibleValueToTransferLarge = spenderInitialFungibleBalance.div(4);
const perUnitValueSmall = new BigNumber(2); const valueMultiplierSmall = new BigNumber(2);
const perUnitValueNft = new BigNumber(1); const valueMultiplierNft = new BigNumber(1);
const nonFungibleValueToTransfer = nftOwnerBalance; const nonFungibleValueToTransfer = nftOwnerBalance;
const receiverCallbackData = '0x01020304'; const receiverCallbackData = '0x01020304';
// addresses // addresses
@@ -134,7 +134,7 @@ describe('ERC1155Proxy', () => {
const tokenHolders = [spender, receiver]; const tokenHolders = [spender, receiver];
const tokensToTransfer = fungibleTokens.slice(0, 1); const tokensToTransfer = fungibleTokens.slice(0, 1);
const valuesToTransfer = [fungibleValueToTransferLarge]; const valuesToTransfer = [fungibleValueToTransferLarge];
const perUnitValue = perUnitValueSmall; const valueMultiplier = valueMultiplierSmall;
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance]; const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance];
await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances); await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
@@ -145,12 +145,12 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
); );
// check balances after transfer // check balances after transfer
const totalValueTransferred = valuesToTransfer[0].times(perUnitValue); const totalValueTransferred = valuesToTransfer[0].times(valueMultiplier);
const expectedFinalBalances = [ const expectedFinalBalances = [
spenderInitialFungibleBalance.minus(totalValueTransferred), spenderInitialFungibleBalance.minus(totalValueTransferred),
receiverInitialFungibleBalance.plus(totalValueTransferred), receiverInitialFungibleBalance.plus(totalValueTransferred),
@@ -167,7 +167,7 @@ describe('ERC1155Proxy', () => {
fungibleValueToTransferSmall.plus(20), fungibleValueToTransferSmall.plus(20),
fungibleValueToTransferSmall.plus(30), fungibleValueToTransferSmall.plus(30),
]; ];
const perUnitValue = perUnitValueSmall; const valueMultiplier = valueMultiplierSmall;
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [ const expectedInitialBalances = [
// spender // spender
@@ -183,7 +183,7 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
); );
@@ -191,7 +191,7 @@ describe('ERC1155Proxy', () => {
let totalValueTransferred = _.reduce(valuesToTransfer, (sum: BigNumber, value: BigNumber) => { let totalValueTransferred = _.reduce(valuesToTransfer, (sum: BigNumber, value: BigNumber) => {
return sum.plus(value); return sum.plus(value);
}) as BigNumber; }) as BigNumber;
totalValueTransferred = totalValueTransferred.times(perUnitValue); totalValueTransferred = totalValueTransferred.times(valueMultiplier);
const expectedFinalBalances = [ const expectedFinalBalances = [
// spender // spender
spenderInitialFungibleBalance.minus(totalValueTransferred), spenderInitialFungibleBalance.minus(totalValueTransferred),
@@ -209,7 +209,7 @@ describe('ERC1155Proxy', () => {
fungibleValueToTransferSmall.plus(20), fungibleValueToTransferSmall.plus(20),
fungibleValueToTransferSmall.plus(30), fungibleValueToTransferSmall.plus(30),
]; ];
const perUnitValue = perUnitValueSmall; const valueMultiplier = valueMultiplierSmall;
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [ const expectedInitialBalances = [
// spender // spender
@@ -229,13 +229,13 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
); );
// check balances after transfer // check balances after transfer
const totalValuesTransferred = _.map(valuesToTransfer, (value: BigNumber) => { const totalValuesTransferred = _.map(valuesToTransfer, (value: BigNumber) => {
return value.times(perUnitValue); return value.times(valueMultiplier);
}); });
const expectedFinalBalances = [ const expectedFinalBalances = [
// spender // spender
@@ -254,7 +254,7 @@ describe('ERC1155Proxy', () => {
const tokenHolders = [spender, receiver]; const tokenHolders = [spender, receiver];
const tokensToTransfer = nonFungibleTokensOwnedBySpender.slice(0, 1); const tokensToTransfer = nonFungibleTokensOwnedBySpender.slice(0, 1);
const valuesToTransfer = [nonFungibleValueToTransfer]; const valuesToTransfer = [nonFungibleValueToTransfer];
const perUnitValue = perUnitValueNft; const valueMultiplier = valueMultiplierNft;
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [ const expectedInitialBalances = [
// spender // spender
@@ -270,7 +270,7 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
); );
@@ -292,7 +292,7 @@ describe('ERC1155Proxy', () => {
nonFungibleValueToTransfer, nonFungibleValueToTransfer,
nonFungibleValueToTransfer, nonFungibleValueToTransfer,
]; ];
const perUnitValue = perUnitValueNft; const valueMultiplier = valueMultiplierNft;
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [ const expectedInitialBalances = [
// spender // spender
@@ -312,7 +312,7 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
); );
@@ -342,7 +342,7 @@ describe('ERC1155Proxy', () => {
nonFungibleValueToTransfer, nonFungibleValueToTransfer,
nonFungibleValueToTransfer, nonFungibleValueToTransfer,
]; ];
const perUnitValue = perUnitValueNft; const valueMultiplier = valueMultiplierNft;
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [ const expectedInitialBalances = [
// spender // spender
@@ -366,13 +366,13 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
); );
// check balances after transfer // check balances after transfer
const totalValuesTransferred = _.map(valuesToTransfer, (value: BigNumber) => { const totalValuesTransferred = _.map(valuesToTransfer, (value: BigNumber) => {
return value.times(perUnitValue); return value.times(valueMultiplier);
}); });
const expectedFinalBalances = [ const expectedFinalBalances = [
// spender // spender
@@ -395,9 +395,9 @@ describe('ERC1155Proxy', () => {
const tokenHolders = [spender, receiverContract]; const tokenHolders = [spender, receiverContract];
const tokensToTransfer = fungibleTokens.slice(0, 1); const tokensToTransfer = fungibleTokens.slice(0, 1);
const valuesToTransfer = [fungibleValueToTransferLarge]; const valuesToTransfer = [fungibleValueToTransferLarge];
const perUnitValue = perUnitValueSmall; const valueMultiplier = valueMultiplierSmall;
const totalValuesTransferred = _.map(valuesToTransfer, (value: BigNumber) => { const totalValuesTransferred = _.map(valuesToTransfer, (value: BigNumber) => {
return value.times(perUnitValue); return value.times(valueMultiplier);
}); });
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [spenderInitialFungibleBalance, receiverContractInitialFungibleBalance]; const expectedInitialBalances = [spenderInitialFungibleBalance, receiverContractInitialFungibleBalance];
@@ -409,7 +409,7 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
); );
@@ -438,9 +438,9 @@ describe('ERC1155Proxy', () => {
const tokenHolders = [spender, receiverContract]; const tokenHolders = [spender, receiverContract];
const tokensToTransfer = fungibleTokens.slice(0, 1); const tokensToTransfer = fungibleTokens.slice(0, 1);
const valuesToTransfer = [fungibleValueToTransferLarge]; const valuesToTransfer = [fungibleValueToTransferLarge];
const perUnitValue = perUnitValueSmall; const valueMultiplier = valueMultiplierSmall;
const totalValuesTransferred = _.map(valuesToTransfer, (value: BigNumber) => { const totalValuesTransferred = _.map(valuesToTransfer, (value: BigNumber) => {
return value.times(perUnitValue); return value.times(valueMultiplier);
}); });
const extraData = '0102030405060708'; const extraData = '0102030405060708';
// check balances before transfer // check balances before transfer
@@ -453,7 +453,7 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
extraData, extraData,
@@ -483,7 +483,7 @@ describe('ERC1155Proxy', () => {
const tokenHolders = [spender, receiver]; const tokenHolders = [spender, receiver];
const tokensToTransfer = fungibleTokens.slice(0, 1); const tokensToTransfer = fungibleTokens.slice(0, 1);
const valuesToTransfer = [fungibleValueToTransferLarge]; const valuesToTransfer = [fungibleValueToTransferLarge];
const perUnitValue = new BigNumber(0); const valueMultiplier = new BigNumber(0);
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance]; const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance];
await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances); await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
@@ -494,7 +494,7 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
); );
@@ -513,7 +513,7 @@ describe('ERC1155Proxy', () => {
const tokenHolders = [spender, receiverContract]; const tokenHolders = [spender, receiverContract];
const tokensToTransfer = fungibleTokens.slice(0, 1); const tokensToTransfer = fungibleTokens.slice(0, 1);
const valuesToTransfer = [fungibleValueToTransferLarge]; const valuesToTransfer = [fungibleValueToTransferLarge];
const perUnitValue = perUnitValueSmall; const valueMultiplier = valueMultiplierSmall;
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [spenderInitialFungibleBalance, receiverContractInitialFungibleBalance]; const expectedInitialBalances = [spenderInitialFungibleBalance, receiverContractInitialFungibleBalance];
await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances); await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
@@ -525,7 +525,7 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
), ),
@@ -538,7 +538,7 @@ describe('ERC1155Proxy', () => {
const nftToTransfer = nonFungibleTokensOwnedBySpender[0]; const nftToTransfer = nonFungibleTokensOwnedBySpender[0];
const tokensToTransfer = [nftToTransfer, nftToTransfer]; const tokensToTransfer = [nftToTransfer, nftToTransfer];
const valuesToTransfer = [nonFungibleValueToTransfer, nonFungibleValueToTransfer]; const valuesToTransfer = [nonFungibleValueToTransfer, nonFungibleValueToTransfer];
const perUnitValue = perUnitValueNft; const valueMultiplier = valueMultiplierNft;
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [ const expectedInitialBalances = [
// spender // spender
@@ -557,7 +557,7 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
), ),
@@ -570,7 +570,7 @@ describe('ERC1155Proxy', () => {
const tokensToTransfer = nonFungibleTokensOwnedBySpender.slice(0, 3); const tokensToTransfer = nonFungibleTokensOwnedBySpender.slice(0, 3);
const maxUintValue = new BigNumber(2).pow(256).minus(1); const maxUintValue = new BigNumber(2).pow(256).minus(1);
const valuesToTransfer = [nonFungibleValueToTransfer, maxUintValue, nonFungibleValueToTransfer]; const valuesToTransfer = [nonFungibleValueToTransfer, maxUintValue, nonFungibleValueToTransfer];
const perUnitValue = new BigNumber(2); const valueMultiplier = new BigNumber(2);
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [ const expectedInitialBalances = [
// spender // spender
@@ -592,19 +592,19 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
), ),
RevertReason.Uint256Overflow, RevertReason.Uint256Overflow,
); );
}); });
it('should revert if transferring > 1 instances of a non-fungible token (perUnitValue field >1)', async () => { it('should revert if transferring > 1 instances of a non-fungible token (valueMultiplier field >1)', async () => {
// setup test parameters // setup test parameters
const tokenHolders = [spender, receiver]; const tokenHolders = [spender, receiver];
const tokensToTransfer = nonFungibleTokensOwnedBySpender.slice(0, 1); const tokensToTransfer = nonFungibleTokensOwnedBySpender.slice(0, 1);
const valuesToTransfer = [nonFungibleValueToTransfer]; const valuesToTransfer = [nonFungibleValueToTransfer];
const perUnitValue = new BigNumber(2); const valueMultiplier = new BigNumber(2);
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [ const expectedInitialBalances = [
// spender // spender
@@ -621,7 +621,7 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
), ),
@@ -633,7 +633,7 @@ describe('ERC1155Proxy', () => {
const tokenHolders = [spender, receiver]; const tokenHolders = [spender, receiver];
const tokensToTransfer = nonFungibleTokensOwnedBySpender.slice(0, 1); const tokensToTransfer = nonFungibleTokensOwnedBySpender.slice(0, 1);
const valuesToTransfer = [new BigNumber(2)]; const valuesToTransfer = [new BigNumber(2)];
const perUnitValue = perUnitValueNft; const valueMultiplier = valueMultiplierNft;
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [ const expectedInitialBalances = [
// spender // spender
@@ -650,7 +650,7 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
), ),
@@ -663,7 +663,7 @@ describe('ERC1155Proxy', () => {
const tokensToTransfer = fungibleTokens.slice(0, 1); const tokensToTransfer = fungibleTokens.slice(0, 1);
const valueGreaterThanSpenderBalance = spenderInitialFungibleBalance.plus(1); const valueGreaterThanSpenderBalance = spenderInitialFungibleBalance.plus(1);
const valuesToTransfer = [valueGreaterThanSpenderBalance]; const valuesToTransfer = [valueGreaterThanSpenderBalance];
const perUnitValue = perUnitValueSmall; const valueMultiplier = valueMultiplierSmall;
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance]; const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance];
await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances); await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
@@ -675,7 +675,7 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
), ),
@@ -693,7 +693,7 @@ describe('ERC1155Proxy', () => {
const tokenHolders = [spender, receiver]; const tokenHolders = [spender, receiver];
const tokensToTransfer = fungibleTokens.slice(0, 1); const tokensToTransfer = fungibleTokens.slice(0, 1);
const valuesToTransfer = [fungibleValueToTransferLarge]; const valuesToTransfer = [fungibleValueToTransferLarge];
const perUnitValue = perUnitValueSmall; const valueMultiplier = valueMultiplierSmall;
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance]; const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance];
await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances); await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
@@ -705,7 +705,7 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
authorized, authorized,
), ),
@@ -717,7 +717,7 @@ describe('ERC1155Proxy', () => {
const tokenHolders = [spender, receiver]; const tokenHolders = [spender, receiver];
const tokensToTransfer = fungibleTokens.slice(0, 1); const tokensToTransfer = fungibleTokens.slice(0, 1);
const valuesToTransfer = [fungibleValueToTransferLarge]; const valuesToTransfer = [fungibleValueToTransferLarge];
const perUnitValue = perUnitValueSmall; const valueMultiplier = valueMultiplierSmall;
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance]; const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance];
await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances); await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
@@ -729,7 +729,7 @@ describe('ERC1155Proxy', () => {
erc1155Contract.address, erc1155Contract.address,
tokensToTransfer, tokensToTransfer,
valuesToTransfer, valuesToTransfer,
perUnitValue, valueMultiplier,
receiverCallbackData, receiverCallbackData,
notAuthorized, notAuthorized,
), ),