Skip to content
This repository has been archived by the owner on Mar 11, 2024. It is now read-only.

Refactor for a cleaner code, less is more in this regard! #38

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions contracts/Authentication.sol
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pragma solidity ^0.4.2;

import './zeppelin/lifecycle/Killable.sol';
import 'zeppelin-solidity/contracts/lifecycle/Destructible.sol';

contract Authentication is Killable {
contract Authentication is Destructible {
struct User {
bytes32 name;
}
Expand Down
15 changes: 0 additions & 15 deletions contracts/zeppelin/lifecycle/Killable.sol

This file was deleted.

26 changes: 0 additions & 26 deletions contracts/zeppelin/ownership/Ownable.sol

This file was deleted.

6 changes: 0 additions & 6 deletions migrations/2_deploy_contracts.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
var Ownable = artifacts.require("./zeppelin/ownership/Ownable.sol");
var Killable = artifacts.require("./zeppelin/lifecycle/Killable.sol");
var Authentication = artifacts.require("./Authentication.sol");

module.exports = function(deployer) {
deployer.deploy(Ownable);
deployer.link(Ownable, Killable);
deployer.deploy(Killable);
deployer.link(Killable, Authentication);
deployer.deploy(Authentication);
};
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
"react-router-redux": "^4.0.7",
"redux": "^3.6.0",
"redux-auth-wrapper": "^1.0.0",
"redux-thunk": "^2.2.0"
"redux-thunk": "^2.2.0",
"zeppelin-solidity": "^1.10.0"
},
"scripts": {
"start": "node scripts/start.js",
Expand Down