Remove Claimable, DelayedClaimable, Heritable (#1274)
* remove Claimable, DelayedClaimable, Heritable * remove SimpleSavingsWallet example which used Heritable
This commit is contained in:
Francisco Giordano
committed by
GitHub
GitHub
parent
00abd3aadc
commit
0dc711732a
@ -1,120 +0,0 @@
|
||||
const { increaseTime } = require('./helpers/increaseTime');
|
||||
const { expectThrow } = require('./helpers/expectThrow');
|
||||
const { assertRevert } = require('./helpers/assertRevert');
|
||||
|
||||
const NULL_ADDRESS = '0x0000000000000000000000000000000000000000';
|
||||
|
||||
const Heritable = artifacts.require('Heritable');
|
||||
|
||||
const BigNumber = web3.BigNumber;
|
||||
|
||||
require('chai')
|
||||
.use(require('chai-bignumber')(BigNumber))
|
||||
.should();
|
||||
|
||||
contract('Heritable', function ([_, owner, heir, anyone]) {
|
||||
const heartbeatTimeout = 4141;
|
||||
let heritable;
|
||||
|
||||
beforeEach(async function () {
|
||||
heritable = await Heritable.new(heartbeatTimeout, { from: owner });
|
||||
});
|
||||
|
||||
it('should start off with an owner, but without heir', async function () {
|
||||
const heir = await heritable.heir();
|
||||
|
||||
owner.should.be.a('string').that.is.not.equal(NULL_ADDRESS);
|
||||
heir.should.be.a('string').that.is.equal(NULL_ADDRESS);
|
||||
});
|
||||
|
||||
it('only owner should set heir', async function () {
|
||||
await heritable.setHeir(heir, { from: owner });
|
||||
await expectThrow(heritable.setHeir(heir, { from: anyone }));
|
||||
});
|
||||
|
||||
it('owner can\'t be heir', async function () {
|
||||
await assertRevert(heritable.setHeir(owner, { from: owner }));
|
||||
});
|
||||
|
||||
it('owner can remove heir', async function () {
|
||||
await heritable.setHeir(heir, { from: owner });
|
||||
(await heritable.heir()).should.equal(heir);
|
||||
|
||||
await heritable.removeHeir({ from: owner });
|
||||
(await heritable.heir()).should.equal(NULL_ADDRESS);
|
||||
});
|
||||
|
||||
it('heir can claim ownership only if owner is dead and timeout was reached', async function () {
|
||||
await heritable.setHeir(heir, { from: owner });
|
||||
await expectThrow(heritable.claimHeirOwnership({ from: heir }));
|
||||
|
||||
await heritable.proclaimDeath({ from: heir });
|
||||
await increaseTime(1);
|
||||
await expectThrow(heritable.claimHeirOwnership({ from: heir }));
|
||||
|
||||
await increaseTime(heartbeatTimeout);
|
||||
await heritable.claimHeirOwnership({ from: heir });
|
||||
(await heritable.heir()).should.equal(heir);
|
||||
});
|
||||
|
||||
it('only heir can proclaim death', async function () {
|
||||
await assertRevert(heritable.proclaimDeath({ from: owner }));
|
||||
await assertRevert(heritable.proclaimDeath({ from: anyone }));
|
||||
});
|
||||
|
||||
it('heir can\'t proclaim death if owner is death', async function () {
|
||||
await heritable.setHeir(heir, { from: owner });
|
||||
await heritable.proclaimDeath({ from: heir });
|
||||
await assertRevert(heritable.proclaimDeath({ from: heir }));
|
||||
});
|
||||
|
||||
it('heir can\'t claim ownership if owner heartbeats', async function () {
|
||||
await heritable.setHeir(heir, { from: owner });
|
||||
|
||||
await heritable.proclaimDeath({ from: heir });
|
||||
await heritable.heartbeat({ from: owner });
|
||||
await expectThrow(heritable.claimHeirOwnership({ from: heir }));
|
||||
|
||||
await heritable.proclaimDeath({ from: heir });
|
||||
await increaseTime(heartbeatTimeout);
|
||||
await heritable.heartbeat({ from: owner });
|
||||
await expectThrow(heritable.claimHeirOwnership({ from: heir }));
|
||||
});
|
||||
|
||||
it('should log events appropriately', async function () {
|
||||
const setHeirLogs = (await heritable.setHeir(heir, { from: owner })).logs;
|
||||
const setHeirEvent = setHeirLogs.find(e => e.event === 'HeirChanged');
|
||||
|
||||
setHeirEvent.args.owner.should.equal(owner);
|
||||
setHeirEvent.args.newHeir.should.equal(heir);
|
||||
|
||||
const heartbeatLogs = (await heritable.heartbeat({ from: owner })).logs;
|
||||
const heartbeatEvent = heartbeatLogs.find(e => e.event === 'OwnerHeartbeated');
|
||||
|
||||
heartbeatEvent.args.owner.should.equal(owner);
|
||||
|
||||
const proclaimDeathLogs = (await heritable.proclaimDeath({ from: heir })).logs;
|
||||
const ownerDeadEvent = proclaimDeathLogs.find(e => e.event === 'OwnerProclaimedDead');
|
||||
|
||||
ownerDeadEvent.args.owner.should.equal(owner);
|
||||
ownerDeadEvent.args.heir.should.equal(heir);
|
||||
|
||||
await increaseTime(heartbeatTimeout);
|
||||
const claimHeirOwnershipLogs = (await heritable.claimHeirOwnership({ from: heir })).logs;
|
||||
const ownershipTransferredEvent = claimHeirOwnershipLogs.find(e => e.event === 'OwnershipTransferred');
|
||||
const heirOwnershipClaimedEvent = claimHeirOwnershipLogs.find(e => e.event === 'HeirOwnershipClaimed');
|
||||
|
||||
ownershipTransferredEvent.args.previousOwner.should.equal(owner);
|
||||
ownershipTransferredEvent.args.newOwner.should.equal(heir);
|
||||
heirOwnershipClaimedEvent.args.previousOwner.should.equal(owner);
|
||||
heirOwnershipClaimedEvent.args.newOwner.should.equal(heir);
|
||||
});
|
||||
|
||||
it('timeOfDeath can be queried', async function () {
|
||||
(await heritable.timeOfDeath()).should.be.bignumber.equal(0);
|
||||
});
|
||||
|
||||
it('heartbeatTimeout can be queried', async function () {
|
||||
(await heritable.heartbeatTimeout()).should.be.bignumber.equal(heartbeatTimeout);
|
||||
});
|
||||
});
|
||||
@ -1,40 +0,0 @@
|
||||
const { expectThrow } = require('./helpers/expectThrow');
|
||||
const { ethGetBalance, ethSendTransaction } = require('./helpers/web3');
|
||||
|
||||
const SimpleSavingsWallet = artifacts.require('SimpleSavingsWallet');
|
||||
|
||||
const BigNumber = web3.BigNumber;
|
||||
|
||||
require('chai')
|
||||
.use(require('chai-bignumber')(BigNumber))
|
||||
.should();
|
||||
|
||||
contract('SimpleSavingsWallet', function ([_, owner, anyone]) {
|
||||
let savingsWallet;
|
||||
|
||||
const paymentAmount = 4242;
|
||||
|
||||
beforeEach(async function () {
|
||||
savingsWallet = await SimpleSavingsWallet.new(4141, { from: owner });
|
||||
});
|
||||
|
||||
it('should receive funds', async function () {
|
||||
await ethSendTransaction({ from: owner, to: savingsWallet.address, value: paymentAmount });
|
||||
const balance = await ethGetBalance(savingsWallet.address);
|
||||
balance.should.be.bignumber.equal(paymentAmount);
|
||||
});
|
||||
|
||||
it('owner can send funds', async function () {
|
||||
// Receive payment so we have some money to spend.
|
||||
await ethSendTransaction({ from: anyone, to: savingsWallet.address, value: 1000000 });
|
||||
|
||||
await expectThrow(savingsWallet.sendTo(0, paymentAmount, { from: owner }));
|
||||
await expectThrow(savingsWallet.sendTo(savingsWallet.address, paymentAmount, { from: owner }));
|
||||
await expectThrow(savingsWallet.sendTo(anyone, 0, { from: owner }));
|
||||
|
||||
const balance = await ethGetBalance(anyone);
|
||||
await savingsWallet.sendTo(anyone, paymentAmount, { from: owner });
|
||||
const updatedBalance = await ethGetBalance(anyone);
|
||||
balance.plus(paymentAmount).should.be.bignumber.equal(updatedBalance);
|
||||
});
|
||||
});
|
||||
@ -1,46 +0,0 @@
|
||||
const { assertRevert } = require('../helpers/assertRevert');
|
||||
|
||||
const Claimable = artifacts.require('Claimable');
|
||||
|
||||
const BigNumber = web3.BigNumber;
|
||||
|
||||
require('chai')
|
||||
.use(require('chai-bignumber')(BigNumber))
|
||||
.should();
|
||||
|
||||
contract('Claimable', function ([_, owner, newOwner, anyone]) {
|
||||
let claimable;
|
||||
|
||||
beforeEach(async function () {
|
||||
claimable = await Claimable.new({ from: owner });
|
||||
});
|
||||
|
||||
it('should have an owner', async function () {
|
||||
(await claimable.owner()).should.not.equal(0);
|
||||
});
|
||||
|
||||
it('changes pendingOwner after transfer', async function () {
|
||||
await claimable.transferOwnership(newOwner, { from: owner });
|
||||
(await claimable.pendingOwner()).should.equal(newOwner);
|
||||
});
|
||||
|
||||
it('should prevent to claimOwnership from anyone', async function () {
|
||||
await assertRevert(claimable.claimOwnership({ from: anyone }));
|
||||
});
|
||||
|
||||
it('should prevent non-owners from transfering', async function () {
|
||||
await assertRevert(claimable.transferOwnership(anyone, { from: anyone }));
|
||||
});
|
||||
|
||||
describe('after initiating a transfer', function () {
|
||||
beforeEach(async function () {
|
||||
await claimable.transferOwnership(newOwner, { from: owner });
|
||||
});
|
||||
|
||||
it('changes allow pending owner to claim ownership', async function () {
|
||||
await claimable.claimOwnership({ from: newOwner });
|
||||
|
||||
(await claimable.owner()).should.equal(newOwner);
|
||||
});
|
||||
});
|
||||
});
|
||||
@ -1,55 +0,0 @@
|
||||
const { assertRevert } = require('../helpers/assertRevert');
|
||||
|
||||
const BigNumber = web3.BigNumber;
|
||||
|
||||
require('chai')
|
||||
.use(require('chai-bignumber')(BigNumber))
|
||||
.should();
|
||||
|
||||
const DelayedClaimable = artifacts.require('DelayedClaimable');
|
||||
|
||||
contract('DelayedClaimable', function ([_, owner, newOwner]) {
|
||||
beforeEach(async function () {
|
||||
this.delayedClaimable = await DelayedClaimable.new({ from: owner });
|
||||
});
|
||||
|
||||
it('can set claim blocks', async function () {
|
||||
await this.delayedClaimable.transferOwnership(newOwner, { from: owner });
|
||||
await this.delayedClaimable.setLimits(0, 1000, { from: owner });
|
||||
|
||||
(await this.delayedClaimable.end()).should.be.bignumber.equal(1000);
|
||||
|
||||
(await this.delayedClaimable.start()).should.be.bignumber.equal(0);
|
||||
});
|
||||
|
||||
it('changes pendingOwner after transfer successful', async function () {
|
||||
await this.delayedClaimable.transferOwnership(newOwner, { from: owner });
|
||||
await this.delayedClaimable.setLimits(0, 1000, { from: owner });
|
||||
|
||||
(await this.delayedClaimable.end()).should.be.bignumber.equal(1000);
|
||||
|
||||
(await this.delayedClaimable.start()).should.be.bignumber.equal(0);
|
||||
|
||||
(await this.delayedClaimable.pendingOwner()).should.equal(newOwner);
|
||||
await this.delayedClaimable.claimOwnership({ from: newOwner });
|
||||
(await this.delayedClaimable.owner()).should.equal(newOwner);
|
||||
});
|
||||
|
||||
it('changes pendingOwner after transfer fails', async function () {
|
||||
await this.delayedClaimable.transferOwnership(newOwner, { from: owner });
|
||||
await this.delayedClaimable.setLimits(100, 110, { from: owner });
|
||||
|
||||
(await this.delayedClaimable.end()).should.be.bignumber.equal(110);
|
||||
|
||||
(await this.delayedClaimable.start()).should.be.bignumber.equal(100);
|
||||
|
||||
(await this.delayedClaimable.pendingOwner()).should.equal(newOwner);
|
||||
await assertRevert(this.delayedClaimable.claimOwnership({ from: newOwner }));
|
||||
(await this.delayedClaimable.owner()).should.not.equal(newOwner);
|
||||
});
|
||||
|
||||
it('set end and start invalid values fail', async function () {
|
||||
await this.delayedClaimable.transferOwnership(newOwner, { from: owner });
|
||||
await assertRevert(this.delayedClaimable.setLimits(1001, 1000, { from: owner }));
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user