add subscribe flag to contract requests and responses

Author: netsirius

rust/src/client_api/client_events.rs

@@ -264,12 +264,14 @@ impl ClientRequest<'_> {
                         contract,
                         state,
                         related_contracts,
+                        subscribe,
                     } => {
                         let related_contracts = related_contracts.into_owned();
                         ContractRequest::Put {
                             contract,
                             state,
                             related_contracts,
+                            subscribe,
                         }
                     }
                     ContractRequest::Update { key, data } => {
@@ -279,9 +281,11 @@ impl ClientRequest<'_> {
                     ContractRequest::Get {
                         key,
                         return_contract_code,
+                        subscribe,
                     } => ContractRequest::Get {
                         key,
                         return_contract_code,
+                        subscribe,
                     },
                     ContractRequest::Subscribe { key, summary } => ContractRequest::Subscribe {
                         key,
@@ -357,6 +361,8 @@ pub enum ContractRequest<'a> {
         /// Related contracts.
         #[serde(borrow)]
         related_contracts: RelatedContracts<'a>,
+        /// If this flag is set then subscribe to updates for this contract.
+        subscribe: bool,
     },
     /// Update an existing contract corresponding with the provided key.
     Update {
@@ -370,6 +376,8 @@ pub enum ContractRequest<'a> {
         key: ContractKey,
         /// If this flag is set then fetch also the contract itself.
         return_contract_code: bool,
+        /// If this flag is set then subscribe to updates for this contract.
+        subscribe: bool,
     },
     /// Subscribe to the changes in a given contract. Implicitly starts a get operation
     /// if the contract is not present yet.
@@ -386,10 +394,12 @@ impl ContractRequest<'_> {
                 contract,
                 state,
                 related_contracts,
+                subscribe,
             } => ContractRequest::Put {
                 contract,
                 state,
                 related_contracts: related_contracts.into_owned(),
+                subscribe,
             },
             Self::Update { key, data } => ContractRequest::Update {
                 key,
@@ -398,9 +408,11 @@ impl ContractRequest<'_> {
             Self::Get {
                 key,
                 return_contract_code: fetch_contract,
+                subscribe,
             } => ContractRequest::Get {
                 key,
                 return_contract_code: fetch_contract,
+                subscribe,
             },
             Self::Subscribe { key, summary } => ContractRequest::Subscribe {
                 key,
@@ -425,9 +437,11 @@ impl<'a> TryFromFbs<&FbsContractRequest<'a>> for ContractRequest<'a> {
                     let get = request.contract_request_as_get().unwrap();
                     let key = ContractKey::try_decode_fbs(&get.key())?;
                     let fetch_contract = get.fetch_contract();
+                    let subscribe = get.subscribe();
                     ContractRequest::Get {
                         key,
                         return_contract_code: fetch_contract,
+                        subscribe,
                     }
                 }
                 ContractRequestType::Put => {
@@ -436,10 +450,12 @@ impl<'a> TryFromFbs<&FbsContractRequest<'a>> for ContractRequest<'a> {
                     let state = WrappedState::new(put.wrapped_state().bytes().to_vec());
                     let related_contracts =
                         RelatedContracts::try_decode_fbs(&put.related_contracts())?.into_owned();
+                    let subscribe = put.subscribe();
                     ContractRequest::Put {
                         contract,
                         state,
                         related_contracts,
+                        subscribe,
                     }
                 }
                 ContractRequestType::Update => {
@@ -1431,13 +1447,15 @@ mod client_request_test {
                 contract,
                 state,
                 related_contracts: _,
+                subscribe,
             } => {
                 assert_eq!(
                     contract.to_string(),
                     "WasmContainer([api=0.0.1](D8fdVLbRyMLw5mZtPRpWMFcrXGN2z8Nq8UGcLGPFBg2W))"
                 );
                 assert_eq!(contract.unwrap_v1().data.data(), &[1, 2, 3, 4, 5, 6, 7, 8]);
                 assert_eq!(state.to_vec(), &[1, 2, 3, 4, 5, 6, 7, 8]);
+                assert_eq!(subscribe, false);
             }
             _ => panic!("wrong contract request type"),
         }
@@ -1465,9 +1483,11 @@ mod client_request_test {
             ContractRequest::Get {
                 key,
                 return_contract_code: fetch_contract,
+                subscribe,
             } => {
                 assert_eq!(key.encoded_contract_id(), EXPECTED_ENCODED_CONTRACT_ID);
                 assert!(!fetch_contract);
+                assert_eq!(subscribe, false);
             }
             _ => panic!("wrong contract request type"),
         }