Enclave avoid duplicated Leaders #1760
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
It is not tested still. I wanted to add some considerations here first. |
danielSanchezQ
commented
Feb 10, 2020
jormungandr/src/secure/enclave.rs
Outdated
| use std::sync::Arc; | ||
| use tokio02::sync::RwLock; | ||
|
|
||
| #[derive(Clone)] | ||
| pub struct Enclave { | ||
| leaders: Arc<RwLock<BTreeMap<LeaderId, Leader>>>, | ||
| added_cache: Arc<RwLock<HashMap<String, LeaderId>>>, |
There was a problem hiding this comment.
I used String but maybe we could use PublicKey instead, I wanted to go ahead and used the easy way first but if PublicKey is hashable should be fine also.
danielSanchezQ
commented
Feb 10, 2020
danielSanchezQ
commented
Feb 10, 2020
|
I added some tests to check that the method behaves as expected. |
|
I need to update the tests for the last commit |
NicolasDP
added
bug
NicolasDP
suggested changes
Feb 13, 2020
danielSanchezQ
commented
Feb 13, 2020
NicolasDP
suggested changes
Feb 21, 2020
jormungandr/Cargo.toml
Outdated
| @@ -41,6 +41,7 @@ network-core = { path = "../chain-deps/network-core" } | |||
| network-grpc = { path = "../chain-deps/network-grpc" } | |||
| poldercast = "0.11.2" | |||
| rand = "0.7" | |||
| rand_core = "0.5" | |||
There was a problem hiding this comment.
this is only used for the test, move this to the dev-dependency
jormungandr/Cargo.toml
Outdated
| [build-dependencies] | ||
| versionisator = "1.0.2" | ||
|
|
||
|
|
There was a problem hiding this comment.
non necessary trailing line
jormungandr/src/secure/enclave.rs
Outdated
Comment on lines
19
to
20
| // leaders: Arc<RwLock<BTreeMap<LeaderId, Leader>>>, | ||
| // added_leaders_cache: Arc<RwLock<HashMap<String, LeaderId>>>, |
There was a problem hiding this comment.
Yep, sorry for this.
added 10 commits
February 21, 2020 16:37
Added add different leaders test
danielSanchezQ
force-pushed
the
jcli_leader_registration_fix_#1498
branch
from
655c001
to
ec504fa
Compare
|
This should be ready now @NicolasDP , thanks! |
NicolasDP
approved these changes
Feb 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Should fix #1498