poanetwork
/
tokenbridge-contracts
mirror of https://github.com/poanetwork/tokenbridge-contracts.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove redundant code from ERC677BridgeTokenRewardable contract (#249)

This commit is contained in:
varasev 2019-07-31 09:31:52 +03:00 committed by Alexander Kolotov
parent 629af964f7
commit 52ca7680c3
2 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contracts/ERC677BridgeTokenRewardable.sol
View File

@ -49,20 +49,11 @@ contract ERC677BridgeTokenRewardable is ERC677BridgeToken {
function stake(address _staker, uint256 _amount) external onlyStakingContract {
// Transfer `_amount` from `_staker` to `stakingContract`
require(_amount <= balances[_staker]);
balances[_staker] = balances[_staker].sub(_amount);
balances[stakingContract] = balances[stakingContract].add(_amount);
emit Transfer(_staker, stakingContract, _amount);
}
function withdraw(address _staker, uint256 _amount) external onlyStakingContract {
// Transfer `_amount` from `stakingContract` to `_staker`
require(_amount <= balances[stakingContract]);
balances[stakingContract] = balances[stakingContract].sub(_amount);
balances[_staker] = balances[_staker].add(_amount);
emit Transfer(stakingContract, _staker, _amount);
}
function transfer(address _to, uint256 _value) public returns (bool) {
require(_to != stakingContract);
return super.transfer(_to, _value);

37
test/poa20_test.js
View File

@ -9,7 +9,7 @@ const ForeignNativeToErcBridge = artifacts.require('ForeignBridgeNativeToErc.sol
const BridgeValidators = artifacts.require('BridgeValidators.sol')
const { expect } = require('chai')
const { ERROR_MSG, ZERO_ADDRESS, BN } = require('./setup')
const { ERROR_MSG, ERROR_MSG_OPCODE, ZERO_ADDRESS, BN } = require('./setup')
const { ether, expectEventInLogs } = require('./helpers/helpers')
const minPerTx = ether('0.01')
@ -180,7 +180,7 @@ async function testERC677BridgeToken(accounts, rewardable) {
await token.mintReward([user], ['99'], { from: accounts[2] }).should.be.fulfilled
expect(await token.balanceOf(user)).to.be.bignumber.equal('99')
await token.setStakingContractMock(accounts[3]).should.be.fulfilled
await token.stake(user, '100', { from: accounts[3] }).should.be.rejectedWith(ERROR_MSG)
await token.stake(user, '100', { from: accounts[3] }).should.be.rejectedWith(ERROR_MSG_OPCODE)
})
it("should decrease user's balance and increase Staking's balance", async () => {
await token.setBlockRewardContractMock(accounts[2]).should.be.fulfilled
@ -193,39 +193,6 @@ async function testERC677BridgeToken(accounts, rewardable) {
expect(await token.balanceOf(accounts[3])).to.be.bignumber.equal('100')
})
})
describe('#withdraw', async () => {
it('can only be called by Staking contract', async () => {
await token.setBlockRewardContractMock(accounts[2]).should.be.fulfilled
await token.mintReward([user], ['100'], { from: accounts[2] }).should.be.fulfilled
await token.setStakingContractMock(accounts[3]).should.be.fulfilled
await token.stake(user, '100', { from: accounts[3] }).should.be.fulfilled
await token.withdraw(user, '100', { from: accounts[4] }).should.be.rejectedWith(ERROR_MSG)
await token.withdraw(user, '100', { from: accounts[3] }).should.be.fulfilled
})
it("should revert if Staking doesn't have enough balance", async () => {
await token.setBlockRewardContractMock(accounts[2]).should.be.fulfilled
await token.mintReward([user], ['100'], { from: accounts[2] }).should.be.fulfilled
expect(await token.balanceOf(user)).to.be.bignumber.equal('100')
await token.setStakingContractMock(accounts[3]).should.be.fulfilled
await token.stake(user, '100', { from: accounts[3] }).should.be.fulfilled
await token.withdraw(user, '101', { from: accounts[3] }).should.be.rejectedWith(ERROR_MSG)
await token.withdraw(user, '100', { from: accounts[3] }).should.be.fulfilled
})
it("should decrease Staking's balance and increase user's balance", async () => {
await token.setBlockRewardContractMock(accounts[2]).should.be.fulfilled
await token.mintReward([user], ['100'], { from: accounts[2] }).should.be.fulfilled
expect(await token.balanceOf(user)).to.be.bignumber.equal('100')
expect(await token.balanceOf(accounts[3])).to.be.bignumber.equal(ZERO)
await token.setStakingContractMock(accounts[3]).should.be.fulfilled
await token.stake(user, '100', { from: accounts[3] }).should.be.fulfilled
expect(await token.balanceOf(user)).to.be.bignumber.equal('0')
expect(await token.balanceOf(accounts[3])).to.be.bignumber.equal('100')
await token.withdraw(user, 60, { from: accounts[3] }).should.be.fulfilled
expect(await token.balanceOf(user)).to.be.bignumber.equal('60')
expect(await token.balanceOf(accounts[3])).to.be.bignumber.equal('40')
})
})
}
describe('#mint', async () => {