Refactored inner methods and simplified them

Signed-off-by: Bogdan Mircea <mirceapetrebogdan@gmail.com>

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

@@ -1,4 +1,3 @@
-use crate::errors::error::{AriesVcxError, AriesVcxErrorKind, VcxResult};
 use crate::protocols::connection::invitee::states::initial::InitialState;
 use crate::protocols::connection::invitee::states::responded::RespondedState;
 use messages::diddoc::aries::diddoc::AriesDidDoc;
@@ -12,32 +11,6 @@ pub struct RequestedState {
     pub did_doc: AriesDidDoc,
 }
 
-impl RequestedState {
-    /// Attempts to convert [`Self`] based on a [`Response`] into a [`RespondedState`].
-    ///
-    /// # Errors
-    /// An error is returned if the response has an unexpected thread ID.
-    pub fn try_into_responded(self, response: Response) -> VcxResult<RespondedState> {
-        if !response.from_thread(&self.request.get_thread_id()) {
-            let err_msg = format!(
-                "Cannot handle response: thread id does not match: {:?}",
-                response.thread
-            );
-
-            let err = AriesVcxError::from_msg(AriesVcxErrorKind::InvalidJson, err_msg);
-
-            Err(err)
-        } else {
-            let state = RespondedState {
-                response,
-                request: self.request,
-                did_doc: self.did_doc,
-            };
-            Ok(state)
-        }
-    }
-}
-
 impl From<(RequestedState, ProblemReport)> for InitialState {
     fn from((_state, problem_report): (RequestedState, ProblemReport)) -> InitialState {
         trace!(

aries_vcx/src/protocols/connection/mod.rs

@@ -1,4 +1,3 @@
-pub mod initiation_type;
 pub mod invitee;
 pub mod inviter;
 pub mod pairwise_info;

aries_vcx/src/protocols/mod.rs

@@ -11,7 +11,7 @@ pub mod oob;
 pub mod proof_presentation;
 pub mod revocation_notification;
 pub mod trustping;
-mod typestate_con;
+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/inviter/states/complete.rs → aries_vcx/src/protocols/typestate_con/common/states/complete.rs

@@ -3,14 +3,24 @@ 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>>,
-    pub thread_id: Option<String>,
 }
 
 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()
     }
@@ -20,13 +30,8 @@ impl CompleteState {
     }
 }
 
-impl From<(CompleteState, Vec<ProtocolDescriptor>)> for CompleteState {
-    fn from((state, protocols): (CompleteState, Vec<ProtocolDescriptor>)) -> CompleteState {
-        trace!("ConnectionInviter: transit state from CompleteState to CompleteState");
-        CompleteState {
-            did_doc: state.did_doc,
-            thread_id: state.thread_id,
-            protocols: Some(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
+    }
+}