:
-
- ) :
-
+ return (network.connected)
+ ? (fetching
+ ?
+ : (
+
+ )
+ )
+ :
-
+ RootDAO: { props.jurisdiction.owner }
-})
+const RootDAO = connect(({ jurisdiction }) => ({ jurisdiction }))((props) => {
+ return RootDAO: { props.jurisdiction.owner }
;
+});
class Transparency extends Component {
- componentWillMount() {
- this.props.find()
+ componentWillMount () {
+ this.props.find();
}
- render() {
+ render () {
return (
Jurisdiction
- )
+ );
}
}
-function mapDispatchToProps(dispatch) {
+function mapDispatchToProps (dispatch) {
return ({
- find: () => dispatch(JurisdictionActions.find())
+ find: () => dispatch(JurisdictionActions.find()),
});
}
diff --git a/src/components/Modal.react.js b/src/components/Modal.react.js
index d3cee68..ff688ab 100644
--- a/src/components/Modal.react.js
+++ b/src/components/Modal.react.js
@@ -1,10 +1,9 @@
-import React from 'react'
+import React from 'react';
class Modal extends React.Component {
-
- render() {
- let cssClass = this.props.open ? '' : 'hidden'
- cssClass += this.props.dark ? ' dark' : ''
+ render () {
+ let cssClass = this.props.open ? '' : 'hidden';
+ cssClass += this.props.dark ? ' dark' : '';
return (
@@ -12,15 +11,17 @@ class Modal extends React.Component {
{this._renderProgressBar()}
- )
+ );
}
- _renderProgressBar() {
- if(this.props.progressBar) return (
-
- )
+ _renderProgressBar () {
+ if (this.props.progressBar) {
+ return (
+
+ );
+ }
}
}
diff --git a/src/components/ValidateMe.react.js b/src/components/ValidateMe.react.js
index 9169414..a73becd 100644
--- a/src/components/ValidateMe.react.js
+++ b/src/components/ValidateMe.react.js
@@ -1,39 +1,37 @@
import React, { Component } from 'react';
-import { connect } from 'react-redux'
+import { connect } from 'react-redux';
-import ValidationActions from "../actions/validation";
+import ValidationActions from '../actions/validation';
class ValidateMe extends Component {
-
- componentDidUpdate(prevProps, prevState, snapshot) {
+ componentDidUpdate (prevProps, prevState, snapshot) {
if (this.props.address !== prevProps.address) {
this.props.checkValidated(this.props.address);
}
}
- render() {
+ render () {
return (
-
Am I validated? { this.props.isValidated ? "Yes" : "No" }
+
Am I validated? { this.props.isValidated ? 'Yes' : 'No' }
Validators:
- { validators.length === 0 ? (
-
No validators
- ) : (
-
{this._buildValidatorsList(validators)}
- )
+ { validators.length === 0
+ ?
No validators
+ :
{this._buildValidatorsList(validators)}
}
- )
+ );
}
- _buildValidatorsList(validators) {
+ _buildValidatorsList (validators) {
return validators.map((validator) => {
return (
{validator}
- )
- })
+ );
+ });
}
}
-function mapStateToProps({ validators }) {
- return { validators }
+function mapStateToProps ({ validators }) {
+ return { validators };
}
-function mapDispatchToProps(dispatch) {
- return({
- findAll: () => dispatch(ValidatorsActions.findAll())
+function mapDispatchToProps (dispatch) {
+ return ({
+ findAll: () => dispatch(ValidatorsActions.findAll()),
});
}
export default connect(
mapStateToProps,
- mapDispatchToProps
+ mapDispatchToProps,
)(ValidatorsList);
diff --git a/src/components/Wallet.react.js b/src/components/Wallet.react.js
index d266e7c..7e29cd5 100644
--- a/src/components/Wallet.react.js
+++ b/src/components/Wallet.react.js
@@ -1,17 +1,16 @@
import React, { Component } from 'react';
import { connect } from 'react-redux';
-import WalletActions from "../actions/wallet";
+import WalletActions from '../actions/wallet';
class Wallet extends Component {
-
- componentDidUpdate(prevProps, prevState, snapshot) {
+ componentDidUpdate (prevProps, prevState, snapshot) {
if (this.props.address !== prevProps.address) {
this.props.getBalance(this.props.address);
}
}
- render() {
+ render () {
return (
I have { this.props.balance.toString() } tokens.
@@ -19,21 +18,20 @@ class Wallet extends Component {
);
}
-
}
-function mapStateToProps({ accounts, wallet }) {
+function mapStateToProps ({ accounts, wallet }) {
return { address: accounts.address, balance: wallet.balance };
}
-function mapDispatchToProps(dispatch) {
- return({
+function mapDispatchToProps (dispatch) {
+ return ({
getBalance: (address) => dispatch(WalletActions.getBalance(address)),
- buyTokens: (address) => dispatch(WalletActions.buy(address))
+ buyTokens: (address) => dispatch(WalletActions.buy(address)),
});
}
export default connect(
mapStateToProps,
- mapDispatchToProps
+ mapDispatchToProps,
)(Wallet);
diff --git a/src/contracts.js b/src/contracts.js
index c6a4baf..62942a2 100644
--- a/src/contracts.js
+++ b/src/contracts.js
@@ -1,9 +1,9 @@
-import Network from './network'
-import contract from 'truffle-contract'
+import Network from './network';
+import contract from 'truffle-contract';
const provider = Network.provider();
-function getContract(name) {
+function getContract (name) {
const C = contract(require('../build/contracts/' + name + '.json'));
C.setProvider(provider);
return C;
@@ -18,5 +18,5 @@ export {
Jurisdiction,
DummyValidator,
SampleToken,
- SampleCrowdsale
-}
+ SampleCrowdsale,
+};
diff --git a/src/index.js b/src/index.js
index fd5f4e4..4015f5c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,13 +1,13 @@
-import React from 'react'
-import ReactDOM from 'react-dom'
-import App from './components/App.react'
-import './index.css'
-import { Provider } from 'react-redux'
-import Store from './store'
+import React from 'react';
+import ReactDOM from 'react-dom';
+import App from './components/App.react';
+import './index.css';
+import { Provider } from 'react-redux';
+import Store from './store';
ReactDOM.render(
,
document.getElementById('root')
-)
+);
diff --git a/src/network.js b/src/network.js
index a5be1a6..d9c3632 100644
--- a/src/network.js
+++ b/src/network.js
@@ -1,40 +1,40 @@
import Web3 from 'web3';
-import { PROVIDER } from 'constants'
+import { PROVIDER } from 'constants';
const Network = {
- web3() {
- return new Web3(this.provider())
+ web3 () {
+ return new Web3(this.provider());
},
- eth() {
+ eth () {
return this.web3().eth;
},
- provider() {
+ provider () {
if (typeof window.web3 !== 'undefined') {
- return window.web3.currentProvider
+ return window.web3.currentProvider;
} else {
- return new Web3.providers.HttpProvider(PROVIDER)
+ return new Web3.providers.HttpProvider(PROVIDER);
}
},
- getAccounts() {
+ getAccounts () {
return new Promise(function (resolve, reject) {
- Network.eth().getAccounts(Network._web3Callback(resolve, reject))
+ Network.eth().getAccounts(Network._web3Callback(resolve, reject));
});
},
- _web3Callback(resolve, reject) {
+ _web3Callback (resolve, reject) {
return function (error, value) {
if (error) {
reject(error);
} else {
resolve(value);
}
- }
- }
+ };
+ },
-}
+};
-export default Network
+export default Network;
diff --git a/src/reducers/accounts.js b/src/reducers/accounts.js
index b7c2c31..edf90ba 100644
--- a/src/reducers/accounts.js
+++ b/src/reducers/accounts.js
@@ -1,13 +1,13 @@
-import * as ActionTypes from '../actiontypes'
+import * as ActionTypes from '../actiontypes';
-const initialState = { address: ''};
+const initialState = { address: '' };
const AccountsReducer = (state = initialState, action) => {
switch (action.type) {
- case ActionTypes.RECEIVE_ACCOUNT:
- return {...state, address: action.address };
- default:
- return state
+ case ActionTypes.RECEIVE_ACCOUNT:
+ return { ...state, address: action.address };
+ default:
+ return state;
}
};
diff --git a/src/reducers/alerts.js b/src/reducers/alerts.js
index bd5f193..86c5b7f 100644
--- a/src/reducers/alerts.js
+++ b/src/reducers/alerts.js
@@ -1,13 +1,13 @@
-import * as ActionTypes from '../actiontypes'
+import * as ActionTypes from '../actiontypes';
const AlertsReducer = (state = null, action) => {
switch (action.type) {
- case ActionTypes.SHOW_ERROR:
- return { message: action.message };
- case ActionTypes.RESET_ERROR:
- return null;
- default:
- return state
+ case ActionTypes.SHOW_ERROR:
+ return { message: action.message };
+ case ActionTypes.RESET_ERROR:
+ return null;
+ default:
+ return state;
}
};
diff --git a/src/reducers/fetching.js b/src/reducers/fetching.js
index 82a9f0d..375043f 100644
--- a/src/reducers/fetching.js
+++ b/src/reducers/fetching.js
@@ -1,13 +1,13 @@
-import * as ActionTypes from '../actiontypes'
+import * as ActionTypes from '../actiontypes';
const FetchingReducer = (state = null, action) => {
switch (action.type) {
- case ActionTypes.START_FETCHING:
- return action.message
- case ActionTypes.STOP_FETCHING:
- return null
- default:
- return state
+ case ActionTypes.START_FETCHING:
+ return action.message;
+ case ActionTypes.STOP_FETCHING:
+ return null;
+ default:
+ return state;
}
};
diff --git a/src/reducers/jurisdiction.js b/src/reducers/jurisdiction.js
index 7ecc672..da9f690 100644
--- a/src/reducers/jurisdiction.js
+++ b/src/reducers/jurisdiction.js
@@ -1,11 +1,11 @@
-import * as ActionTypes from '../actiontypes'
+import * as ActionTypes from '../actiontypes';
const JurisdictionReducer = (state = { owner: 'undefined' }, action) => {
switch (action.type) {
- case ActionTypes.RECEIVE_JURISDICTION:
- return action.jurisdiction;
- default:
- return state
+ case ActionTypes.RECEIVE_JURISDICTION:
+ return action.jurisdiction;
+ default:
+ return state;
}
};
diff --git a/src/reducers/network.js b/src/reducers/network.js
index b999f7e..4034ece 100644
--- a/src/reducers/network.js
+++ b/src/reducers/network.js
@@ -1,16 +1,16 @@
-import * as ActionTypes from '../actiontypes'
+import * as ActionTypes from '../actiontypes';
-const initialState = { connected: null }
+const initialState = { connected: null };
const NetworkReducer = (state = initialState, action) => {
switch (action.type) {
- case ActionTypes.CONNECTION_FAILED:
- return {...state, connected: false };
- case ActionTypes.CONNECTION_SUCCEEDED:
- return {...state, connected: true};
- default:
- return state
+ case ActionTypes.CONNECTION_FAILED:
+ return { ...state, connected: false };
+ case ActionTypes.CONNECTION_SUCCEEDED:
+ return { ...state, connected: true };
+ default:
+ return state;
}
-}
+};
-export default NetworkReducer
+export default NetworkReducer;
diff --git a/src/reducers/validations.js b/src/reducers/validations.js
index 3b4f245..c0f3ffa 100644
--- a/src/reducers/validations.js
+++ b/src/reducers/validations.js
@@ -1,13 +1,13 @@
-import * as ActionTypes from '../actiontypes'
+import * as ActionTypes from '../actiontypes';
-const initialState = { address: "", isValidated: false };
+const initialState = { address: '', isValidated: false };
const ValidationsReducer = (state = initialState, action) => {
switch (action.type) {
- case ActionTypes.VALIDATION_UPDATED:
- return {...state, address: action.address, isValidated: action.isValidated };
- default:
- return state
+ case ActionTypes.VALIDATION_UPDATED:
+ return { ...state, address: action.address, isValidated: action.isValidated };
+ default:
+ return state;
}
};
diff --git a/src/reducers/validators.js b/src/reducers/validators.js
index 6b46503..c732e7e 100644
--- a/src/reducers/validators.js
+++ b/src/reducers/validators.js
@@ -1,14 +1,14 @@
-import * as ActionTypes from '../actiontypes'
+import * as ActionTypes from '../actiontypes';
-const initialState = { list: [], validator: null }
+const initialState = { list: [], validator: null };
const ValidatorsReducer = (state = initialState, action) => {
switch (action.type) {
- case ActionTypes.ADD_VALIDATOR:
- let validators = state.list;
- return {...state, list: [action.validator].concat(validators)};
- default:
- return state
+ case ActionTypes.ADD_VALIDATOR:
+ let validators = state.list;
+ return { ...state, list: [action.validator].concat(validators) };
+ default:
+ return state;
}
};
diff --git a/src/reducers/wallet.js b/src/reducers/wallet.js
index 208d24b..c6844e2 100644
--- a/src/reducers/wallet.js
+++ b/src/reducers/wallet.js
@@ -1,13 +1,13 @@
import * as ActionTypes from '../actiontypes';
-const initialState = { address: "", balance: 0 };
+const initialState = { address: '', balance: 0 };
const WalletReducer = (state = initialState, action) => {
switch (action.type) {
- case ActionTypes.BALANCE_UPDATED:
- return {...state, address: action.address, balance: action.balance };
- default:
- return state;
+ case ActionTypes.BALANCE_UPDATED:
+ return { ...state, address: action.address, balance: action.balance };
+ default:
+ return state;
}
};
diff --git a/src/store.js b/src/store.js
index e6e7335..3ac75ca 100644
--- a/src/store.js
+++ b/src/store.js
@@ -1,14 +1,14 @@
-import thunkMiddleware from 'redux-thunk'
-import logger from 'redux-logger'
-import alerts from './reducers/alerts'
-import accounts from './reducers/accounts'
-import network from './reducers/network'
-import fetching from './reducers/fetching'
-import jurisdiction from './reducers/jurisdiction'
-import validators from './reducers/validators'
-import validations from './reducers/validations'
-import wallet from './reducers/wallet'
-import { createStore, combineReducers, applyMiddleware } from 'redux'
+import thunkMiddleware from 'redux-thunk';
+import logger from 'redux-logger';
+import alerts from './reducers/alerts';
+import accounts from './reducers/accounts';
+import network from './reducers/network';
+import fetching from './reducers/fetching';
+import jurisdiction from './reducers/jurisdiction';
+import validators from './reducers/validators';
+import validations from './reducers/validations';
+import wallet from './reducers/wallet';
+import { createStore, combineReducers, applyMiddleware } from 'redux';
const mainReducer = combineReducers({
alerts,
diff --git a/test/contracts/DummyValidator.test.js b/test/contracts/DummyValidator.test.js
index 5730657..0f59620 100644
--- a/test/contracts/DummyValidator.test.js
+++ b/test/contracts/DummyValidator.test.js
@@ -1,18 +1,17 @@
const Jurisdiction = artifacts.require('Jurisdiction');
const DummyValidator = artifacts.require('DummyValidator');
-var should = require('chai').should();
+require('chai').should();
contract('DummyValidator', function ([investor]) {
+ beforeEach(async function () {
+ this.jurisdiction = await Jurisdiction.new();
+ this.dummyValidator = await DummyValidator.new(this.jurisdiction.address);
+ await this.jurisdiction.addValidator(this.dummyValidator.address);
+ });
- beforeEach(async function () {
- this.jurisdiction = await Jurisdiction.new();
- this.dummyValidator = await DummyValidator.new(this.jurisdiction.address);
- await this.jurisdiction.addValidator(this.dummyValidator.address);
- });
-
- it('should validate', async function () {
- await this.dummyValidator.validate({from: investor});
- (await this.jurisdiction.hasAttribute(investor, 'VALID')).should.be.true;
- });
+ it('should validate', async function () {
+ await this.dummyValidator.validate({ from: investor });
+ (await this.jurisdiction.hasAttribute(investor, 'VALID')).should.be.true;
+ });
});
diff --git a/test/contracts/SampleCrowdsale.test.js b/test/contracts/SampleCrowdsale.test.js
index 825d63f..d8475eb 100644
--- a/test/contracts/SampleCrowdsale.test.js
+++ b/test/contracts/SampleCrowdsale.test.js
@@ -4,53 +4,52 @@ const SampleCrowdsale = artifacts.require('SampleCrowdsale');
const BigNumber = web3.BigNumber;
-var should = require('chai')
- .use(require('chai-as-promised'))
- .use(require('chai-bignumber')(BigNumber))
- .should();
+require('chai')
+ .use(require('chai-as-promised'))
+ .use(require('chai-bignumber')(BigNumber))
+ .should();
contract('SampleCrowdsale', function ([owner, wallet, investor]) {
-
- const RATE = new BigNumber(1);
-
- beforeEach(async function () {
- this.jurisdiction = await Jurisdiction.new();
- await this.jurisdiction.addValidator(owner);
-
- this.token = await SampleToken.new(this.jurisdiction.address);
- this.crowdsale = await SampleCrowdsale.new(
- RATE, wallet, this.token.address);
- await this.token.transferOwnership(this.crowdsale.address);
- });
-
- it('should create crowdsale with correct parameters', async function () {
- (await this.crowdsale.rate()).should.be.bignumber.equal(RATE);
- (await this.crowdsale.wallet()).should.be.equal(wallet);
- });
-
- it('should not accept payment not validated', async function () {
- const investmentAmount = new BigNumber(web3.toWei(1, 'ether'));
- await this.crowdsale.buyTokens(
- investor,
- { value: investmentAmount, from: investor }
- ).should.be.rejectedWith('revert');
- (await this.token.balanceOf(investor))
- .should.be.bignumber.equal(0);
- (await this.token.totalSupply())
- .should.be.bignumber.equal(0);
- });
-
- it('should accept payment validated', async function () {
- await this.jurisdiction.addAttribute(investor, 'VALID', 1);
-
- const investmentAmount = new BigNumber(web3.toWei(1, 'ether'));
- await this.crowdsale.buyTokens(
- investor,
- { value: investmentAmount, from: investor }
- ).should.be.fulfilled;
- (await this.token.balanceOf(investor))
- .should.be.bignumber.equal(investmentAmount);
- (await this.token.totalSupply())
- .should.be.bignumber.equal(investmentAmount);
- });
+ const RATE = new BigNumber(1);
+
+ beforeEach(async function () {
+ this.jurisdiction = await Jurisdiction.new();
+ await this.jurisdiction.addValidator(owner);
+
+ this.token = await SampleToken.new(this.jurisdiction.address);
+ this.crowdsale = await SampleCrowdsale.new(
+ RATE, wallet, this.token.address);
+ await this.token.transferOwnership(this.crowdsale.address);
+ });
+
+ it('should create crowdsale with correct parameters', async function () {
+ (await this.crowdsale.rate()).should.be.bignumber.equal(RATE);
+ (await this.crowdsale.wallet()).should.be.equal(wallet);
+ });
+
+ it('should not accept payment not validated', async function () {
+ const investmentAmount = new BigNumber(web3.toWei(1, 'ether'));
+ await this.crowdsale.buyTokens(
+ investor,
+ { value: investmentAmount, from: investor }
+ ).should.be.rejectedWith('revert');
+ (await this.token.balanceOf(investor))
+ .should.be.bignumber.equal(0);
+ (await this.token.totalSupply())
+ .should.be.bignumber.equal(0);
+ });
+
+ it('should accept payment validated', async function () {
+ await this.jurisdiction.addAttribute(investor, 'VALID', 1);
+
+ const investmentAmount = new BigNumber(web3.toWei(1, 'ether'));
+ await this.crowdsale.buyTokens(
+ investor,
+ { value: investmentAmount, from: investor }
+ ).should.be.fulfilled;
+ (await this.token.balanceOf(investor))
+ .should.be.bignumber.equal(investmentAmount);
+ (await this.token.totalSupply())
+ .should.be.bignumber.equal(investmentAmount);
+ });
});
diff --git a/test/contracts/SampleToken.test.js b/test/contracts/SampleToken.test.js
index af45d96..0a991a3 100644
--- a/test/contracts/SampleToken.test.js
+++ b/test/contracts/SampleToken.test.js
@@ -3,13 +3,12 @@ const SampleToken = artifacts.require('SampleToken');
const BigNumber = web3.BigNumber;
-var should = require('chai')
- .use(require('chai-as-promised'))
- .use(require('chai-bignumber')(BigNumber))
- .should();
+require('chai')
+ .use(require('chai-as-promised'))
+ .use(require('chai-bignumber')(BigNumber))
+ .should();
contract('SampleToken', function ([owner, investor1, investor2]) {
-
beforeEach(async function () {
this.jurisdiction = await Jurisdiction.new();
await this.jurisdiction.addValidator(owner);
@@ -125,5 +124,4 @@ contract('SampleToken', function ([owner, investor1, investor2]) {
(await this.token.balanceOf(investor2))
.should.be.bignumber.equal(investmentAmount);
});
-
});
diff --git a/test/react/setup.js b/test/react/setup.js
index 015b8c3..1a627b0 100644
--- a/test/react/setup.js
+++ b/test/react/setup.js
@@ -11,19 +11,19 @@ const { JSDOM } = require('jsdom');
const jsdom = new JSDOM('');
const { window } = jsdom;
-function copyProps(src, target) {
- const props = Object.getOwnPropertyNames(src)
- .filter(prop => typeof target[prop] === 'undefined')
- .reduce((result, prop) => ({
- ...result,
- [prop]: Object.getOwnPropertyDescriptor(src, prop),
- }), {});
- Object.defineProperties(target, props);
+function copyProps (src, target) {
+ const props = Object.getOwnPropertyNames(src)
+ .filter(prop => typeof target[prop] === 'undefined')
+ .reduce((result, prop) => ({
+ ...result,
+ [prop]: Object.getOwnPropertyDescriptor(src, prop),
+ }), {});
+ Object.defineProperties(target, props);
}
global.window = window;
global.document = window.document;
global.navigator = {
- userAgent: 'node.js',
+ userAgent: 'node.js',
};
copyProps(window, global);
diff --git a/test/react/test.js b/test/react/test.js
index e487e39..9927367 100644
--- a/test/react/test.js
+++ b/test/react/test.js
@@ -8,10 +8,10 @@ import ValidatorsList from '../../src/components/ValidatorsList.react';
spy(ValidatorsList.prototype, 'componentDidMount');
describe('', () => {
- it('calls componentDidMount', () => {
- const initialState = {};
- const store = createMockStore(initialState);
- const wrapper = shallow(, {context: {store}});
- expect(ValidatorsList.prototype.componentDidMount.calledOnce).to.equal(true);
- });
+ it('calls componentDidMount', () => {
+ const initialState = {};
+ const store = createMockStore(initialState);
+ shallow(, { context: { store } });
+ expect(ValidatorsList.prototype.componentDidMount.calledOnce).to.equal(true);
+ });
});
diff --git a/truffle.js b/truffle.js
index 90808a7..60ee264 100644
--- a/truffle.js
+++ b/truffle.js
@@ -1,10 +1,10 @@
module.exports = {
networks: {
development: {
- host: "localhost",
+ host: 'localhost',
port: 8545,
- network_id: "*",
+ network_id: '*', // eslint-disable-line camelcase
gas: 1000000,
},
},
-}
+};