Skip to content

add _auctionId to bid function parameteres #599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 17, 2019
Merged

add _auctionId to bid function parameteres #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dc4f3d
add _auctionId to bid function parameteres
orenyodfat Jan 30, 2019
703fec6
update require error msg
orenyodfat Feb 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion contracts/schemes/Auction4Reputation.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,10 @@ contract Auction4Reputation is Ownable {
/**
* @dev bid function
* @param _amount the amount to bid with
* @param _auctionId the auction id to bid at .
* @return auctionId
*/
function bid(uint256 _amount) public returns(uint256 auctionId) {
function bid(uint256 _amount, uint256 _auctionId) public returns(uint256 auctionId) {
require(_amount > 0, "bidding amount should be > 0");
// solhint-disable-next-line not-rely-on-time
require(now <= auctionsEndTime, "bidding should be within the allowed bidding period");
Expand All @@ -121,6 +122,7 @@ contract Auction4Reputation is Ownable {
address(token).safeTransferFrom(msg.sender, address(this), _amount);
// solhint-disable-next-line not-rely-on-time
auctionId = (now - auctionsStartTime) / auctionPeriod;
require(auctionId == _auctionId, "auction is not active");
Auction storage auction = auctions[auctionId];
auction.totalBid = auction.totalBid.add(_amount);
auction.bids[msg.sender] = auction.bids[msg.sender].add(_amount);
Expand Down
44 changes: 27 additions & 17 deletions test/auction4reputation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ contract('Auction4Reputation', accounts => {

it("bid", async () => {
let testSetup = await setup(accounts);
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),0);
var id = await helpers.getValueFromLogs(tx, '_auctionId',1);
assert.equal(tx.logs.length,1);
assert.equal(tx.logs[0].event,"Bid");
Expand All @@ -186,7 +186,7 @@ contract('Auction4Reputation', accounts => {

it("transferToWallet ", async () => {
let testSetup = await setup(accounts);
await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),0);
assert.equal(await testSetup.biddingToken.balanceOf(testSetup.auction4Reputation.address),web3.utils.toWei('1', "ether"));
try {
await testSetup.auction4Reputation.transferToWallet();
Expand All @@ -204,7 +204,7 @@ contract('Auction4Reputation', accounts => {
it("bid without initialize should fail", async () => {
let testSetup = await setup(accounts,100,0,3000,3,3000,false);
try {
await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),0);
assert(false, "bid without initialize should fail");
} catch(error) {
helpers.assertVMException(error);
Expand All @@ -214,7 +214,7 @@ contract('Auction4Reputation', accounts => {
it("bid with value == 0 should revert", async () => {
let testSetup = await setup(accounts);
try {
await testSetup.auction4Reputation.bid(web3.utils.toWei('0', "ether"));
await testSetup.auction4Reputation.bid(web3.utils.toWei('0', "ether"),0);
assert(false, "bid with value == 0 should revert");
} catch(error) {
helpers.assertVMException(error);
Expand All @@ -225,7 +225,7 @@ contract('Auction4Reputation', accounts => {
let testSetup = await setup(accounts);
await helpers.increaseTime(3001);
try {
await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),0);
assert(false, "bid after _auctionEndTime should revert");
} catch(error) {
helpers.assertVMException(error);
Expand All @@ -234,7 +234,7 @@ contract('Auction4Reputation', accounts => {

it("redeem", async () => {
let testSetup = await setup(accounts);
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),0);
var id = await helpers.getValueFromLogs(tx, '_auctionId',1);
await helpers.increaseTime(3001);
var bid = await testSetup.auction4Reputation.getBid(accounts[0],id);
Expand All @@ -249,11 +249,11 @@ contract('Auction4Reputation', accounts => {

it("redeem score ", async () => {
let testSetup = await setup(accounts);
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),{from:accounts[0]});
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),0,{from:accounts[0]});
var id1 = await helpers.getValueFromLogs(tx, '_auctionId',1);
await testSetup.biddingToken.transfer(accounts[1],web3.utils.toWei('3', "ether"));
await testSetup.biddingToken.approve(testSetup.auction4Reputation.address,web3.utils.toWei('100', "ether"),{from:accounts[1]});
tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('3', "ether"),{from:accounts[1]});
tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('3', "ether"),0,{from:accounts[1]});
var id2 = await helpers.getValueFromLogs(tx, '_auctionId',1);
await helpers.increaseTime(3001);
await testSetup.auction4Reputation.redeem(accounts[0],id1);
Expand All @@ -264,7 +264,7 @@ contract('Auction4Reputation', accounts => {

it("redeem cannot redeem twice", async () => {
let testSetup = await setup(accounts);
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),0);
var id = await helpers.getValueFromLogs(tx, '_auctionId',1);
await helpers.increaseTime(3001);
await testSetup.auction4Reputation.redeem(accounts[0],id);
Expand All @@ -278,7 +278,7 @@ contract('Auction4Reputation', accounts => {

it("redeem before auctionEndTime should revert", async () => {
let testSetup = await setup(accounts);
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),0);
var id = await helpers.getValueFromLogs(tx, '_auctionId',1);
await helpers.increaseTime(50);
try {
Expand All @@ -291,7 +291,7 @@ contract('Auction4Reputation', accounts => {

it("redeem before redeemEnableTime should revert", async () => {
let testSetup = await setup(accounts,100,0,3000,3,4000,true);
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),0);
var id = await helpers.getValueFromLogs(tx, '_auctionId',1);
await helpers.increaseTime(3500);
try {
Expand All @@ -306,13 +306,13 @@ contract('Auction4Reputation', accounts => {

it("bid and redeem from all acutions", async () => {
let testSetup = await setup(accounts);
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),0);
var id1 = await helpers.getValueFromLogs(tx, '_auctionId',1);
await helpers.increaseTime(1001);
tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),1);
var id2 = await helpers.getValueFromLogs(tx, '_auctionId',1);
await helpers.increaseTime(1001);
tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),2);
var id3 = await helpers.getValueFromLogs(tx, '_auctionId',1);
await helpers.increaseTime(3000);
var totalBid1 = await testSetup.auction4Reputation.auctions(id1);
Expand All @@ -332,9 +332,9 @@ contract('Auction4Reputation', accounts => {

it("bid twice on the same auction", async () => {
let testSetup = await setup(accounts);
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),0);
var id1 = await helpers.getValueFromLogs(tx, '_auctionId',1);
tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),0);
var id2 = await helpers.getValueFromLogs(tx, '_auctionId',1);
assert.equal(id1.toNumber(),id2.toNumber());
var bid = await testSetup.auction4Reputation.getBid(accounts[0],id1);
Expand All @@ -360,12 +360,22 @@ contract('Auction4Reputation', accounts => {

it("get earned reputation", async () => {
let testSetup = await setup(accounts);
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"));
var tx = await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),0);
var id = await helpers.getValueFromLogs(tx, '_auctionId',1);
await helpers.increaseTime(3001);
tx = await testSetup.auction4Reputation.redeem.call(accounts[0],id);
const reputation = await testSetup.auction4Reputation.redeem.call(accounts[0], id);
assert.equal(reputation,100);
assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000);
});

it("cannot bid with wrong auctionId", async () => {
let testSetup = await setup(accounts);
try {
await testSetup.auction4Reputation.bid(web3.utils.toWei('1', "ether"),1);
assert(false, "cannot bid with wrong auctionId");
} catch(error) {
helpers.assertVMException(error);
}
});
});