Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Dunitrust
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
nodes
rust
Dunitrust
Merge requests
!245
check sig of block & tx only for dubp version >= 12
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
check sig of block & tx only for dubp version >= 12
elois/block_version
into
dev
Overview
0
Commits
4
Pipelines
0
Changes
29
Merged
Éloïs
requested to merge
elois/block_version
into
dev
5 years ago
Overview
0
Commits
4
Pipelines
0
Changes
29
Expand
1
0
Merge request reports
Compare
dev
dev (base)
and
latest version
latest version
9a29f583
4 commits,
5 years ago
29 files
+
71
−
65
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
29
Search (e.g. *.vue) (Ctrl+P)
lib/core/conf/src/lib.rs
+
2
−
2
Options
@@ -504,7 +504,7 @@ pub fn get_profile_path(profiles_path: &Option<PathBuf>, profile_name: &str) ->
/// Get keypairs file path
pub
fn
keypairs_filepath
(
profiles_path
:
&
Option
<
PathBuf
>
,
profile
:
&
str
)
->
PathBuf
{
let
profile_path
=
get_profile_path
(
profiles_path
,
profile
);
let
mut
conf_keys_path
=
profile_path
.clone
()
;
let
mut
conf_keys_path
=
profile_path
;
conf_keys_path
.push
(
constants
::
KEYPAIRS_FILENAME
);
conf_keys_path
}
@@ -515,7 +515,7 @@ pub fn load_conf(
keypairs_file_path
:
&
Option
<
PathBuf
>
,
)
->
Result
<
(
DuRsConf
,
DuniterKeyPairs
),
DursConfFileError
>
{
// Load conf
let
(
conf
,
keypairs
)
=
load_conf_at_path
(
profile_path
.clone
()
,
keypairs_file_path
)
?
;
let
(
conf
,
keypairs
)
=
load_conf_at_path
(
profile_path
,
keypairs_file_path
)
?
;
// Return conf and keypairs
Ok
((
conf
,
keypairs
))
Loading