More generalisable balance calcs

This commit is contained in:
Andy Tudhope 2019-04-09 15:31:26 +02:00
parent 674255caa6
commit 7d47f5ce9e
No known key found for this signature in database
GPG Key ID: 02A3DFA93BF26AD2
1 changed files with 8 additions and 8 deletions

View File

@ -117,6 +117,7 @@ contract("DAppStore", function () {
let amount = 100; let amount = 100;
let initial = await DAppStore.methods.dapps(0).call(); let initial = await DAppStore.methods.dapps(0).call();
let before = await SNT.methods.balanceOf(DAppStore.options.address).call();
await SNT.methods.generateTokens(accounts[0], amount).send(); await SNT.methods.generateTokens(accounts[0], amount).send();
const encodedCall = DAppStore.methods.upvote(id,amount).encodeABI(); const encodedCall = DAppStore.methods.upvote(id,amount).encodeABI();
@ -130,10 +131,9 @@ contract("DAppStore", function () {
assert.strictEqual(receipt.id, id); assert.strictEqual(receipt.id, id);
// Check the DApp Store actually receives the SNT! // Check the DApp Store actually receives the SNT!
// At this stage, we have 100 000 SNT in the store from the first creation event. let after = await SNT.methods.balanceOf(DAppStore.options.address).call();
let bal_receipt = await SNT.methods.balanceOf(DAppStore.options.address).call(); let bal_effect = parseInt(after, 10) - parseInt(before, 10);
let expected_bal = 100000 + amount; assert.strictEqual(bal_effect, amount);
assert.strictEqual(parseInt(bal_receipt, 10), expected_bal);
// Having received the SNT, check that it updates the particular DApp balance // Having received the SNT, check that it updates the particular DApp balance
let upvotedBalance = parseInt(initial.balance, 10) + amount let upvotedBalance = parseInt(initial.balance, 10) + amount
@ -282,6 +282,7 @@ contract("DAppStore", function () {
let amount = 500; let amount = 500;
let initial = await DAppStore.methods.dapps(0).call(); let initial = await DAppStore.methods.dapps(0).call();
let before = await SNT.methods.balanceOf(DAppStore.options.address).call();
await SNT.methods.generateTokens(accounts[0], amount).send(); await SNT.methods.generateTokens(accounts[0], amount).send();
const encodedCall = DAppStore.methods.upvote(id,amount).encodeABI(); const encodedCall = DAppStore.methods.upvote(id,amount).encodeABI();
@ -295,10 +296,9 @@ contract("DAppStore", function () {
assert.strictEqual(receipt.id, id); assert.strictEqual(receipt.id, id);
// Check the DApp Store actually receives the SNT! // Check the DApp Store actually receives the SNT!
// At this stage, we have 100 100 SNT in the store from the first create and upvote events. let after = await SNT.methods.balanceOf(DAppStore.options.address).call();
let bal_receipt = await SNT.methods.balanceOf(DAppStore.options.address).call(); let bal_effect = parseInt(after, 10) - parseInt(before, 10);
let expected_bal = 100100 + amount; assert.strictEqual(bal_effect, amount);
assert.strictEqual(parseInt(bal_receipt, 10), expected_bal);
// Having received the SNT, check that it updates the particular DApp balance // Having received the SNT, check that it updates the particular DApp balance
let upvotedBalance = parseInt(initial.balance, 10) + amount let upvotedBalance = parseInt(initial.balance, 10) + amount