truffle tests: use camelcase consistently for variable names

This commit is contained in:
Maximilian Krüger 2018-01-04 18:17:14 +01:00
parent a7910aa5cd
commit 03aacc8f16
2 changed files with 74 additions and 73 deletions

View File

@ -40,19 +40,19 @@ contract('ForeignBridge', function(accounts) {
var meta;
var requiredSignatures = 1;
var authorities = [accounts[0], accounts[1]];
var user_account = accounts[2];
var userAccount = accounts[2];
var value = web3.toWei(1, "ether");
var hash = "0xe55bb43c36cdf79e23b4adc149cdded921f0d482e613c50c6540977c213bc408";
return ForeignBridge.new(requiredSignatures, authorities).then(function(instance) {
meta = instance;
return meta.deposit(user_account, value, hash, { from: authorities[0] });
return meta.deposit(userAccount, value, hash, { from: authorities[0] });
}).then(function(result) {
assert.equal(1, result.logs.length, "Exactly one event should be created");
assert.equal("Deposit", result.logs[0].event, "Event name should be Deposit");
assert.equal(user_account, result.logs[0].args.recipient, "Event recipient should be transaction sender");
assert.equal(userAccount, result.logs[0].args.recipient, "Event recipient should be transaction sender");
assert.equal(value, result.logs[0].args.value, "Event value should match deposited ether");
return meta.balances.call(user_account);
return meta.balances.call(userAccount);
}).then(function(result) {
assert.equal(value, result, "Contract balance should change");
})
@ -62,25 +62,25 @@ contract('ForeignBridge', function(accounts) {
var meta;
var requiredSignatures = 2;
var authorities = [accounts[0], accounts[1]];
var user_account = accounts[2];
var userAccount = accounts[2];
var value = web3.toWei(1, "ether");
var hash = "0xe55bb43c36cdf79e23b4adc149cdded921f0d482e613c50c6540977c213bc408";
return ForeignBridge.new(requiredSignatures, authorities).then(function(instance) {
meta = instance;
return meta.deposit(user_account, value, hash, { from: authorities[0] });
return meta.deposit(userAccount, value, hash, { from: authorities[0] });
}).then(function(result) {
assert.equal(0, result.logs.length, "No event should be created");
return meta.balances.call(user_account);
return meta.balances.call(userAccount);
}).then(function(result) {
assert.equal(web3.toWei(0, "ether"), result, "Contract balance should not change yet");
return meta.deposit(user_account, value, hash, { from: authorities[1] });
return meta.deposit(userAccount, value, hash, { from: authorities[1] });
}).then(function(result) {
assert.equal(1, result.logs.length, "Exactly one event should be created");
assert.equal("Deposit", result.logs[0].event, "Event name should be Deposit");
assert.equal(user_account, result.logs[0].args.recipient, "Event recipient should be transaction sender");
assert.equal(userAccount, result.logs[0].args.recipient, "Event recipient should be transaction sender");
assert.equal(value, result.logs[0].args.value, "Event value should match deposited ether");
return meta.balances.call(user_account);
return meta.balances.call(userAccount);
}).then(function(result) {
assert.equal(value, result, "Contract balance should change");
})
@ -90,26 +90,26 @@ contract('ForeignBridge', function(accounts) {
var meta;
var requiredSignatures = 2;
var authorities = [accounts[0], accounts[1], accounts[2]];
var user_account = accounts[3];
var userAccount = accounts[3];
var invalid_value = web3.toWei(2, "ether");
var value = web3.toWei(1, "ether");
var hash = "0xe55bb43c36cdf79e23b4adc149cdded921f0d482e613c50c6540977c213bc408";
return ForeignBridge.new(requiredSignatures, authorities).then(function(instance) {
meta = instance;
return meta.deposit(user_account, value, hash, { from: authorities[0] });
return meta.deposit(userAccount, value, hash, { from: authorities[0] });
}).then(function(result) {
assert.equal(0, result.logs.length, "No event should be created yet");
return meta.deposit(user_account, invalid_value, hash, { from: authorities[1] });
return meta.deposit(userAccount, invalid_value, hash, { from: authorities[1] });
}).then(function(result) {
assert.equal(0, result.logs.length, "Misbehaving authority should be ignored");
return meta.deposit(user_account, value, hash, { from: authorities[2] })
return meta.deposit(userAccount, value, hash, { from: authorities[2] })
}).then(function(result) {
assert.equal(1, result.logs.length, "Exactly one event should be created");
assert.equal("Deposit", result.logs[0].event, "Event name should be Deposit");
assert.equal(user_account, result.logs[0].args.recipient, "Event recipient should be transaction sender");
assert.equal(userAccount, result.logs[0].args.recipient, "Event recipient should be transaction sender");
assert.equal(value, result.logs[0].args.value, "Event value should match transaction value");
return meta.balances.call(user_account);
return meta.balances.call(userAccount);
}).then(function(result) {
assert.equal(value, result, "Contract balance should change");
})
@ -119,25 +119,25 @@ contract('ForeignBridge', function(accounts) {
var meta;
var requiredSignatures = 1;
var authorities = [accounts[0], accounts[1]];
var user_account = accounts[2];
var user_account2 = accounts[3];
var userAccount = accounts[2];
var userAccount2 = accounts[3];
var value = web3.toWei(3, "ether");
var value2 = web3.toWei(1, "ether");
var hash = "0xe55bb43c36cdf79e23b4adc149cdded921f0d482e613c50c6540977c213bc408";
return ForeignBridge.new(requiredSignatures, authorities).then(function(instance) {
meta = instance;
return meta.deposit(user_account, value, hash, { from: authorities[0] });
return meta.deposit(userAccount, value, hash, { from: authorities[0] });
}).then(function(result) {
return meta.transfer(user_account2, value2, false, { from: user_account });
return meta.transfer(userAccount2, value2, false, { from: userAccount });
}).then(function(result) {
assert.equal(1, result.logs.length, "Exactly one event should be created");
assert.equal("Transfer", result.logs[0].event, "Event name should be Transfer");
assert.equal(user_account, result.logs[0].args.from, "Event from should be transaction sender");
assert.equal(user_account2, result.logs[0].args.to, "Event from should be transaction recipient");
assert.equal(userAccount, result.logs[0].args.from, "Event from should be transaction sender");
assert.equal(userAccount2, result.logs[0].args.to, "Event from should be transaction recipient");
assert.equal(value2, result.logs[0].args.value, "Event value should match transaction value");
return Promise.all([
meta.balances.call(user_account),
meta.balances.call(user_account2)
meta.balances.call(userAccount),
meta.balances.call(userAccount2)
])
}).then(function(result) {
assert.equal(web3.toWei(2, "ether"), result[0]);
@ -149,16 +149,16 @@ contract('ForeignBridge', function(accounts) {
var meta;
var requiredSignatures = 1;
var authorities = [accounts[0], accounts[1]];
var user_account = accounts[2];
var user_account2 = accounts[3];
var userAccount = accounts[2];
var userAccount2 = accounts[3];
var value = web3.toWei(3, "ether");
var value2 = web3.toWei(4, "ether");
var hash = "0xe55bb43c36cdf79e23b4adc149cdded921f0d482e613c50c6540977c213bc408";
return ForeignBridge.new(requiredSignatures, authorities).then(function(instance) {
meta = instance;
return meta.deposit(user_account, value, hash, { from: authorities[0] });
return meta.deposit(userAccount, value, hash, { from: authorities[0] });
}).then(function(result) {
return meta.transfer(user_account2, value2, false, { from: user_account });
return meta.transfer(userAccount2, value2, false, { from: userAccount });
}).then(function(result) {
assert(false, "Transfer should fail");
}, function(err) {
@ -169,16 +169,16 @@ contract('ForeignBridge', function(accounts) {
var meta;
var requiredSignatures = 1;
var authorities = [accounts[0], accounts[1]];
var user_account = accounts[2];
var user_account2 = accounts[3];
var userAccount = accounts[2];
var userAccount2 = accounts[3];
var value = web3.toWei(3, "ether");
var value2 = web3.toWei(0, "ether");
var hash = "0xe55bb43c36cdf79e23b4adc149cdded921f0d482e613c50c6540977c213bc408";
return ForeignBridge.new(requiredSignatures, authorities).then(function(instance) {
meta = instance;
return meta.deposit(user_account, value, hash, { from: authorities[0] });
return meta.deposit(userAccount, value, hash, { from: authorities[0] });
}).then(function(result) {
return meta.transfer(user_account2, value2, false, { from: user_account });
return meta.transfer(userAccount2, value2, false, { from: userAccount });
}).then(function(result) {
assert(false, "Transfer of value 0 should fail");
}, function (err) {
@ -189,19 +189,19 @@ contract('ForeignBridge', function(accounts) {
var meta;
var requiredSignatures = 1;
var authorities = [accounts[0], accounts[1]];
var user_account = accounts[2];
var user_account2 = accounts[3];
var userAccount = accounts[2];
var userAccount2 = accounts[3];
var value = web3.toWei("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "wei");
var value2 = web3.toWei(1, "wei");
var hash = "0xe55bb43c36cdf79e23b4adc149cdded921f0d482e613c50c6540977c213bc408";
return ForeignBridge.new(requiredSignatures, authorities).then(function(instance) {
meta = instance;
return Promise.all([
meta.deposit(user_account, value, hash, { from: authorities[0] }),
meta.deposit(user_account2, value2, hash, { from: authorities[0] }),
meta.deposit(userAccount, value, hash, { from: authorities[0] }),
meta.deposit(userAccount2, value2, hash, { from: authorities[0] }),
])
}).then(function(result) {
return meta.transfer(user_account2, value, false, { from: user_account });
return meta.transfer(userAccount2, value, false, { from: userAccount });
}).then(function(result) {
assert(false, "Transfer with overflow should fail");
}, function (err) {
@ -212,24 +212,24 @@ contract('ForeignBridge', function(accounts) {
var meta;
var requiredSignatures = 1;
var authorities = [accounts[0], accounts[1]];
var user_account = accounts[2];
var user_account2 = accounts[3];
var userAccount = accounts[2];
var userAccount2 = accounts[3];
var value = web3.toWei(3, "ether");
var value2 = web3.toWei(1, "ether");
var hash = "0xe55bb43c36cdf79e23b4adc149cdded921f0d482e613c50c6540977c213bc408";
return ForeignBridge.new(requiredSignatures, authorities).then(function(instance) {
meta = instance;
return meta.deposit(user_account, value, hash, { from: authorities[0] });
return meta.deposit(userAccount, value, hash, { from: authorities[0] });
}).then(function(result) {
return meta.transfer(user_account2, value2, true, { from: user_account });
return meta.transfer(userAccount2, value2, true, { from: userAccount });
}).then(function(result) {
assert.equal(1, result.logs.length, "Exactly one event should be created");
assert.equal("Withdraw", result.logs[0].event, "Event name should be Withdraw");
assert.equal(user_account2, result.logs[0].args.recipient, "Event recipient should be equal to transaction recipient");
assert.equal(userAccount2, result.logs[0].args.recipient, "Event recipient should be equal to transaction recipient");
assert.equal(value2, result.logs[0].args.value, "Event value should match transaction value");
return Promise.all([
meta.balances.call(user_account),
meta.balances.call(user_account2)
meta.balances.call(userAccount),
meta.balances.call(userAccount2)
])
}).then(function(result) {
assert.equal(web3.toWei(2, "ether"), result[0]);

View File

@ -46,7 +46,7 @@ contract('HomeBridge', function(accounts) {
var requiredSignatures = 1;
var authorities = [accounts[0], accounts[1]];
var estimatedGasCostOfWithdraw = 0;
let user_account = accounts[2];
let userAccount = accounts[2];
let value = web3.toWei(1, "ether");
return HomeBridge.new(
@ -57,12 +57,12 @@ contract('HomeBridge', function(accounts) {
meta = instance;
return meta.sendTransaction({
value: value,
from: user_account
from: userAccount
})
}).then(function(result) {
assert.equal(1, result.logs.length, "Exactly one event should have been created");
assert.equal("Deposit", result.logs[0].event, "Event name should be Deposit");
assert.equal(user_account, result.logs[0].args.recipient, "Event recipient should be transaction sender");
assert.equal(userAccount, result.logs[0].args.recipient, "Event recipient should be transaction sender");
assert.equal(value, result.logs[0].args.value, "Event value should match deposited ether");
})
})
@ -90,8 +90,8 @@ contract('HomeBridge', function(accounts) {
var requiredSignatures = 1;
var authorities = [accounts[0], accounts[1]];
var estimatedGasCostOfWithdraw = 0;
var user_account = accounts[2];
var recipient_account = accounts[3];
var userAccount = accounts[2];
var recipientAccount = accounts[3];
var value = web3.toBigNumber(web3.toWei(1, "ether"));
return HomeBridge.new(
@ -100,13 +100,14 @@ contract('HomeBridge', function(accounts) {
estimatedGasCostOfWithdraw
).then(function(instance) {
homeBridge = instance;
// "charge" HomeBridge so we can withdraw later
return homeBridge.sendTransaction({
value: value,
from: user_account
from: userAccount
})
}).then(function(result) {
message = createMessage(recipient_account, value, "0x1045bfe274b88120a6b1e5d01b5ec00ab5d01098346e90e7c7a3c9b8f0181c80");
message = createMessage(recipientAccount, value, "0x1045bfe274b88120a6b1e5d01b5ec00ab5d01098346e90e7c7a3c9b8f0181c80");
return helpers.sign(authorities[0], message);
}).then(function(result) {
signature = result;
@ -129,12 +130,12 @@ contract('HomeBridge', function(accounts) {
[vrs.s],
message,
// anyone can call withdraw (provided they have the message and required signatures)
{from: user_account}
{from: userAccount}
);
}).then(function(result) {
assert.equal(1, result.logs.length, "Exactly one event should be created");
assert.equal("Withdraw", result.logs[0].event, "Event name should be Withdraw");
assert.equal(recipient_account, result.logs[0].args.recipient, "Event recipient should match recipient in message");
assert.equal(recipientAccount, result.logs[0].args.recipient, "Event recipient should match recipient in message");
assert(value.equals(result.logs[0].args.value), "Event value should match value in message");
})
})
@ -146,8 +147,8 @@ contract('HomeBridge', function(accounts) {
var requiredSignatures = 1;
var authorities = [accounts[0], accounts[1]];
let estimatedGasCostOfWithdraw = 0;
var user_account = accounts[2];
var recipient_account = accounts[3];
var userAccount = accounts[2];
var recipientAccount = accounts[3];
var value = web3.toBigNumber(web3.toWei(1, "ether"));
return HomeBridge.new(
@ -159,10 +160,10 @@ contract('HomeBridge', function(accounts) {
// "charge" HomeBridge so we can withdraw later
return homeBridge.sendTransaction({
value: value.times(2),
from: user_account
from: userAccount
})
}).then(function(result) {
message1 = createMessage(recipient_account, value, "0x1045bfe274b88120a6b1e5d01b5ec00ab5d01098346e90e7c7a3c9b8f0181c80");
message1 = createMessage(recipientAccount, value, "0x1045bfe274b88120a6b1e5d01b5ec00ab5d01098346e90e7c7a3c9b8f0181c80");
return helpers.sign(authorities[0], message1);
}).then(function(signature) {
var vrs = helpers.signatureToVRS(signature);
@ -176,10 +177,10 @@ contract('HomeBridge', function(accounts) {
}).then(function(result) {
assert.equal(1, result.logs.length, "Exactly one event should be created");
assert.equal("Withdraw", result.logs[0].event, "Event name should be Withdraw");
assert.equal(recipient_account, result.logs[0].args.recipient, "Event recipient should match recipient in message");
assert.equal(recipientAccount, result.logs[0].args.recipient, "Event recipient should match recipient in message");
assert(value.equals(result.logs[0].args.value), "Event value should match value in message");
message2 = createMessage(recipient_account, value, "0x038c79eb958a13aa71996bac27c628f33f227288bd27d5e157b97e55e08fd2b3");
message2 = createMessage(recipientAccount, value, "0x038c79eb958a13aa71996bac27c628f33f227288bd27d5e157b97e55e08fd2b3");
return helpers.sign(authorities[0], message2);
}).then(function(signature) {
var vrs = helpers.signatureToVRS(signature);
@ -193,7 +194,7 @@ contract('HomeBridge', function(accounts) {
}).then(function(result) {
assert.equal(1, result.logs.length, "Exactly one event should be created");
assert.equal("Withdraw", result.logs[0].event, "Event name should be Withdraw");
assert.equal(recipient_account, result.logs[0].args.recipient, "Event recipient should match recipient in message");
assert.equal(recipientAccount, result.logs[0].args.recipient, "Event recipient should match recipient in message");
assert(value.equals(result.logs[0].args.value), "Event value should match value in message");
})
})
@ -205,8 +206,8 @@ contract('HomeBridge', function(accounts) {
var requiredSignatures = 1;
var authorities = [accounts[0], accounts[1]];
var estimatedGasCostOfWithdraw = 0;
var user_account = accounts[2];
var recipient_account = accounts[3];
var userAccount = accounts[2];
var recipientAccount = accounts[3];
var value = web3.toBigNumber(web3.toWei(1, "ether"));
return HomeBridge.new(
@ -218,10 +219,10 @@ contract('HomeBridge', function(accounts) {
// "charge" HomeBridge so we can withdraw later
return homeBridge.sendTransaction({
value: value.times(2),
from: user_account
from: userAccount
})
}).then(function(result) {
message1 = createMessage(recipient_account, value, "0x1045bfe274b88120a6b1e5d01b5ec00ab5d01098346e90e7c7a3c9b8f0181c80");
message1 = createMessage(recipientAccount, value, "0x1045bfe274b88120a6b1e5d01b5ec00ab5d01098346e90e7c7a3c9b8f0181c80");
return helpers.sign(authorities[0], message1);
}).then(function(signature) {
var vrs = helpers.signatureToVRS(signature);
@ -235,10 +236,10 @@ contract('HomeBridge', function(accounts) {
}).then(function(result) {
assert.equal(1, result.logs.length, "Exactly one event should be created");
assert.equal("Withdraw", result.logs[0].event, "Event name should be Withdraw");
assert.equal(recipient_account, result.logs[0].args.recipient, "Event recipient should match recipient in message");
assert.equal(recipientAccount, result.logs[0].args.recipient, "Event recipient should match recipient in message");
assert(value.equals(result.logs[0].args.value), "Event value should match value in message");
message2 = createMessage(recipient_account, value, "0x1045bfe274b88120a6b1e5d01b5ec00ab5d01098346e90e7c7a3c9b8f0181c80");
message2 = createMessage(recipientAccount, value, "0x1045bfe274b88120a6b1e5d01b5ec00ab5d01098346e90e7c7a3c9b8f0181c80");
return helpers.sign(authorities[0], message2);
}).then(function(signature) {
var vrs = helpers.signatureToVRS(signature);
@ -263,8 +264,8 @@ contract('HomeBridge', function(accounts) {
var requiredSignatures = 1;
var authorities = [accounts[0], accounts[1]];
var estimatedGasCostOfWithdraw = 0;
var user_account = accounts[2];
var recipient_account = accounts[3];
var userAccount = accounts[2];
var recipientAccount = accounts[3];
var value = web3.toBigNumber(web3.toWei(1, "ether"));
return HomeBridge.new(
@ -273,7 +274,7 @@ contract('HomeBridge', function(accounts) {
estimatedGasCostOfWithdraw
).then(function(instance) {
homeBridge = instance;
message = createMessage(recipient_account, value, "0x1045bfe274b88120a6b1e5d01b5ec00ab5d01098346e90e7c7a3c9b8f0181c80");
message = createMessage(recipientAccount, value, "0x1045bfe274b88120a6b1e5d01b5ec00ab5d01098346e90e7c7a3c9b8f0181c80");
return helpers.sign(authorities[0], message);
}).then(function(result) {
signature = result;
@ -299,8 +300,8 @@ contract('HomeBridge', function(accounts) {
var requiredSignatures = 1;
var authorities = [accounts[0], accounts[1]];
var estimatedGasCostOfWithdraw = 0;
var user_account = accounts[2];
var recipient_account = accounts[3];
var userAccount = accounts[2];
var recipientAccount = accounts[3];
var value = web3.toBigNumber(web3.toWei(1, "ether"));
return HomeBridge.new(
@ -312,10 +313,10 @@ contract('HomeBridge', function(accounts) {
// "charge" HomeBridge so we can withdraw later
return homeBridge.sendTransaction({
value: value,
from: user_account
from: userAccount
})
}).then(function(result) {
message = createMessage(recipient_account, value, "0x1045bfe274b88120a6b1e5d01b5ec00ab5d01098346e90e7c7a3c9b8f0181c80");
message = createMessage(recipientAccount, value, "0x1045bfe274b88120a6b1e5d01b5ec00ab5d01098346e90e7c7a3c9b8f0181c80");
return helpers.sign(authorities[0], message);
}).then(function(result) {
signature = result;