Merge pull request #95 from 67P/cosmetics

Cosmetic cleanups
This commit is contained in:
bumi 2019-04-12 18:55:59 +00:00 committed by GitHub
commit b6c06c289c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 21 additions and 19 deletions

View File

@ -79,9 +79,9 @@ Kredits DAO independently.
![](docs/kredits-diagram.png) ![](docs/kredits-diagram.png)
A DAO can be deployed using the `scripts/deploy-kit.js` script or with the `npm A DAO can be deployed using the `scripts/deploy-kit.js` script or with the
run deploy:dao` command. This deploys a new Kredits DAO, installs the latest `npm run deploy:dao` command. This deploys a new Kredits DAO, installs the
app versions and sets the required permissions. latest app versions and sets the required permissions.
See each app in `/apps/*` for details. See each app in `/apps/*` for details.
@ -115,11 +115,11 @@ Script to add a new entries to the contracts using the JS wrapper
$ truffle exec scripts/add-{contributor, contribution, proposal}.js $ truffle exec scripts/add-{contributor, contribution, proposal}.js
### list-{contributor, contribution, proposal}.js ### list-{contributors, contributions, proposals}.js
List contract entries List contract entries
$ truffle exec scripts/list-{contributor, contribution, proposal}.js $ truffle exec scripts/list-{contributors, contributions, proposals}.js
### send-funds.js ### send-funds.js
@ -152,7 +152,7 @@ Deploys a new KreditsKit that allows to create a new DAO
or or
$ npm run deploy:kit $ npm run deploy:kit
`ENS` address is required as environment variable. `ENS` address is required as environment variable.
`DAO_FACTORY` can optionally be set as environment variable. (see aragon) `DAO_FACTORY` can optionally be set as environment variable. (see aragon)
### new-dao.js ### new-dao.js

View File

@ -11,10 +11,10 @@
"start": "npm run start:aragon:ipfs", "start": "npm run start:aragon:ipfs",
"start:aragon:ipfs": "aragon run", "start:aragon:ipfs": "aragon run",
"start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist", "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
"start:app": "npm run sync-assets && npm run build:script -- --no-minify && parcel serve app/index.html -p 8001 --out-dir dist/ --no-cache", "start:app": "",
"test": "aragon contracts test", "test": "aragon contracts test",
"compile": "aragon contracts compile", "compile": "aragon contracts compile",
"sync-assets": "copy-aragon-ui-assets -n aragon-ui ./dist", "sync-assets": "",
"build:app": "", "build:app": "",
"build:script": "", "build:script": "",
"build": "", "build": "",

View File

@ -1,4 +1,4 @@
const CounterApp = artifacts.require('Contribution.sol') const Contribution = artifacts.require('Contribution.sol')
contract('Contribution', (accounts) => { contract('Contribution', (accounts) => {
it('should be tested') it('should be tested')

View File

@ -1,5 +1,5 @@
const CounterApp = artifacts.require('CounterApp.sol') const Contributor = artifacts.require('Contributor.sol')
contract('CounterApp', (accounts) => { contract('Contributor', (accounts) => {
it('should be tested') it('should be tested')
}) })

View File

@ -1,4 +1,4 @@
{ {
"name": "Proposal", "name": "Proposal",
"description": "Kredits proposal app" "description": "Kredits Proposal app"
} }

View File

@ -0,0 +1,5 @@
const Proposal = artifacts.require('Proposal.sol')
contract('Proposal', (accounts) => {
it('should be tested')
})

View File

@ -1,4 +1,4 @@
{ {
"name": "Token", "name": "Token",
"description": "Kredits token app" "description": "Kredits Token app"
} }

View File

@ -1,5 +1,5 @@
const CounterApp = artifacts.require('CounterApp.sol') const Token = artifacts.require('Token.sol')
contract('CounterApp', (accounts) => { contract('Token', (accounts) => {
it('should be tested') it('should be tested')
}) })

View File

@ -20,4 +20,5 @@ class Base {
return this.contract.on(type, callback); return this.contract.on(type, callback);
} }
} }
module.exports = Base; module.exports = Base;

View File

@ -1,4 +1,3 @@
const ethers = require('ethers');
const RSVP = require('rsvp'); const RSVP = require('rsvp');
const ContributorSerializer = require('../serializers/contributor'); const ContributorSerializer = require('../serializers/contributor');
@ -20,7 +19,6 @@ class Contributor extends Base {
getById(id) { getById(id) {
return this.functions.getContributorById(id) return this.functions.getContributorById(id)
// Fetch IPFS data if available
.then((data) => { .then((data) => {
return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize); return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize);
}); });

View File

@ -1,4 +1,3 @@
const ethers = require('ethers');
const RSVP = require('rsvp'); const RSVP = require('rsvp');
const ContributionSerializer = require('../serializers/contribution'); const ContributionSerializer = require('../serializers/contribution');

View File

@ -4,4 +4,3 @@ class Token extends Base {
} }
module.exports = Token; module.exports = Token;