Skip to content
Snippets Groups Projects
Commit f4e4dfe6 authored by Éloïs's avatar Éloïs
Browse files

Merge branch 'small_fixes' into 'dev'

Small fixes #1215

See merge request !1212
parents ec72c417 559f524c
Branches
Tags
2 merge requests!1223Start up,!1212Small fixes #1215
...@@ -217,7 +217,7 @@ function beginNewProofOfWork(stuff:any) { ...@@ -217,7 +217,7 @@ function beginNewProofOfWork(stuff:any) {
****************/ ****************/
// We wait for a maximum time of `turnDuration`. // We wait for a maximum time of `turnDuration`.
// This will trigger the end of the turn by the concurrent race I. During that time, the proof.js script // This will trigger the end of the turn by the concurrent race I. During that time, the proof.js script
// just does nothing: this gives of a bit of breath to the CPU. Tthe amount of "breath" depends on the "cpu" // just does nothing: this gives of a bit of breath to the CPU. The amount of "breath" depends on the "cpu"
// parameter. // parameter.
await countDown(turnDuration); await countDown(turnDuration);
} }
......
...@@ -16,8 +16,8 @@ export const WS2PDependency = { ...@@ -16,8 +16,8 @@ export const WS2PDependency = {
cliOptions: [ cliOptions: [
{ value: '--ws2p-upnp', desc: 'Use UPnP to open remote port.' }, { value: '--ws2p-upnp', desc: 'Use UPnP to open remote port.' },
{ value: '--ws2p-noupnp', desc: 'Do not use UPnP to open remote port.' }, { value: '--ws2p-noupnp', desc: 'Do not use UPnP to open remote port.' },
{ value: '--ws2p-host <host>', desc: 'Port to listen to.' }, { value: '--ws2p-host <host>', desc: 'Host to listen to.' },
{ value: '--ws2p-port <port>', desc: 'Host to listen to.', parser: (val:string) => parseInt(val) }, { value: '--ws2p-port <port>', desc: 'Port to listen to.', parser: (val:string) => parseInt(val) },
{ value: '--ws2p-remote-host <address>', desc: 'Availabily host.' }, { value: '--ws2p-remote-host <address>', desc: 'Availabily host.' },
{ value: '--ws2p-remote-port <port>', desc: 'Availabily port.', parser: (val:string) => parseInt(val) }, { value: '--ws2p-remote-port <port>', desc: 'Availabily port.', parser: (val:string) => parseInt(val) },
{ value: '--ws2p-remote-path <path>', desc: 'Availabily web path.' }, { value: '--ws2p-remote-path <path>', desc: 'Availabily web path.' },
......
...@@ -486,6 +486,7 @@ function commandLineConf(program:any, conf:any = {}) { ...@@ -486,6 +486,7 @@ function commandLineConf(program:any, conf:any = {}) {
if (cli.currency) conf.currency = cli.currency; if (cli.currency) conf.currency = cli.currency;
if (cli.server.port) conf.port = cli.server.port; if (cli.server.port) conf.port = cli.server.port;
if (cli.cpu) conf.cpu = Math.max(0.01, Math.min(1.0, cli.cpu)); if (cli.cpu) conf.cpu = Math.max(0.01, Math.min(1.0, cli.cpu));
if (cli.nbCores) conf.nbCores = Math.max(1, Math.min(ProverConstants.CORES_MAXIMUM_USE_IN_PARALLEL, cli.nbCores));
if (cli.prefix) conf.prefix = Math.max(ProverConstants.MIN_PEER_ID, Math.min(ProverConstants.MAX_PEER_ID, cli.prefix)); if (cli.prefix) conf.prefix = Math.max(ProverConstants.MIN_PEER_ID, Math.min(ProverConstants.MAX_PEER_ID, cli.prefix));
if (cli.logs.http) conf.httplogs = true; if (cli.logs.http) conf.httplogs = true;
if (cli.logs.nohttp) conf.httplogs = false; if (cli.logs.nohttp) conf.httplogs = false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment