Skip to content

Enhancement/heritable encapsulation #692 #702

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 10 commits into from
Jan 26, 2018
Merged

Enhancement/heritable encapsulation #692 #702

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
79b85f1
Modified Gitignore for Sublime
trejas Jan 20, 2018
af02540
Added getter functions for public variables
trejas Jan 20, 2018
3598b57
Added encapsulation to Heritable public variables.
trejas Jan 21, 2018
b505056
Added encapsulation to Heritable public variables.
trejas Jan 24, 2018
6e89ffe
Added encapsulation to Heritable public variables.
trejas Jan 24, 2018
e5959df
Updated tests to use getter methods instead of, now, private variables.
trejas Jan 24, 2018
3c4c019
Conformed variable names to current conventions.
trejas Jan 26, 2018
7e0a3e7
Requested changes
trejas Jan 26, 2018
1b66e8a
revert package-lock.json changes
frangio Jan 26, 2018
f7184a2
Merge branch 'master' into enhancement/heritable-encapsulation-#692
frangio Jan 26, 2018
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
Prev Previous commit
Next Next commit
Updated tests to use getter methods instead of, now, private variables.
  • Loading branch information
@trejas
trejas committed Jan 24, 2018
commit e5959df1123b5fd86ae2bdc2b027ef18f23a01ac
8 changes: 4 additions & 4 deletions test/Heritable.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ contract('Heritable', function (accounts) {
});

it('should start off with an owner, but without heir', async function () {
const heir = await heritable.heir();
const heir = await heritable.getHeir();

assert.equal(typeof (owner), 'string');
assert.equal(typeof (heir), 'string');
Expand All @@ -41,11 +41,11 @@ contract('Heritable', function (accounts) {
it('owner can remove heir', async function () {
const newHeir = accounts[1];
await heritable.setHeir(newHeir, { from: owner });
let heir = await heritable.heir();
let heir = await heritable.getHeir();

assert.notStrictEqual(heir, NULL_ADDRESS);
await heritable.removeHeir();
heir = await heritable.heir();
heir = await heritable.getHeir();
assert.isTrue(heir === NULL_ADDRESS);
});

Expand All @@ -60,7 +60,7 @@ contract('Heritable', function (accounts) {

await increaseTime(4141);
await heritable.claimHeirOwnership({ from: heir });
assert.isTrue(await heritable.heir() === heir);
assert.isTrue(await heritable.getHeir() === heir);
});

it('heir can\'t claim ownership if owner heartbeats', async function () {
Expand Down