Refactor/typestate connections

aries_vcx/src/handlers/connection/mediated_connection.rs

@@ -245,7 +245,7 @@ impl MediatedConnection {
         }
     }
 
-    pub fn get_remote_protocols(&self) -> Option<Vec<ProtocolDescriptor>> {
+    pub fn get_remote_protocols(&self) -> Option<&[ProtocolDescriptor]> {
         match &self.connection_sm {
             SmConnection::Inviter(sm_inviter) => sm_inviter.get_remote_protocols(),
             SmConnection::Invitee(sm_invitee) => sm_invitee.get_remote_protocols(),
@@ -898,7 +898,7 @@ impl MediatedConnection {
                 recipient_keys: did_doc.recipient_keys()?,
                 routing_keys: did_doc.routing_keys(),
                 service_endpoint: did_doc.get_endpoint(),
-                protocols: self.get_remote_protocols(),
+                protocols: self.get_remote_protocols().map(ToOwned::to_owned),
             }),
             None => None,
         };

aries_vcx/src/protocols/connection/invitee/mod.rs

@@ -1,2 +1,2 @@
 pub mod state_machine;
-mod states;
+pub mod states;

aries_vcx/src/protocols/connection/invitee/state_machine.rs

@@ -72,7 +72,7 @@ impl SmConnectionInvitee {
         SmConnectionInvitee {
             source_id: source_id.to_string(),
             thread_id: String::new(),
-            state: InviteeFullState::Initial(InitialState::new(None, Some(did_doc))),
+            state: InviteeFullState::Initial(InitialState::new(None, did_doc)),
             pairwise_info,
         }
     }
@@ -112,7 +112,7 @@ impl SmConnectionInvitee {
 
     pub fn their_did_doc(&self) -> Option<AriesDidDoc> {
         match self.state {
-            InviteeFullState::Initial(ref state) => state.did_doc.clone(),
+            InviteeFullState::Initial(ref state) => Some(state.did_doc.clone()),
             InviteeFullState::Invited(ref state) => Some(state.did_doc.clone()),
             InviteeFullState::Requested(ref state) => Some(state.did_doc.clone()),
             InviteeFullState::Responded(ref state) => Some(state.did_doc.clone()),
@@ -122,7 +122,7 @@ impl SmConnectionInvitee {
 
     pub async fn bootstrap_did_doc(&self) -> Option<AriesDidDoc> {
         match self.state {
-            InviteeFullState::Initial(ref state) => state.did_doc.clone(),
+            InviteeFullState::Initial(ref state) => Some(state.did_doc.clone()),
             InviteeFullState::Invited(ref state) => Some(state.did_doc.clone()),
             InviteeFullState::Requested(ref state) => Some(state.did_doc.clone()),
             InviteeFullState::Responded(ref state) => Some(state.did_doc.clone()),
@@ -150,9 +150,9 @@ impl SmConnectionInvitee {
         ProtocolRegistry::init().protocols()
     }
 
-    pub fn get_remote_protocols(&self) -> Option<Vec<ProtocolDescriptor>> {
+    pub fn get_remote_protocols(&self) -> Option<&[ProtocolDescriptor]> {
         match self.state {
-            InviteeFullState::Completed(ref state) => state.protocols.clone(),
+            InviteeFullState::Completed(ref state) => state.remote_protocols(),
             _ => None,
         }
     }
@@ -242,17 +242,9 @@ impl SmConnectionInvitee {
         let Self { state, .. } = self;
         let thread_id = invitation.get_id()?;
         let state = match state {
-            InviteeFullState::Initial(state) => InviteeFullState::Invited(
-                (
-                    state.clone(),
-                    invitation,
-                    state.did_doc.ok_or(AriesVcxError::from_msg(
-                        AriesVcxErrorKind::InvalidState,
-                        "Expected none None state.did_doc result given current state",
-                    ))?,
-                )
-                    .into(),
-            ),
+            InviteeFullState::Initial(state) => {
+                InviteeFullState::Invited((state.clone(), invitation, state.did_doc).into())
+            }
             s => {
                 return Err(AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidState,
@@ -373,8 +365,8 @@ impl SmConnectionInvitee {
 
     pub fn handle_problem_report(self, _problem_report: ProblemReport) -> VcxResult<Self> {
         let state = match self.state {
-            InviteeFullState::Requested(_state) => InviteeFullState::Initial(InitialState::new(None, None)),
-            InviteeFullState::Invited(_state) => InviteeFullState::Initial(InitialState::new(None, None)),
+            InviteeFullState::Requested(_state) => InviteeFullState::Initial(InitialState::new(None, _state.did_doc)),
+            InviteeFullState::Invited(_state) => InviteeFullState::Initial(InitialState::new(None, _state.did_doc)),
             _ => self.state.clone(),
         };
         Ok(Self { state, ..self })

aries_vcx/src/protocols/connection/invitee/states/complete.rs

@@ -4,7 +4,7 @@ use crate::protocols::connection::invitee::states::requested::RequestedState;
 use crate::protocols::connection::invitee::states::responded::RespondedState;
 use messages::diddoc::aries::diddoc::AriesDidDoc;
 use messages::protocols::connection::response::Response;
-use messages::protocols::discovery::disclose::ProtocolDescriptor;
+use messages::protocols::discovery::disclose::{ProtocolDescriptor, Disclose};
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct CompleteState {
@@ -13,6 +13,16 @@ pub struct CompleteState {
     pub protocols: Option<Vec<ProtocolDescriptor>>,
 }
 
+impl CompleteState {
+   pub fn remote_protocols(&self) -> Option<&[ProtocolDescriptor]> {
+        self.protocols.as_deref()
+    }
+
+    pub fn handle_disclose(&mut self, disclose: Disclose) {
+        self.protocols = Some(disclose.protocols)
+    }
+}
+
 impl From<(CompleteState, Vec<ProtocolDescriptor>)> for CompleteState {
     fn from((state, protocols): (CompleteState, Vec<ProtocolDescriptor>)) -> CompleteState {
         trace!("ConnectionInvitee: transit state from CompleteState to CompleteState");

aries_vcx/src/protocols/connection/invitee/states/initial.rs

@@ -5,8 +5,8 @@ use messages::protocols::connection::problem_report::ProblemReport;
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct InitialState {
-    problem_report: Option<ProblemReport>,
-    pub did_doc: Option<AriesDidDoc>,
+    pub problem_report: Option<ProblemReport>,
+    pub did_doc: AriesDidDoc,
 }
 
 impl From<(InitialState, Invitation, AriesDidDoc)> for InvitedState {
@@ -17,7 +17,7 @@ impl From<(InitialState, Invitation, AriesDidDoc)> for InvitedState {
 }
 
 impl InitialState {
-    pub fn new(problem_report: Option<ProblemReport>, did_doc: Option<AriesDidDoc>) -> Self {
+    pub fn new(problem_report: Option<ProblemReport>, did_doc: AriesDidDoc) -> Self {
         InitialState {
             problem_report,
             did_doc,

aries_vcx/src/protocols/connection/invitee/states/mod.rs

@@ -1,5 +1,5 @@
-pub(super) mod complete;
-pub(super) mod initial;
-pub(super) mod invited;
-pub(super) mod requested;
-pub(super) mod responded;
+pub mod complete;
+pub mod initial;
+pub mod invited;
+pub mod requested;
+pub mod responded;

aries_vcx/src/protocols/connection/invitee/states/requested.rs

@@ -17,7 +17,7 @@ impl From<(RequestedState, ProblemReport)> for InitialState {
             "ConnectionInvitee: transit state from RequestedState to InitialState, problem_report: {:?}",
             problem_report
         );
-        InitialState::new(Some(problem_report), None)
+        InitialState::new(Some(problem_report), _state.did_doc)
     }
 }
 

aries_vcx/src/protocols/connection/invitee/states/responded.rs

@@ -17,6 +17,6 @@ impl From<(RespondedState, ProblemReport)> for InitialState {
             "ConnectionInvitee: transit state from RespondedState to InitialState, problem_report: {:?}",
             problem_report
         );
-        InitialState::new(Some(problem_report), None)
+        InitialState::new(Some(problem_report), _state.did_doc)
     }
 }

aries_vcx/src/protocols/connection/inviter/state_machine.rs

@@ -132,9 +132,9 @@ impl SmConnectionInviter {
         ProtocolRegistry::init().protocols()
     }
 
-    pub fn get_remote_protocols(&self) -> Option<Vec<ProtocolDescriptor>> {
+    pub fn get_remote_protocols(&self) -> Option<&[ProtocolDescriptor]> {
         match self.state {
-            InviterFullState::Completed(ref state) => state.protocols.clone(),
+            InviterFullState::Completed(ref state) => state.remote_protocols(),
             _ => None,
         }
     }

aries_vcx/src/protocols/connection/inviter/states/complete.rs

@@ -1,7 +1,7 @@
 use std::clone::Clone;
 
 use messages::diddoc::aries::diddoc::AriesDidDoc;
-use messages::protocols::discovery::disclose::ProtocolDescriptor;
+use messages::protocols::discovery::disclose::{Disclose, ProtocolDescriptor};
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct CompleteState {
@@ -10,6 +10,16 @@ pub struct CompleteState {
     pub thread_id: Option<String>,
 }
 
+impl CompleteState {
+    pub fn remote_protocols(&self) -> Option<&[ProtocolDescriptor]> {
+        self.protocols.as_deref()
+    }
+
+    pub fn handle_disclose(&mut self, disclose: Disclose) {
+        self.protocols = Some(disclose.protocols)
+    }
+}
+
 impl From<(CompleteState, Vec<ProtocolDescriptor>)> for CompleteState {
     fn from((state, protocols): (CompleteState, Vec<ProtocolDescriptor>)) -> CompleteState {
         trace!("ConnectionInviter: transit state from CompleteState to CompleteState");

aries_vcx/src/protocols/connection/inviter/states/invited.rs

@@ -30,4 +30,4 @@ impl From<(Request, SignedResponse)> for RequestedState {
             thread_id: request.id.0,
         }
     }
-}
+}

aries_vcx/src/protocols/mod.rs

@@ -11,6 +11,7 @@ pub mod oob;
 pub mod proof_presentation;
 pub mod revocation_notification;
 pub mod trustping;
+pub mod typestate_con;
 
 pub type SendClosure = Box<dyn FnOnce(A2AMessage) -> BoxFuture<'static, VcxResult<()>> + Send + Sync>;
 pub type SendClosureConnection =

aries_vcx/src/protocols/typestate_con/common/mod.rs

@@ -0,0 +1 @@
+pub mod states;

aries_vcx/src/protocols/typestate_con/common/states/complete.rs

@@ -0,0 +1,37 @@
+use std::clone::Clone;
+
+use messages::diddoc::aries::diddoc::AriesDidDoc;
+use messages::protocols::discovery::disclose::{Disclose, ProtocolDescriptor};
+
+use crate::protocols::typestate_con::trait_bounds::TheirDidDoc;
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub struct CompleteState {
+    pub did_doc: AriesDidDoc,
+    pub thread_id: String,
+    pub protocols: Option<Vec<ProtocolDescriptor>>,
+}
+
+impl CompleteState {
+    pub fn new(did_doc: AriesDidDoc, thread_id: String, protocols: Option<Vec<ProtocolDescriptor>>) -> Self {
+        Self {
+            did_doc,
+            thread_id,
+            protocols,
+        }
+    }
+
+    pub fn remote_protocols(&self) -> Option<&[ProtocolDescriptor]> {
+        self.protocols.as_deref()
+    }
+
+    pub fn handle_disclose(&mut self, disclose: Disclose) {
+        self.protocols = Some(disclose.protocols)
+    }
+}
+
+impl TheirDidDoc for CompleteState {
+    fn their_did_doc(&self) -> &AriesDidDoc {
+        &self.did_doc
+    }
+}

aries_vcx/src/protocols/typestate_con/common/states/mod.rs

@@ -0,0 +1,2 @@
+pub mod complete;
+pub mod responded;

aries_vcx/src/protocols/typestate_con/common/states/responded.rs

@@ -0,0 +1,21 @@
+use messages::diddoc::aries::diddoc::AriesDidDoc;
+
+use crate::protocols::typestate_con::trait_bounds::TheirDidDoc;
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub struct RespondedState {
+    pub did_doc: AriesDidDoc,
+    pub thread_id: String
+}
+
+impl RespondedState {
+    pub fn new(did_doc: AriesDidDoc, thread_id: String) -> Self {
+        Self { did_doc, thread_id }
+    }
+}
+
+impl TheirDidDoc for RespondedState {
+    fn their_did_doc(&self) -> &AriesDidDoc {
+        &self.did_doc
+    }
+}

aries_vcx/src/protocols/typestate_con/initiation_type.rs

@@ -0,0 +1,6 @@
+
+/// Unit struct illustrating that the connection was initiated by an inviter.
+pub struct Inviter;
+
+/// Unit struct illustrating that the connection was initiated by an invitee.
+pub struct Invitee;