Rename to DirectV1

core/conversations/src/conversation.rs

@@ -1,16 +1,16 @@
+mod direct_v1;
 pub mod group_v1;
 mod group_v2;
 mod privatev1;
-mod privatev2;
 
 pub use crate::errors::ChatError;
 use crate::outcomes::ConvoOutcome;
 use crate::proto::EncryptedPayload;
 use crate::service_context::{ExternalServices, ServiceContext};
+pub use direct_v1::DirectV1Convo;
 pub use group_v1::GroupV1Convo;
 pub use group_v2::GroupV2Convo;
 pub use privatev1::PrivateV1Convo;
-pub use privatev2::PrivateV2Convo;
 use shared_traits::IdentIdRef;
 
 pub type ConversationId = String;

core/conversations/src/conversation/direct_v1.rs

@@ -10,11 +10,11 @@ use crate::{
 type DelegateGroup = GroupV1Convo;
 
 #[derive(Debug)]
-pub struct PrivateV2Convo {
+pub struct DirectV1Convo {
     inner_group: DelegateGroup,
 }
 
-impl PrivateV2Convo {
+impl DirectV1Convo {
     pub fn new<S: ExternalServices>(
         cx: &mut ServiceContext<S>,
         participant: IdentIdRef,
@@ -25,13 +25,13 @@ impl PrivateV2Convo {
     }
 }
 
-impl Identified for PrivateV2Convo {
+impl Identified for DirectV1Convo {
     fn id(&self) -> ConversationIdRef<'_> {
         self.inner_group.id()
     }
 }
 
-impl<S> Convo<S> for PrivateV2Convo
+impl<S> Convo<S> for DirectV1Convo
 where
     S: ExternalServices,
 {

core/conversations/src/core.rs

@@ -1,6 +1,6 @@
 use crate::causal_history::{CausalHistoryStore, MissingMessage};
 use crate::conversation::{
-    ConversationIdRef, GroupV1Convo, GroupV2Convo, Identified, PrivateV1Convo, PrivateV2Convo,
+    ConversationIdRef, DirectV1Convo, GroupV1Convo, GroupV2Convo, Identified, PrivateV1Convo,
 };
 use crate::service_context::{ExternalServices, ServiceContext};
 use crate::{DeliveryService, IdentityProvider, RegistrationService, WakeupService};
@@ -213,11 +213,11 @@ impl<'a, S: ExternalServices + 'static> Core<S> {
         Ok(convo_id)
     }
 
-    pub fn create_private_convo_v2(
+    pub fn create_direct_convo_v1(
         &mut self,
         pariticpant: IdentIdRef,
     ) -> Result<ConversationId, ChatError> {
-        let convo = PrivateV2Convo::new(&mut self.services, pariticpant)?;
+        let convo = DirectV1Convo::new(&mut self.services, pariticpant)?;
         let convo_id = convo.id().to_string();
         self.register_convo(ConvoTypeOwned::Pairwise(Box::new(convo)))?;
 

core/integration_tests_core/tests/test_direct_v1.rs

@@ -18,7 +18,7 @@ fn happypath_roundtrip() {
     let particpants = harness.raya().addr();
     let convo_id = harness
         .saro()
-        .create_private_convo_v2(&particpants)
+        .create_direct_convo_v1(&particpants)
         .expect("saro create group");
 
     // Carry the invite through (commit, WelcomeReady, routing to Raya's inbox,