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
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Monitor
Service Desk
Analyze
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
nodes
typescript
duniter
Merge requests
!1364
Bca
Code
Review changes
Check out branch
Download
Patches
Plain diff
Expand sidebar
Merged
Bca
bca
into
dev
Overview
0
Commits
10
Pipelines
0
Changes
18
Merged
Bca
Éloïs
requested to merge
bca
into
dev
Mar 20, 2021
Overview
0
Commits
10
Pipelines
0
Changes
18
0
0
Merge request reports
Compare
dev
version 1
a961b5d0
Mar 20, 2021
dev (base)
and
latest version
latest version
e25e393d
10 commits,
Mar 20, 2021
version 1
a961b5d0
9 commits,
Mar 20, 2021
18 files
+
1387
−
63
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
18
neon/native/src/server.rs
+
2
−
2
View file @ e25e393d
Edit in single-file editor
Open in Web IDE
Show full file
@@ -41,7 +41,7 @@ declare_types! {
let
gva_conf
=
rust_server_conf_stringified
.gva
;
let
currency
=
rust_server_conf_stringified
.currency
;
let
se
rver_pubkey
=
if
let
Some
(
self_keypair_str
)
=
rust_server_conf_stringified
.self_keypair
{
let
se
lf_key_pair
=
if
let
Some
(
self_keypair_str
)
=
rust_server_conf_stringified
.self_keypair
{
into_neon_res
(
&
mut
cx
,
crate
::
crypto
::
keypair_from_expanded_base58_secret_key
(
&
self_keypair_str
))
?
}
else
{
Ed25519KeyPair
::
generate_random
()
.expect
(
"fail to gen random keyypair"
)
@@ -49,7 +49,7 @@ declare_types! {
let
txs_mempool_size
=
rust_server_conf_stringified
.txs_mempool_size
as
usize
;
let
conf
=
DuniterConf
{
gva
:
gva_conf
,
self_key_pair
:
server_pubkey
,
self_key_pair
,
txs_mempool_size
};
Loading