respond to review comments

signalapp · May 13, 2021 · 44184fd · 44184fd
1 parent f856d2c
commit 44184fd
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/rust/bridge/shared/src/ffi/storage.rs b/rust/bridge/shared/src/ffi/storage.rs
@@ -80,7 +80,7 @@ impl IdentityKeyStore for &FfiIdentityKeyStoreStruct {
     async fn get_local_registration_id(
         &self,
         ctx: Context,
-    ) -> Result<SessionSeed, SignalProtocolError> {
+    ) -> Result<RegistrationId, SignalProtocolError> {
         let ctx = ctx.unwrap_or(std::ptr::null_mut());
         let mut id = 0;
         let result = (self.get_local_registration_id)(self.ctx, &mut id, ctx);

diff --git a/rust/bridge/shared/src/jni/storage.rs b/rust/bridge/shared/src/jni/storage.rs
@@ -183,7 +183,7 @@ impl<'a> IdentityKeyStore for JniIdentityKeyStore<'a> {
     async fn get_local_registration_id(
         &self,
         _ctx: Context,
-    ) -> Result<SessionSeed, SignalProtocolError> {
+    ) -> Result<RegistrationId, SignalProtocolError> {
         Ok(self.do_get_local_registration_id()?.into())
     }
 

diff --git a/rust/bridge/shared/src/node/storage.rs b/rust/bridge/shared/src/node/storage.rs
@@ -516,7 +516,7 @@ impl IdentityKeyStore for NodeIdentityKeyStore {
     async fn get_local_registration_id(
         &self,
         _ctx: libsignal_protocol::Context,
-    ) -> Result<SessionSeed, SignalProtocolError> {
+    ) -> Result<RegistrationId, SignalProtocolError> {
         Ok(self
             .do_get_local_registration_id()
             .await

diff --git a/rust/protocol/src/group_cipher.rs b/rust/protocol/src/group_cipher.rs
@@ -145,7 +145,7 @@ pub async fn process_sender_key_distribution_message(
         .unwrap_or_else(SenderKeyRecord::new_empty);
 
     sender_key_record.add_sender_key_state(
-        skdm.message_version(),
+        skdm.message_version().into(),
         skdm.chain_id()?,
         skdm.iteration()?,
         skdm.chain_key()?,

diff --git a/rust/protocol/src/lib.rs b/rust/protocol/src/lib.rs
@@ -64,6 +64,6 @@ pub use {
     storage::{
         Context, Direction, IdentityKeyStore, InMemIdentityKeyStore, InMemPreKeyStore,
         InMemSenderKeyStore, InMemSessionStore, InMemSignalProtocolStore, InMemSignedPreKeyStore,
-        PreKeyStore, ProtocolStore, SenderKeyStore, SessionSeed, SessionStore, SignedPreKeyStore,
+        PreKeyStore, ProtocolStore, SenderKeyStore, RegistrationId, SessionStore, SignedPreKeyStore,
     },
 };
diff --git a/rust/protocol/src/storage.rs b/rust/protocol/src/storage.rs
@@ -13,6 +13,6 @@ pub use {
     },
     traits::{
         Context, Direction, IdentityKeyStore, PreKeyStore, ProtocolStore, SenderKeyStore,
-        SessionSeed, SessionStore, SignedPreKeyStore,
+        RegistrationId, SessionStore, SignedPreKeyStore,
     },
 };
diff --git a/rust/protocol/src/storage/inmem.rs b/rust/protocol/src/storage/inmem.rs
@@ -5,7 +5,7 @@
 
 use crate::{
     IdentityKey, IdentityKeyPair, PreKeyId, PreKeyRecord, ProtocolAddress, Result, SenderKeyRecord,
-    SessionRecord, SessionSeed, SignalProtocolError, SignedPreKeyId, SignedPreKeyRecord,
+    SessionRecord, RegistrationId, SignalProtocolError, SignedPreKeyId, SignedPreKeyRecord,
 };
 
 use crate::storage::traits;
@@ -19,12 +19,12 @@ use uuid::Uuid;
 #[derive(Clone)]
 pub struct InMemIdentityKeyStore {
     key_pair: IdentityKeyPair,
-    id: SessionSeed,
+    id: RegistrationId,
     known_keys: HashMap<ProtocolAddress, IdentityKey>,
 }
 
 impl InMemIdentityKeyStore {
-    pub fn new(key_pair: IdentityKeyPair, id: SessionSeed) -> Self {
+    pub fn new(key_pair: IdentityKeyPair, id: RegistrationId) -> Self {
         Self {
             key_pair,
             id,
@@ -39,7 +39,7 @@ impl traits::IdentityKeyStore for InMemIdentityKeyStore {
         Ok(self.key_pair)
     }
 
-    async fn get_local_registration_id(&self, _ctx: Context) -> Result<SessionSeed> {
+    async fn get_local_registration_id(&self, _ctx: Context) -> Result<RegistrationId> {
         Ok(self.id)
     }
 
@@ -286,7 +286,7 @@ pub struct InMemSignalProtocolStore {
 }
 
 impl InMemSignalProtocolStore {
-    pub fn new(key_pair: IdentityKeyPair, registration_id: SessionSeed) -> Result<Self> {
+    pub fn new(key_pair: IdentityKeyPair, registration_id: RegistrationId) -> Result<Self> {
         Ok(Self {
             session_store: InMemSessionStore::new(),
             pre_key_store: InMemPreKeyStore::new(),
@@ -303,7 +303,7 @@ impl traits::IdentityKeyStore for InMemSignalProtocolStore {
         self.identity_store.get_identity_key_pair(ctx).await
     }
 
-    async fn get_local_registration_id(&self, ctx: Context) -> Result<SessionSeed> {
+    async fn get_local_registration_id(&self, ctx: Context) -> Result<RegistrationId> {
         self.identity_store.get_local_registration_id(ctx).await
     }
 

diff --git a/rust/protocol/src/storage/traits.rs b/rust/protocol/src/storage/traits.rs
@@ -22,16 +22,16 @@ pub enum Direction {
 
 /// A locally-generated random number used to construct the initial value of a message chain.
 #[derive(Copy, Clone, Debug, Hash, Eq, PartialEq, PartialOrd, Ord)]
-pub struct SessionSeed(u32);
+pub struct RegistrationId(u32);
 
-impl From<u32> for SessionSeed {
+impl From<u32> for RegistrationId {
     fn from(value: u32) -> Self {
         Self(value)
     }
 }
 
-impl From<SessionSeed> for u32 {
-    fn from(value: SessionSeed) -> Self {
+impl From<RegistrationId> for u32 {
+    fn from(value: RegistrationId) -> Self {
         value.0
     }
 }
@@ -40,7 +40,7 @@ impl From<SessionSeed> for u32 {
 pub trait IdentityKeyStore {
     async fn get_identity_key_pair(&self, ctx: Context) -> Result<IdentityKeyPair>;
 
-    async fn get_local_registration_id(&self, ctx: Context) -> Result<SessionSeed>;
+    async fn get_local_registration_id(&self, ctx: Context) -> Result<RegistrationId>;
 
     async fn save_identity(
         &mut self,