grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix warnings: unused

Browse Source
This commit is contained in:
adria0
2020-07-29 10:57:15 +02:00
committed by Artem Vorotnikov
parent 0cd972326c
commit cacbf256fe
23 changed files with 21 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
secret-store/src/key_server_cluster/admin_sessions/key_version_negotiation_session.rs
View File

@@ -767,7 +767,7 @@ mod tests {
ContinueAction, FailedContinueAction, FastestResultComputer, LargestSupportResultComputer,
SessionImpl, SessionParams, SessionResultComputer, SessionState, SessionTransport,
};
use ethereum_types::{Address, H160, H512};
use ethereum_types::{H160, H512};
use ethkey::public_to_address;
use key_server_cluster::{
admin_sessions::ShareChangeSessionMeta,

15
secret-store/src/key_server_cluster/cluster_sessions.rs
View File

@@ -556,19 +556,16 @@ impl ClusterSessionsContainerState {
pub fn on_session_starting(&mut self, is_exclusive_session: bool) -> Result<(), Error> {
match *self {
ClusterSessionsContainerState::Idle if is_exclusive_session => {
::std::mem::replace(self, ClusterSessionsContainerState::Exclusive);
*self = ClusterSessionsContainerState::Exclusive;
}
ClusterSessionsContainerState::Idle => {
::std::mem::replace(self, ClusterSessionsContainerState::Active(1));
*self = ClusterSessionsContainerState::Active(1);
}
ClusterSessionsContainerState::Active(_) if is_exclusive_session => {
return Err(Error::HasActiveSessions)
}
ClusterSessionsContainerState::Active(sessions_count) => {
::std::mem::replace(
self,
ClusterSessionsContainerState::Active(sessions_count + 1),
);
*self = ClusterSessionsContainerState::Active(sessions_count + 1);
}
ClusterSessionsContainerState::Exclusive => return Err(Error::ExclusiveSessionActive),
}
@@ -581,13 +578,13 @@ impl ClusterSessionsContainerState {
ClusterSessionsContainerState::Idle =>
unreachable!("idle means that there are no active sessions; on_session_completed is only called once after active session is completed; qed"),
ClusterSessionsContainerState::Active(sessions_count) if sessions_count == 1 => {
::std::mem::replace(self, ClusterSessionsContainerState::Idle);
*self = ClusterSessionsContainerState::Idle;
},
ClusterSessionsContainerState::Active(sessions_count) => {
::std::mem::replace(self, ClusterSessionsContainerState::Active(sessions_count - 1));
*self = ClusterSessionsContainerState::Active(sessions_count - 1);
}
ClusterSessionsContainerState::Exclusive => {
::std::mem::replace(self, ClusterSessionsContainerState::Idle);
*self = ClusterSessionsContainerState::Idle;
},
}
}