Payments API renaming

Signed-off-by: artem.ivanov <[email protected]>

Author: Artemkaaas

libindy/src/api/payments.rs

@@ -107,8 +107,8 @@ pub type BuildGetSourcesRequestCB = extern fn(command_handle: i32,
                                               submitter_did: *const c_char,
                                               payment_address: *const c_char,
                                               cb: Option<extern fn(command_handle_: i32,
-                                                                err: ErrorCode,
-                                                                get_sources_txn_json: *const c_char) -> ErrorCode>) -> ErrorCode;
+                                                                   err: ErrorCode,
+                                                                   get_sources_txn_json: *const c_char) -> ErrorCode>) -> ErrorCode;
 
 /// Parses response for Indy request for getting sources list.
 ///
@@ -468,7 +468,7 @@ pub extern fn indy_list_payment_addresses(command_handle: i32,
 ///
 /// Note this endpoint is EXPERIMENTAL. Function signature and behaviour may change
 /// in the future releases.
-/// 
+///
 /// #Params
 /// wallet_handle: wallet handle
 /// submitter_did : DID of request sender
@@ -544,7 +544,7 @@ pub extern fn indy_add_request_fees(command_handle: i32,
 ///
 /// Note this endpoint is EXPERIMENTAL. Function signature and behaviour may change
 /// in the future releases.
-/// 
+///
 /// #Returns
 /// receipts_json - parsed (payment method and node version agnostic) receipts info as json:
 ///   [{
@@ -601,13 +601,13 @@ pub extern fn indy_parse_response_with_fees(command_handle: i32,
 /// payment_method
 #[no_mangle]
 pub extern fn indy_build_get_sources_request(command_handle: i32,
-                                          wallet_handle: i32,
-                                          submitter_did: *const c_char,
-                                          payment_address: *const c_char,
-                                          cb: Option<extern fn(command_handle_: i32,
-                                                               err: ErrorCode,
-                                                               get_sources_txn_json: *const c_char,
-                                                               payment_method: *const c_char)>) -> ErrorCode {
+                                             wallet_handle: i32,
+                                             submitter_did: *const c_char,
+                                             payment_address: *const c_char,
+                                             cb: Option<extern fn(command_handle_: i32,
+                                                                  err: ErrorCode,
+                                                                  get_sources_txn_json: *const c_char,
+                                                                  payment_method: *const c_char)>) -> ErrorCode {
     trace!("indy_build_get_sources_request: >>> wallet_handle: {:?}, submitter_did: {:?}, payment_address: {:?}", wallet_handle, submitter_did, payment_address);
     check_useful_c_str!(submitter_did, ErrorCode::CommonInvalidParam3);
     check_useful_c_str!(payment_address, ErrorCode::CommonInvalidParam4);
@@ -660,8 +660,8 @@ pub extern fn indy_parse_get_sources_response(command_handle: i32,
                                               payment_method: *const c_char,
                                               resp_json: *const c_char,
                                               cb: Option<extern fn(command_handle_: i32,
-                                                                err: ErrorCode,
-                                                                sources_json: *const c_char)>) -> ErrorCode {
+                                                                   err: ErrorCode,
+                                                                   sources_json: *const c_char)>) -> ErrorCode {
     trace!("indy_parse_get_sources_response: >>> payment_method: {:?}, resp_json: {:?}", payment_method, resp_json);
     check_useful_c_str!(payment_method, ErrorCode::CommonInvalidParam2);
     check_useful_c_str!(resp_json, ErrorCode::CommonInvalidParam3);

libindy/src/services/payments.rs

@@ -20,8 +20,8 @@ pub struct PaymentsMethod {
     create_address: CreatePaymentAddressCB,
     add_request_fees: AddRequestFeesCB,
     parse_response_with_fees: ParseResponseWithFeesCB,
-    build_get_utxo_request: BuildGetSourcesRequestCB,
-    parse_get_utxo_response: ParseGetSourcesResponseCB,
+    build_get_utxo_request: BuildGetUTXORequestCB,
+    parse_get_utxo_response: ParseGetUTXOResponseCB,
     build_payment_req: BuildPaymentReqCB,
     parse_payment_response: ParsePaymentResponseCB,
     build_mint_req: BuildMintReqCB,
@@ -36,8 +36,8 @@ impl PaymentsMethodCBs {
     pub fn new(create_address: CreatePaymentAddressCB,
                add_request_fees: AddRequestFeesCB,
                parse_response_with_fees: ParseResponseWithFeesCB,
-               build_get_utxo_request: BuildGetSourcesRequestCB,
-               parse_get_utxo_response: ParseGetSourcesResponseCB,
+               build_get_utxo_request: BuildGetUTXORequestCB,
+               parse_get_utxo_response: ParseGetUTXOResponseCB,
                build_payment_req: BuildPaymentReqCB,
                parse_payment_response: ParsePaymentResponseCB,
                build_mint_req: BuildMintReqCB,
@@ -128,7 +128,7 @@ impl PaymentsService {
 
     pub fn build_get_utxo_request(&self, cmd_handle: i32, type_: &str, wallet_handle: i32, submitter_did: &str, address: &str) -> Result<(), PaymentsError> {
         trace!("build_get_utxo_request >>> type_: {:?}, wallet_handle: {:?}, submitter_did: {:?}, address: {:?}", type_, wallet_handle, submitter_did, address);
-        let build_get_utxo_request: BuildGetSourcesRequestCB = self.methods.borrow().get(type_)
+        let build_get_utxo_request: BuildGetUTXORequestCB = self.methods.borrow().get(type_)
             .ok_or(PaymentsError::UnknownType(format!("Unknown payment method {}", type_)))?.build_get_utxo_request;
 
         let submitter_did = CString::new(submitter_did)?;
@@ -145,7 +145,7 @@ impl PaymentsService {
 
     pub fn parse_get_utxo_response(&self, cmd_handle: i32, type_: &str, response: &str) -> Result<(), PaymentsError> {
         trace!("parse_get_utxo_response >>> type_: {:?}, response: {:?}", type_, response);
-        let parse_get_utxo_response: ParseGetSourcesResponseCB = self.methods.borrow().get(type_)
+        let parse_get_utxo_response: ParseGetUTXOResponseCB = self.methods.borrow().get(type_)
             .ok_or(PaymentsError::UnknownType(format!("Unknown payment method {}", type_)))?.parse_get_utxo_response;
 
         let response = CString::new(response)?;

libindy/tests/utils/payments.rs

@@ -141,8 +141,8 @@ pub fn register_payment_method(payment_method_name: &str,
                                create_payment_address: Option<CreatePaymentAddressCB>,
                                add_request_fees: Option<AddRequestFeesCB>,
                                parse_response_with_fees: Option<ParseResponseWithFeesCB>,
-                               build_get_utxo_request: Option<BuildGetSourcesRequestCB>,
-                               parse_get_utxo_response: Option<ParseGetSourcesResponseCB>,
+                               build_get_utxo_request: Option<BuildGetUTXORequestCB>,
+                               parse_get_utxo_response: Option<ParseGetUTXOResponseCB>,
                                build_payment_req: Option<BuildPaymentReqCB>,
                                parse_payment_response: Option<ParsePaymentResponseCB>,
                                build_mint_req: Option<BuildMintReqCB>,
@@ -277,10 +277,10 @@ pub fn parse_get_utxo_response(payment_method: &str, resp_json: &str) -> Result<
     let payment_method = CString::new(payment_method).unwrap();
     let resp_json = CString::new(resp_json).unwrap();
 
-    let err = indy_parse_get_sources_response(cmd_handle,
-                                              payment_method.as_ptr(),
-                                              resp_json.as_ptr(),
-                                              cb);
+    let err = indy_parse_get_utxo_response(cmd_handle,
+                                           payment_method.as_ptr(),
+                                           resp_json.as_ptr(),
+                                           cb);
 
     super::results::result_to_string(err, receiver)
 }