Skip to content

Remove token.finishMinting() from default finalization #364

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
frangio merged 2 commits into from
Aug 14, 2017
Merged

Remove token.finishMinting() from default finalization #364

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
4fc6bb7
remove token.finishMinting() from default finalization
frangio Aug 13, 2017
3645213
add test for finishMinting
frangio Aug 14, 2017
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
17 changes: 9 additions & 8 deletions contracts/crowdsale/FinalizableCrowdsale.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ contract FinalizableCrowdsale is Crowdsale, Ownable {

event Finalized();

// should be called after crowdsale ends, to do
// some extra finalization work
/**
* @dev Must be called after crowdsale ends, to do some extra finalization
* work. Calls the contract's finalization function.
*/
function finalize() onlyOwner {
require(!isFinalized);
require(hasEnded());
Expand All @@ -28,12 +30,11 @@ contract FinalizableCrowdsale is Crowdsale, Ownable {
isFinalized = true;
}

// end token minting on finalization
// override this with custom logic if needed
/**
* @dev Can be overriden to add finalization logic. The overriding function
* should call super.finalization() to ensure the chain of finalization is
* executed entirely.
*/
function finalization() internal {
token.finishMinting();
}
Copy link
Contributor

@maraoz maraoz Aug 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't finalization be abstract now that it's empty?

Copy link
Contributor Author

@frangio frangio Aug 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about it. If it's left abstract you can't call super.finalization() in the deriving contract, which we want everyone to do to make sure the whole finalization chain runs.




}
7 changes: 0 additions & 7 deletions test/FinalizableCrowdsale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,4 @@ contract('FinalizableCrowdsale', function ([_, owner, wallet, thirdparty]) {
should.exist(event)
})

it('finishes minting of token', async function () {
await increaseTimeTo(this.afterEndTime)
await this.crowdsale.finalize({from: owner})
const finished = await this.token.mintingFinished()
finished.should.equal(true)
})

})
8 changes: 7 additions & 1 deletion test/MintableToken.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const assertJump = require('./helpers/assertJump');
import expectThrow from './helpers/expectThrow';
var MintableToken = artifacts.require('../contracts/Tokens/MintableToken.sol');

contract('Mintable', function(accounts) {
Expand Down Expand Up @@ -37,4 +37,10 @@ contract('Mintable', function(accounts) {
assert(totalSupply, 100);
})

it('should fail to mint after call to finishMinting', async function () {
await token.finishMinting();
assert.equal(await token.mintingFinished(), true);
await expectThrow(token.mint(accounts[0], 100));
})

});