Merge branch 'master' into patch-1

Author: jovfer

CHANGELOG.md

@@ -8,11 +8,15 @@
     All encryption is performed in libindy. It simplifies plugged wallets and provides warranty of a good security level
     for 3d party wallets implementations.
   * The format of wallet data was changed for better security and support of efficient search
-* Added [Wallet Export/Import API](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/009-wallet-export-import) and
+* Added EXPERIMENTAL [Wallet Export/Import API](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/009-wallet-export-import) and
   corresponded commands to Indy CLI
+* ```indy_list_wallets``` endpoint is DEPRECATED and will be removed in the next release. The main idea is avoid
+  maintaining created wallet list on libindy side. It will allow to access wallets from a cluster and solve
+  some problems on mobile platforms. ```indy_create_wallet``` and ```indy_open_wallet``` endpoints will
+  also get related changes in the next release.
 * Added [Non-Secrets API](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/003-wallet-storage#non-secrets-api) that allows store and read  
   application specific data in the wallet
-* Added [Generic Payments API](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/004-payment-interface#payment-method-api) that provides
+* Added EXPERIMENTAL [Generic Payments API](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/004-payment-interface#payment-method-api) that provides
   ability to register custom payment method
   and then create payment addresses, build payment-related transactions, assign fees to transactions
 * Added ability to [load custom plugins using Indy CLI](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/006-cli-plugins)

doc/migration-guide-1.4.0-1.5.0.md

@@ -39,7 +39,12 @@ Functions from older version are listed in the left column, and the equivalent n
   for 3d party wallets implementations.
 * Libindy v1.5 changes wallet format to allow efficient and flexible search for entities with pagination support.
   *WARNING* wallet format of libindy v1.5 isn't compatible with a wallet format of libindy v1.4.
-* There have been added functions that allow performing Export/Import of Wallet.
+* There have been added functions that allow performing Export/Import of Wallet. Note these endpoints are EXPERIMENTAL.
+  Function signature and behavior may change in the future releases.
+* ```indy_list_wallets``` endpoint is DEPRECATED and will be removed in the next release. The main idea is avoid
+  maintaining created wallet list on libindy side. It will allow to access wallets from a cluster and solve
+  some problems on mobile platforms. ```indy_create_wallet``` and ```indy_open_wallet``` endpoints will
+  also get related changes in the next release.
 
 References:
 
@@ -480,6 +485,9 @@ This API is intended to provide the ability to register custom payment method an
 * Adding fees to transactions
 * Getting transactions fees amount
 
+Note all endpoints in this group are EXPERIMENTAL. Function signatures and behavior may change
+in the future releases.
+
 References:
 
 * [Payment Interface Design](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/004-payment-interface)

libindy/debian/changelog

@@ -8,11 +8,15 @@ libindy (1.5.0) unstable; urgency=medium
     All encryption is performed in libindy. It simplifies plugged wallets and provides warranty of a good security level
     for 3d party wallets implementations.
   * The format of wallet data was changed for better security and support of efficient search
-* Added [Wallet Export/Import API](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/009-wallet-export-import) and
+* Added EXPERIMENTAL [Wallet Export/Import API](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/009-wallet-export-import) and
   corresponded commands to Indy CLI
+* ```indy_list_wallets``` endpoint is DEPRECATED and will be removed in the next release. The main idea is avoid
+  maintaining created wallet list on libindy side. It will allow to access wallets from a cluster and solve
+  some problems on mobile platforms. ```indy_create_wallet``` and ```indy_open_wallet``` endpoints will
+  also get related changes in the next release.
 * Added [Non-Secrets API](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/003-wallet-storage#non-secrets-api) that allows store and read  
   application specific data in the wallet
-* Added [Generic Payments API](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/004-payment-interface#payment-method-api) that provides
+* Added EXPERIMENTAL [Generic Payments API](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/004-payment-interface#payment-method-api) that provides
   ability to register custom payment method
   and then create payment addresses, build payment-related transactions, assign fees to transactions
 * Added ability to [load custom plugins using Indy CLI](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/006-cli-plugins)

libindy/src/api/payments.rs

@@ -265,6 +265,9 @@ pub type ParseGetTxnFeesResponseCB = extern fn(command_handle: i32,
 ///
 /// It allows library user to provide custom payment method implementation as set of handlers.
 ///
+/// Note this endpoint is EXPERIMENTAL. Function signature and behaviour may change
+/// in the future releases.
+///
 /// #Params
 /// command_handle: Command handle to map callback to caller context.
 /// payment_method: The type of payment method also used as sub-prefix for fully resolvable payment address format ("sov" - for example)
@@ -352,6 +355,9 @@ pub extern fn indy_register_payment_method(command_handle: i32,
 /// Note that payment method should be able to resolve this
 /// secret by fully resolvable payment address format.
 ///
+/// Note this endpoint is EXPERIMENTAL. Function signature and behaviour may change
+/// in the future releases.
+///
 /// #Params
 /// command_handle: command handle to map callback to context
 /// wallet_handle: wallet handle where to save new address
@@ -403,6 +409,9 @@ pub extern fn indy_create_payment_address(command_handle: i32,
 
 /// Lists all payment addresses that are stored in the wallet
 ///
+/// Note this endpoint is EXPERIMENTAL. Function signature and behaviour may change
+/// in the future releases.
+///
 /// #Params
 /// command_handle: command handle to map callback to context
 /// wallet_handle: wallet to search for payment_addresses in
@@ -454,6 +463,9 @@ pub extern fn indy_list_payment_addresses(command_handle: i32,
 /// Format of inputs is specific for payment method. Usually it should reference payment transaction
 /// with at least one output that corresponds to payment address that user owns.
 ///
+/// 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
@@ -520,6 +532,9 @@ pub extern fn indy_add_request_fees(command_handle: i32,
 
 /// Parses response for Indy request with fees.
 ///
+/// Note this endpoint is EXPERIMENTAL. Function signature and behaviour may change
+/// in the future releases.
+///
 /// #Params
 /// command_handle
 /// payment_method
@@ -568,6 +583,9 @@ pub extern fn indy_parse_response_with_fees(command_handle: i32,
 /// Builds Indy request for getting UTXO list for payment address
 /// according to this payment method.
 ///
+/// 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
@@ -617,6 +635,9 @@ pub extern fn indy_build_get_utxo_request(command_handle: i32,
 
 /// Parses response for Indy request for getting UTXO list.
 ///
+/// Note this endpoint is EXPERIMENTAL. Function signature and behaviour may change
+/// in the future releases.
+///
 /// #Params
 /// resp_json: response for Indy request for getting UTXO list
 ///   Note: this param will be used to determine payment_method
@@ -671,6 +692,9 @@ pub extern fn indy_parse_get_utxo_response(command_handle: i32,
 /// Format of inputs is specific for payment method. Usually it should reference payment transaction
 /// with at least one output that corresponds to payment address that user owns.
 ///
+/// 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
@@ -731,6 +755,9 @@ pub extern fn indy_build_payment_req(command_handle: i32,
 
 /// Parses response for Indy request for payment txn.
 ///
+/// Note this endpoint is EXPERIMENTAL. Function signature and behaviour may change
+/// in the future releases.
+///
 /// #Params
 /// command_handle
 /// payment_method
@@ -782,6 +809,9 @@ pub extern fn indy_parse_payment_response(command_handle: i32,
 /// Builds Indy request for doing tokens minting
 /// according to this payment method.
 ///
+/// 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
@@ -836,6 +866,9 @@ pub extern fn indy_build_mint_req(command_handle: i32,
 
 /// Builds Indy request for setting fees for transactions in the ledger
 ///
+/// Note this endpoint is EXPERIMENTAL. Function signature and behaviour may change
+/// in the future releases.
+///
 /// # Params
 /// command_handle
 /// wallet_handle: wallet handle
@@ -891,6 +924,9 @@ pub extern fn indy_build_set_txn_fees_req(command_handle: i32,
 
 /// Builds Indy get request for getting fees for transactions in the ledger
 ///
+/// Note this endpoint is EXPERIMENTAL. Function signature and behaviour may change
+/// in the future releases.
+///
 /// # Params
 /// command_handle
 /// wallet_handle: wallet handle
@@ -938,6 +974,9 @@ pub extern fn indy_build_get_txn_fees_req(command_handle: i32,
 
 /// Parses response for Indy request for getting fees
 ///
+/// Note this endpoint is EXPERIMENTAL. Function signature and behaviour may change
+/// in the future releases.
+///
 /// # Params
 /// command_handle
 /// payment_method

libindy/src/api/wallet.rs

@@ -270,6 +270,8 @@ pub extern fn indy_open_wallet(command_handle: i32,
 
 /// Lists created wallets as JSON array with each wallet metadata: name, type, name of associated pool
 ///
+/// Note this function is DEPRECATED and will be removed in the next release.
+///
 /// #Returns
 /// wallets list json: [{
 ///    "name": <string>
@@ -310,6 +312,9 @@ pub extern fn indy_list_wallets(command_handle: i32,
 
 /// Exports opened wallet
 ///
+/// Note this endpoint is EXPERIMENTAL. Function signature and behaviour may change
+/// in the future releases.
+///
 /// #Params:
 /// wallet_handle: wallet handle returned by indy_open_wallet
 /// export_config_json: JSON containing settings for input operation.
@@ -356,15 +361,18 @@ pub extern fn indy_export_wallet(command_handle: i32,
 }
 
 
-// Creates a new secure wallet with the given unique name and then imports its content
-// according to fields provided in import_config
-// This can be seen as an indy_create_wallet call with additional content import
-//
-// #Params
-// pool_name: Name of the pool that corresponds to this wallet
-// name: Name of the wallet
-// storage_type(optional): Type of the wallet storage. Defaults to 'default'.
-//                  Custom storage types can be registered with indy_register_wallet_storage_call
+/// Creates a new secure wallet with the given unique name and then imports its content
+/// according to fields provided in import_config
+/// This can be seen as an indy_create_wallet call with additional content import
+///
+/// Note this endpoint is EXPERIMENTAL. Function signature and behaviour may change
+/// in the future releases.
+///
+/// #Params
+/// pool_name: Name of the pool that corresponds to this wallet
+/// name: Name of the wallet
+/// storage_type(optional): Type of the wallet storage. Defaults to 'default'.
+///                  Custom storage types can be registered with indy_register_wallet_storage_call
 /// config(optional): Wallet configuration json.
 ///   {
 ///       "storage": <object>  List of supported keys are defined by wallet type.

libindy/src/errors/common.rs

@@ -54,11 +54,11 @@ impl fmt::Display for CommonError {
             CommonError::InvalidParam2(ref description) => write!(f, "Invalid param 2: {}", description),
             CommonError::InvalidParam3(ref description) => write!(f, "Invalid param 3: {}", description),
             CommonError::InvalidParam4(ref description) => write!(f, "Invalid param 4: {}", description),
-            CommonError::InvalidParam5(ref description) => write!(f, "Invalid param 4: {}", description),
-            CommonError::InvalidParam6(ref description) => write!(f, "Invalid param 4: {}", description),
-            CommonError::InvalidParam7(ref description) => write!(f, "Invalid param 4: {}", description),
-            CommonError::InvalidParam8(ref description) => write!(f, "Invalid param 4: {}", description),
-            CommonError::InvalidParam9(ref description) => write!(f, "Invalid param 4: {}", description),
+            CommonError::InvalidParam5(ref description) => write!(f, "Invalid param 5: {}", description),
+            CommonError::InvalidParam6(ref description) => write!(f, "Invalid param 6: {}", description),
+            CommonError::InvalidParam7(ref description) => write!(f, "Invalid param 7: {}", description),
+            CommonError::InvalidParam8(ref description) => write!(f, "Invalid param 8: {}", description),
+            CommonError::InvalidParam9(ref description) => write!(f, "Invalid param 9: {}", description),
             CommonError::InvalidState(ref description) => write!(f, "Invalid library state: {}", description),
             CommonError::InvalidStructure(ref description) => write!(f, "Invalid structure: {}", description),
             CommonError::IOError(ref err) => err.fmt(f)

libindy/src/services/pool/mod.rs

@@ -164,7 +164,7 @@ impl PoolWorker {
 
         let gen_tnxs = PoolWorker::_build_node_state(&merkle_tree)?;
 
-        for (_, gen_txn) in &gen_tnxs {
+        for gen_txn in gen_tnxs.values() {
             let mut rn: RemoteNode = match RemoteNode::new(&gen_txn) {
                 Ok(rn) => rn,
                 Err(err) => {

libindy/src/services/pool/transaction_handler.rs

@@ -262,7 +262,7 @@ impl TransactionHandler {
                         "Can't flash all transaction requests with common success status".to_string())));
             }
             Err(_) => {
-                for (_, pending_cmd) in &mut self.pending_commands {
+                for pending_cmd in self.pending_commands.values_mut() {
                     pending_cmd.terminate_parent_cmds(false)?
                 }
                 Ok(())
@@ -652,7 +652,7 @@ impl TransactionHandler {
             self.pending_commands.remove(&cmd);
         }
 
-        for (_, pc) in &mut self.pending_commands {
+        for pc in self.pending_commands.values_mut() {
             let is_timeout = pc.resendable_request.as_ref()
                 .and_then(|resend| resend.next_try_send_time)
                 .map(|next_try_send_time| next_try_send_time <= time::now_utc())