Merge branch 'master' into master

jovfer · web-flow · commit cfc080d234ee · 2018-06-07T11:02:00.000+03:00
diff --git a/libindy/src/services/wallet/mod.rs b/libindy/src/services/wallet/mod.rs
@@ -239,7 +239,11 @@ impl WalletService {
     pub fn delete_wallet(&self, name: &str, credentials: &str) -> Result<(), WalletError> {
         trace!("delete_wallet >>> name: {:?}, credentials: {:?}", name, credentials);
 
-        let descriptor_json = _read_file(_wallet_descriptor_path(name))?; // FIXME: Better error!)?;
+        let wallet_descriptor_path = _wallet_descriptor_path(name);
+        if !wallet_descriptor_path.exists() {
+            return Err(WalletError::NotFound("Wallet descriptor path does not exist.".to_string()));
+        }
+        let descriptor_json = _read_file(wallet_descriptor_path)?; // FIXME: Better error!)?;
         let descriptor: WalletDescriptor = WalletDescriptor::from_json(&descriptor_json)?;
 
         let storage_types = self.storage_types.borrow();
@@ -271,7 +275,11 @@ impl WalletService {
     pub fn open_wallet(&self, name: &str, runtime_config: Option<&str>, credentials: &str) -> Result<i32, WalletError> {
         trace!("open_wallet >>> name: {:?}, runtime_config: {:?}, credentials: {:?}", name, runtime_config, credentials);
 
-        let descriptor_json = _read_file(_wallet_descriptor_path(name))?; // FIXME: Better error!)?;
+        let wallet_descriptor_path = _wallet_descriptor_path(name);
+        if !wallet_descriptor_path.exists() {
+            return Err(WalletError::NotFound("Wallet descriptor path does not exist.".to_string()));
+        }
+        let descriptor_json = _read_file(wallet_descriptor_path)?;
         let descriptor: WalletDescriptor = WalletDescriptor::from_json(&descriptor_json)?;
 
         let storage_types = self.storage_types.borrow();
@@ -911,6 +919,15 @@ mod tests {
         wallet_service.open_wallet("test_wallet", None, &_credentials()).unwrap();
     }
 
+    #[test]
+    fn wallet_service_open_unknown_wallet() {
+        _cleanup();
+
+        let wallet_service = WalletService::new();
+        let res = wallet_service.open_wallet("test_wallet_unknown", None, &_credentials());
+        assert_match!(Err(WalletError::NotFound(_)), res);
+    }
+
     #[test]
     fn wallet_service_open_works_for_plugged() {
         TestUtils::cleanup_indy_home();
diff --git a/libindy/tests/wallet.rs b/libindy/tests/wallet.rs
@@ -318,7 +318,7 @@ mod medium_cases {
             TestUtils::cleanup_storage();
 
             let res = WalletUtils::delete_wallet(WALLET, None);
-            assert_eq!(res.unwrap_err(), ErrorCode::CommonIOError);
+            assert_eq!(res.unwrap_err(), ErrorCode::WalletNotFoundError);
 
             TestUtils::cleanup_storage();
         }
@@ -330,7 +330,7 @@ mod medium_cases {
             WalletUtils::create_wallet(POOL, WALLET, None, None, None).unwrap();
             WalletUtils::delete_wallet(WALLET, None).unwrap();
             let res = WalletUtils::delete_wallet(WALLET, None);
-            assert_eq!(res.unwrap_err(), ErrorCode::CommonIOError);
+            assert_eq!(res.unwrap_err(), ErrorCode::WalletNotFoundError);
 
             TestUtils::cleanup_storage();
         }
@@ -355,7 +355,7 @@ mod medium_cases {
             TestUtils::cleanup_storage();
 
             let res = WalletUtils::open_wallet(WALLET, None, None);
-            assert_eq!(res.unwrap_err(), ErrorCode::CommonIOError);
+            assert_eq!(res.unwrap_err(), ErrorCode::WalletNotFoundError);
 
             TestUtils::cleanup_storage();
         }
diff --git a/wrappers/ios/libindy-pod/Indy-demoTests/Case Tests/Wallet/WalletHighCases.m b/wrappers/ios/libindy-pod/Indy-demoTests/Case Tests/Wallet/WalletHighCases.m
@@ -148,7 +148,7 @@ - (void)testDeleteWalletWorksForClosed {
 
 - (void)testDeleteWalletWorksForUnknown {
     NSError *ret = [[WalletUtils sharedInstance] deleteWalletWithName:@"testDeleteWalletWorksForUnknown"];
-    XCTAssertEqual(ret.code, CommonIOError, @"WalletUtils:deleteWalletWithName() returned wrong error");
+    XCTAssertEqual(ret.code, WalletNotFoundError, @"WalletUtils:deleteWalletWithName() returned wrong error");
 }
 
 // MARK: - Open wallet
@@ -200,7 +200,7 @@ - (void)testOpenWalletWorksForNotCreatedWallet {
     NSError *ret = [[WalletUtils sharedInstance] openWalletWithName:[TestUtils wallet]
                                                              config:nil
                                                           outHandle:nil];
-    XCTAssertEqual(ret.code, CommonIOError, @"WalletUtils:openWalletWithName() failed");
+    XCTAssertEqual(ret.code, WalletNotFoundError, @"WalletUtils:openWalletWithName() failed");
 }
 
 // MARK: - Close wallet
diff --git a/wrappers/java/src/test/java/org/hyperledger/indy/sdk/wallet/DeleteWalletTest.java b/wrappers/java/src/test/java/org/hyperledger/indy/sdk/wallet/DeleteWalletTest.java
@@ -51,7 +51,7 @@ public void testDeleteWalletWorksForOpened() throws Exception {
 	@Test
 	public void testDeleteWalletWorksForTwice() throws Exception {
 		thrown.expect(ExecutionException.class);
-		thrown.expectCause(isA(IOException.class));
+		thrown.expectCause(isA(WalletNotFoundException.class));
 
 		Wallet.createWallet(POOL, WALLET, null, null, CREDENTIALS).get();
 
@@ -74,7 +74,7 @@ public void testDeleteWalletWorksForPlugged() throws Exception {
 	@Test
 	public void testDeleteWalletWorksForNotCreated() throws Exception {
 		thrown.expect(ExecutionException.class);
-		thrown.expectCause(isA(IOException.class));
+		thrown.expectCause(isA(WalletNotFoundException.class));
 
 		Wallet.deleteWallet(WALLET, CREDENTIALS).get();
 	}
diff --git a/wrappers/java/src/test/java/org/hyperledger/indy/sdk/wallet/OpenWalletTest.java b/wrappers/java/src/test/java/org/hyperledger/indy/sdk/wallet/OpenWalletTest.java
@@ -63,7 +63,7 @@ public void testOpenWalletWorksForPlugged() throws Exception {
 	@Test
 	public void testOpenWalletWorksForNotCreatedWallet() throws Exception {
 		thrown.expect(ExecutionException.class);
-		thrown.expectCause(isA(IOException.class));
+		thrown.expectCause(isA(WalletNotFoundException.class));
 
 		Wallet.openWallet("openWalletWorksForNotCreatedWallet", null, CREDENTIALS).get();
 	}
diff --git a/wrappers/python/tests/wallet/test_delete_wallet.py b/wrappers/python/tests/wallet/test_delete_wallet.py
@@ -37,7 +37,7 @@ async def test_delete_wallet_works_for_twice(wallet_name, xwallet, credentials):
     with pytest.raises(IndyError) as e:
         await wallet.delete_wallet(wallet_name, credentials)
 
-    assert ErrorCode.CommonIOError == e.value.error_code
+    assert ErrorCode.WalletNotFoundError == e.value.error_code
 
 
 # noinspection PyUnusedLocal
@@ -46,4 +46,4 @@ async def test_delete_wallet_works_for_not_created(wallet_name, path_home, crede
     with pytest.raises(IndyError) as e:
         await wallet.delete_wallet(wallet_name, credentials)
 
-    assert ErrorCode.CommonIOError == e.value.error_code
+    assert ErrorCode.WalletNotFoundError == e.value.error_code
diff --git a/wrappers/python/tests/wallet/test_open_wallet.py b/wrappers/python/tests/wallet/test_open_wallet.py
@@ -15,7 +15,7 @@ async def test_open_wallet_works(wallet_config, wallet_handle):
 async def test_open_wallet_works_for_not_created_wallet(credentials):
     with pytest.raises(IndyError) as e:
         await wallet.open_wallet('wallet_not_created', None, credentials)
-    assert ErrorCode.CommonIOError == e.value.error_code
+    assert ErrorCode.WalletNotFoundError == e.value.error_code
 
 
 @pytest.mark.asyncio

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ - (void)testDeleteWalletWorksForClosed {`
`148`	`148`
`149`	`149`	`- (void)testDeleteWalletWorksForUnknown {`
`150`	`150`	`NSError *ret = [[WalletUtils sharedInstance] deleteWalletWithName:@"testDeleteWalletWorksForUnknown"];`
`151`		`- XCTAssertEqual(ret.code, CommonIOError, @"WalletUtils:deleteWalletWithName() returned wrong error");`
	`151`	`+ XCTAssertEqual(ret.code, WalletNotFoundError, @"WalletUtils:deleteWalletWithName() returned wrong error");`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`// MARK: - Open wallet`
`@@ -200,7 +200,7 @@ - (void)testOpenWalletWorksForNotCreatedWallet {`
`200`	`200`	`NSError *ret = [[WalletUtils sharedInstance] openWalletWithName:[TestUtils wallet]`
`201`	`201`	`config:nil`
`202`	`202`	`outHandle:nil];`
`203`		`- XCTAssertEqual(ret.code, CommonIOError, @"WalletUtils:openWalletWithName() failed");`
	`203`	`+ XCTAssertEqual(ret.code, WalletNotFoundError, @"WalletUtils:openWalletWithName() failed");`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`// MARK: - Close wallet`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public void testOpenWalletWorksForPlugged() throws Exception {`
`63`	`63`	`@Test`
`64`	`64`	`public void testOpenWalletWorksForNotCreatedWallet() throws Exception {`
`65`	`65`	`thrown.expect(ExecutionException.class);`
`66`		`- thrown.expectCause(isA(IOException.class));`
	`66`	`+ thrown.expectCause(isA(WalletNotFoundException.class));`
`67`	`67`
`68`	`68`	`Wallet.openWallet("openWalletWorksForNotCreatedWallet", null, CREDENTIALS).get();`
`69`	`69`	`}`