Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
duniter
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pascal Engélibert
duniter
Commits
559f524c
Commit
559f524c
authored
7 years ago
by
Vincent Rousseau
Browse files
Options
Downloads
Patches
Plain Diff
Small fixes
#1215
parent
ec72c417
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/modules/prover/lib/proof.ts
+1
-1
1 addition, 1 deletion
app/modules/prover/lib/proof.ts
app/modules/ws2p/index.ts
+2
-2
2 additions, 2 deletions
app/modules/ws2p/index.ts
index.ts
+1
-0
1 addition, 0 deletions
index.ts
with
4 additions
and
3 deletions
app/modules/prover/lib/proof.ts
+
1
−
1
View file @
559f524c
...
@@ -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. T
t
he 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
);
}
}
...
...
This diff is collapsed.
Click to expand it.
app/modules/ws2p/index.ts
+
2
−
2
View file @
559f524c
...
@@ -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
:
'
Por
t to listen to.
'
},
{
value
:
'
--ws2p-host <host>
'
,
desc
:
'
Hos
t to listen to.
'
},
{
value
:
'
--ws2p-port <port>
'
,
desc
:
'
Hos
t to listen to.
'
,
parser
:
(
val
:
string
)
=>
parseInt
(
val
)
},
{
value
:
'
--ws2p-port <port>
'
,
desc
:
'
Por
t 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.
'
},
...
...
This diff is collapsed.
Click to expand it.
index.ts
+
1
−
0
View file @
559f524c
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment