diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol index 27598ad..4b532ee 100644 --- a/contracts/Migrations.sol +++ b/contracts/Migrations.sol @@ -8,16 +8,16 @@ contract Migrations { if (msg.sender == owner) _; } - function Migrations() public { - owner = msg.sender; - } +constructor() public { +owner = msg.sender; +} - function setCompleted(uint completed) public restricted { - last_completed_migration = completed; - } +function setCompleted(uint completed) public restricted { +last_completed_migration = completed; +} - function upgrade(address new_address) public restricted { - Migrations upgraded = Migrations(new_address); - upgraded.setCompleted(last_completed_migration); - } +function upgrade(address new_address) public restricted { +Migrations upgraded = Migrations(new_address); +upgraded.setCompleted(last_completed_migration); +} } diff --git a/package.json b/package.json index fdf13de..04af20b 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,6 @@ "type": "git", "url": "https://gitlab.com/Ezerous/Apella.git" }, - "devDependencies": { - "truffle-contract": "^3.0.4" - }, "dependencies": { "drizzle": "^1.1.5", "drizzle-react": "^1.1.1", @@ -23,7 +20,6 @@ "redux": "^3.7.2", "redux-auth-wrapper": "1.1.0", "redux-saga": "0.16.0", - "redux-thunk": "^2.2.0", "web3":"^1.0.0-beta.34" }, "scripts": { diff --git a/src/store.js b/src/store.js index bb1080d..bc333fe 100644 --- a/src/store.js +++ b/src/store.js @@ -1,6 +1,5 @@ import { browserHistory } from 'react-router' import { createStore, applyMiddleware, compose } from 'redux' -import thunkMiddleware from 'redux-thunk' import { routerMiddleware } from 'react-router-redux' import reducer from './reducer' import rootSaga from './rootSaga' @@ -23,7 +22,6 @@ const store = createStore( initialState, composeEnhancers( applyMiddleware( - thunkMiddleware, routingMiddleware, sagaMiddleware )