Merge

Signed-off-by: Michael Lodder <[email protected]>

Author: mikelodder7

Jenkinsfile.cd

@@ -170,11 +170,13 @@ def linuxTesting(file, env_name, network_name, stashBuildResults) {
                 echo "${env_name} Test: Test"
 
                 try {
+                    def libindyFeatures = "--features sodium_static"
+
                     echo "${env_name} Libindy Test: Build"
-                    sh "RUST_BACKTRACE=1 cargo test --release --no-run"
+                    sh "RUST_BACKTRACE=1 cargo test --release --no-run $libindyFeatures"
 
                     echo "${env_name} Libindy Test: Run tests"
-                    sh "RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test --release"
+                    sh "RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test --release $libindyFeatures"
 
                     if (stashBuildResults) {
                         stash includes: 'target/release/libindy.so,target/release/libindy.a', name: 'LibindyUbuntuBuildResult'
@@ -705,5 +707,5 @@ def downloadPackagingUtils() {
 }
 
 def setupRust() {
-    sh "rustup default 1.25.0"
+    sh "rustup default 1.26.0"
 }

Jenkinsfile.ci

@@ -220,14 +220,15 @@ def linuxTesting(file, env_name, network_name) {
         poolInst = openPool(env_name, network_name)
 
         def testEnv
+        def libindyFeatures = "--features sodium_static"
 
         dir('libindy') {
             echo "${env_name} Libindy Test: Build docker image"
             testEnv = dockerBuild('libindy', file)
 
             testEnv.inside("--ip=\"10.0.0.3\" --network=${network_name}") {
                 echo "${env_name} Libindy Test: Build"
-                sh "cargo build"
+                sh "cargo build $libindyFeatures"
             }
         }
 
@@ -259,10 +260,10 @@ def linuxTesting(file, env_name, network_name) {
                             echo "${env_name} Libindy Test: Test"
 
                             echo "${env_name} Libindy Test: Build Test"
-                            sh "RUST_BACKTRACE=1 cargo test --no-run"
+                            sh "RUST_BACKTRACE=1 cargo test --no-run $libindyFeatures"
 
                             echo "${env_name} Libindy Test: Run tests"
-                            sh "RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test"
+                            sh "RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test $libindyFeatures"
                         }
                     }
                 },
@@ -422,7 +423,7 @@ def closePool(env_name, network_name, poolInst) {
 }
 
 def setupRust() {
-    sh "rustup default 1.25.0"
+    sh "rustup default 1.26.0"
 }
 
 def setupRustIOS() {
@@ -433,5 +434,4 @@ def setupBrewPackages() {
     sh "brew switch libsodium 1.0.12"
     sh "brew switch openssl 1.0.2l"
     sh "brew switch zeromq 4.2.3"
-}
-
+}

ci/indy-pool.dockerfile

@@ -19,16 +19,16 @@ RUN pip3 install -U \
 	setuptools
 
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88
-ARG indy_stream=rc
+ARG indy_stream=master
 RUN echo "deb https://repo.sovrin.org/deb xenial $indy_stream" >> /etc/apt/sources.list
 
 RUN useradd -ms /bin/bash -u $uid indy
 
-ARG indy_plenum_ver=1.2.38
-ARG indy_anoncreds_ver=1.0.11
-ARG indy_node_ver=1.3.56
-ARG python3_indy_crypto_ver=0.2.0
-ARG indy_crypto_ver=0.1.6
+ARG indy_plenum_ver=1.2.369
+ARG indy_anoncreds_ver=1.0.32
+ARG indy_node_ver=1.3.425
+ARG python3_indy_crypto_ver=0.4.1
+ARG indy_crypto_ver=0.4.0
 
 RUN apt-get update -y && apt-get install -y \
         indy-plenum=${indy_plenum_ver} \

cli/src/command_executor.rs

@@ -110,6 +110,13 @@ impl CommandMetadataBuilder {
         self
     }
 
+    pub fn add_required_deferred_param(mut self,
+                                       name: &'static str,
+                                       help: &'static str) -> CommandMetadataBuilder {
+        self.params.push(ParamMetadata::new(name, false, true, help));
+        self
+    }
+
     pub fn add_optional_deferred_param(mut self,
                                        name: &'static str,
                                        help: &'static str) -> CommandMetadataBuilder {

cli/src/commands/common.rs

@@ -148,6 +148,7 @@ pub mod exit_command {
 }
 
 #[cfg(test)]
+#[cfg(feature = "nullpay_plugin")]
 pub mod tests {
     use super::*;
 
@@ -164,7 +165,6 @@ pub mod tests {
         use utils::test::TestUtils;
 
         #[test]
-        #[cfg(feature = "nullpay_plugin")]
         pub fn load_works() {
             TestUtils::cleanup_storage();
             let ctx = CommandContext::new();
@@ -179,7 +179,6 @@ pub mod tests {
         }
 
         #[test]
-        #[cfg(feature = "nullpay_plugin")]
         pub fn load_works_for_unknown_plugin() {
             let ctx = CommandContext::new();
 
@@ -191,7 +190,6 @@ pub mod tests {
         }
 
         #[test]
-        #[cfg(feature = "nullpay_plugin")]
         pub fn load_works_for_unknown_init_function() {
             let ctx = CommandContext::new();
 

cli/src/commands/did.rs

@@ -66,6 +66,7 @@ pub mod new_command {
                 println_succ!("Did \"{}\" has been created with \"{}\" verkey", did, vk);
                 Ok(did)
             }
+            Err(ErrorCode::DidAlreadyExistsError) => Err(println_err!("Did already exists: {:?}", did.unwrap_or(""))),
             Err(ErrorCode::UnknownCryptoTypeError) => Err(println_err!("Unknown crypto type")),
             Err(ErrorCode::CommonInvalidStructure) => Err(println_err!("Invalid format of command params. Please check format of posted JSONs, Keys, DIDs and etc...")),
             Err(err) => Err(println_err!("Indy SDK error occurred {:?}", err)),
@@ -179,7 +180,7 @@ pub mod use_command {
                 Ok(println_succ!("Did \"{}\" has been set as active", did))
             }
             Err(ErrorCode::CommonInvalidStructure) => Err(println_err!("Invalid DID format")),
-            Err(ErrorCode::WalletNotFoundError) => Err(println_err!("Requested DID not found")),
+            Err(ErrorCode::WalletItemNotFound) => Err(println_err!("Requested DID not found")),
             Err(err) => Err(println_err!("Indy SDK error occurred {:?}", err))
         };
 
@@ -214,7 +215,7 @@ pub mod rotate_key_command {
 
         let new_verkey = match Did::replace_keys_start(wallet_handle, &did, &identity_json) {
             Ok(request) => Ok(request),
-            Err(ErrorCode::WalletNotFoundError) => Err(println_err!("Active DID: \"{}\" not found", did)),
+            Err(ErrorCode::WalletItemNotFound) => Err(println_err!("Active DID: \"{}\" not found", did)),
             Err(_) => return Err(println_err!("Invalid format of command params. Please check format of posted JSONs, Keys, DIDs and etc...")),
         }?;
 
@@ -236,7 +237,7 @@ pub mod rotate_key_command {
             match Did::replace_keys_apply(wallet_handle, &did)
                 .and_then(|_| Did::abbreviate_verkey(&did, &new_verkey)) {
                 Ok(vk) => Ok(println_succ!("Verkey for did \"{}\" has been updated. New verkey: \"{}\"", did, vk)),
-                Err(ErrorCode::WalletNotFoundError) => Err(println_err!("Active DID: \"{}\" not found", did)),
+                Err(ErrorCode::WalletItemNotFound) => Err(println_err!("Active DID: \"{}\" not found", did)),
                 Err(_) => return Err(println_err!("Invalid format of command params. Please check format of posted JSONs, Keys, DIDs and etc...")),
             };
 
@@ -346,9 +347,8 @@ pub mod tests {
                 params.insert("did", DID_TRUSTEE.to_string());
                 cmd.execute(&ctx, &params).unwrap();
             }
-            let dids = get_dids(wallet_handle);
-            assert_eq!(1, dids.len());
-            assert_eq!(dids[0]["did"].as_str().unwrap(), DID_TRUSTEE);
+            let did = get_did_info(wallet_handle, DID_TRUSTEE);
+            assert_eq!(did["did"].as_str().unwrap(), DID_TRUSTEE);
 
             close_and_delete_wallet(&ctx);
             TestUtils::cleanup_storage();
@@ -366,10 +366,9 @@ pub mod tests {
                 params.insert("seed", SEED_TRUSTEE.to_string());
                 cmd.execute(&ctx, &params).unwrap();
             }
-            let dids = get_dids(wallet_handle);
-            assert_eq!(1, dids.len());
-            assert_eq!(dids[0]["did"].as_str().unwrap(), DID_TRUSTEE);
-            assert_eq!(dids[0]["verkey"].as_str().unwrap(), VERKEY_TRUSTEE);
+            let did = get_did_info(wallet_handle, DID_TRUSTEE);
+            assert_eq!(did["did"].as_str().unwrap(), DID_TRUSTEE);
+            assert_eq!(did["verkey"].as_str().unwrap(), VERKEY_TRUSTEE);
 
             close_and_delete_wallet(&ctx);
             TestUtils::cleanup_storage();
@@ -549,15 +548,15 @@ pub mod tests {
             send_nym(&ctx, DID_MY2, VERKEY_MY2, None);
             use_did(&ctx, DID_MY2);
 
-            let dids = get_dids(wallet_handle);
-            assert_eq!(dids[0]["verkey"].as_str().unwrap(), VERKEY_MY2);
+            let did_info = get_did_info(wallet_handle,DID_MY2);
+            assert_eq!(did_info["verkey"].as_str().unwrap(), VERKEY_MY2);
             {
                 let cmd = rotate_key_command::new();
                 let params = CommandParams::new();
                 cmd.execute(&ctx, &params).unwrap();
             }
-            let dids = get_dids(wallet_handle);
-            assert_ne!(dids[0]["verkey"].as_str().unwrap(), VERKEY_MY2);
+            let did_info = get_did_info(wallet_handle,DID_MY2);
+            assert_ne!(did_info["verkey"].as_str().unwrap(), VERKEY_MY2);
 
             close_and_delete_wallet(&ctx);
             disconnect_and_delete_pool(&ctx);
@@ -582,6 +581,11 @@ pub mod tests {
         }
     }
 
+    fn get_did_info(wallet_handle: i32, did: &str) -> serde_json::Value {
+        let did_info = Did::get_did_with_meta(wallet_handle, did).unwrap();
+        serde_json::from_str(&did_info).unwrap()
+    }
+
     fn get_dids(wallet_handle: i32) -> Vec<serde_json::Value> {
         let dids = Did::list_dids_with_meta(wallet_handle).unwrap();
         serde_json::from_str(&dids).unwrap()