Skip to content

Commit

Permalink
Merge 804944d into e270b8c
Browse files Browse the repository at this point in the history
  • Loading branch information
Falci committed Feb 4, 2021
2 parents e270b8c + 804944d commit 742bfe8
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 16 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@ jobs:

- name: Install
run: sudo apt-get install -y libunbound-dev |
npm install nyc coveralls bslint
npm install nyc coveralls bslint jsdoc

- name: Lint
run: npm run lint

- name: Build Docs
run: npm run build-docs

- name: Test
run: npm run test-ci

Expand Down
19 changes: 9 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
This repository includes a file [.eslintrc.json](.eslintrc.json) which sets
linting preferences for the project. The continuous integration bot will
install [bslint](https://www.npmjs.com/package/bslint) which vendors a specific
version of eslint. Before submitting a pull request, please make sure your code
is clean of linting errors. If you choose to use bslint, it can be installed
globally in your development environment:
version of eslint and [jsdoc](https://www.npmjs.com/package/jsdoc). Before
submitting a pull request, please make sure your code is clean of linting errors
and has a valid documentation. If you choose to use bslint and/or jsdoc, they can
be installed globally in your development environment:

```
npm install bslint -g
cd hsd # must be in repository root
npm run lint # command is defined in package.json
npm install bslint jsdoc -g
cd hsd # must be in repository root
npm run lint # command is defined in package.json
npm run build-docs # also defined in package.json
```

## Testing
Expand Down Expand Up @@ -41,7 +43,7 @@ Recent workflow actions are available:
https://github.com/handshake-org/hsd/actions

All code changes should be covered by new tests if applicable. We currently use
Coveralls to examine test coverage, and a pull request that *decreases* test
Coveralls to examine test coverage, and a pull request that _decreases_ test
coverage will likely not be reviewed by contributors or maintainers.

Current test coverage details are available:
Expand All @@ -68,6 +70,3 @@ example of this is in
[this commit](https://github.com/handshake-org/hsd/commit/c385fc59d488f5cd592a1d23554fe1c018bf26da).
Note how the author used a very brief commit message as the title but then added
a detailed description in the extended message.



5 changes: 2 additions & 3 deletions lib/wallet/path.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ class Path extends bio.Struct {

/**
* Convert path object to string derivation path.
* @param {String|Network} [network] - Network type.
* @param {(String|Network)?} network - Network type.
* @returns {String}
*/

Expand Down Expand Up @@ -243,8 +243,7 @@ class Path extends bio.Struct {

/**
* Convert path to a json-friendly object.
* @param {String|Network} [network] - Network type.
* @returns {Object}
* @param {(String|Network)?} network - Network type.
*/

getJSON(network) {
Expand Down
8 changes: 6 additions & 2 deletions lib/wallet/wallet.js
Original file line number Diff line number Diff line change
Expand Up @@ -1832,7 +1832,9 @@ class Wallet extends EventEmitter {
* @param {Number} value
* @param {Number} lockup
* @param {Object} options
* @returns {{ bid: MTX; reveal: MTX;}} {bid, reveal}
* @returns {Object} output
* @returns {MTX} output.bid
* @returns {MTX} output.reveal
*/

async createAuctionTxs(name, value, lockup, options) {
Expand All @@ -1851,7 +1853,9 @@ class Wallet extends EventEmitter {
* @param {Number} value
* @param {Number} lockup
* @param {Object} options
* @returns {{ bid: MTX; reveal: MTX;}} {bid, reveal}
* @returns {Object} output
* @returns {MTX} output.bid
* @returns {MTX} output.reveal
*/

async _createAuctionTxs(name, value, lockup, options) {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"hsw-cli": "./bin/hsw-cli"
},
"scripts": {
"build-docs": "jsdoc -c jsdoc.json",
"lint": "eslint $(cat .eslintfiles)",
"lint-file": "eslint",
"test": "bmocha --reporter spec test/*.js",
Expand Down

0 comments on commit 742bfe8

Please sign in to comment.