status-im/keycard-redeem
2
0
Fork 0
mirror of https://github.com/status-im/keycard-redeem.git synced 2025-01-28 04:45:36 +00:00
Code Issues Projects Releases Wiki Activity

close #13

Browse Source
This commit is contained in:
Michele Balistreri 2020-04-29 13:33:14 +03:00
parent e118c153f9
commit 6a243df6e1
No known key found for this signature in database
GPG Key ID: E9567DA33A4F791A
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/Bucket.sol
View File

@ -26,6 +26,8 @@ abstract contract Bucket {
bytes32 code; bytes32 code;
} }
event Redeemed(address indexed recipient, uint256 indexed data);
mapping(address => Redeemable) public redeemables; mapping(address => Redeemable) public redeemables;
modifier onlyOwner() { modifier onlyOwner() {
@ -79,6 +81,7 @@ abstract contract Bucket {
redeemable.data = 0; redeemable.data = 0;
transferRedeemable(data, _redeem); transferRedeemable(data, _redeem);
emit Redeemed(recipient, data);
} }
function kill() external onlyOwner { function kill() external onlyOwner {

4
test/contract_spec.js
View File

@ -276,11 +276,13 @@ contract("ERC20Bucket", function () {
const sig = await signRedeem(ERC20Bucket._address, signer, message); const sig = await signRedeem(ERC20Bucket._address, signer, message);
const redeem = ERC20Bucket.methods.redeem(message, sig); const redeem = ERC20Bucket.methods.redeem(message, sig);
const redeemGas = await redeem.estimateGas(); const redeemGas = await redeem.estimateGas();
await redeem.send({ let receipt = await redeem.send({
from: relayer, from: relayer,
gas: redeemGas, gas: redeemGas,
}); });
assert.equal(receipt.events.Redeemed.returnValues.recipient, recipient);
assert.equal(receipt.events.Redeemed.returnValues.data, redeemable.data);
let expectedBucketBalance = parseInt(initialBucketBalance) - amount; let expectedBucketBalance = parseInt(initialBucketBalance) - amount;
let bucketBalance = await TestToken.methods.balanceOf(ERC20Bucket._address).call(); let bucketBalance = await TestToken.methods.balanceOf(ERC20Bucket._address).call();

5
test/nft_contract_spec.js
View File

@ -221,11 +221,14 @@ contract("NFTBucket", function () {
const sig = await signRedeem(NFTBucket._address, signer, message); const sig = await signRedeem(NFTBucket._address, signer, message);
const redeem = NFTBucket.methods.redeem(message, sig); const redeem = NFTBucket.methods.redeem(message, sig);
const redeemGas = await redeem.estimateGas(); const redeemGas = await redeem.estimateGas();
await redeem.send({ let receipt = await redeem.send({
from: relayer, from: relayer,
gas: redeemGas, gas: redeemGas,
}); });
assert.equal(receipt.events.Redeemed.returnValues.recipient, recipient);
assert.equal(receipt.events.Redeemed.returnValues.data, tokenID);
let tokenOwner = await TestNFT.methods.ownerOf(tokenID).call(); let tokenOwner = await TestNFT.methods.ownerOf(tokenID).call();
assert.equal(tokenOwner, receiver, `Token owner is ${tokenOwner} instead of the expected ${receiver}`); assert.equal(tokenOwner, receiver, `Token owner is ${tokenOwner} instead of the expected ${receiver}`);
} }