Clean-up.

Signed-off-by: Sergey Minaev <[email protected]>

Author: jovfer

cli/src/commands/ledger.rs

@@ -1246,7 +1246,7 @@ fn timestamp_to_datetime(_time: i64) -> String {
 pub enum ResponseType {
     REQNACK,
     REPLY,
-    REJECT,
+    REJECT
 }
 
 #[derive(Deserialize, Debug)]
@@ -1262,7 +1262,7 @@ pub struct ReplyResult<T> {
     pub data: T,
     #[serde(rename = "seqNo")]
     pub seq_no: u64,
-    pub identifier: String,
+    pub identifier: String
 }
 
 #[cfg(test)]

cli/src/libindy/ledger.rs

@@ -383,7 +383,7 @@ extern {
     fn indy_build_cred_def_request(command_handle: i32,
                                    submitter_did: *const c_char,
                                    data: *const c_char,
-                                   cb: Option<extern fn(xcommand_handle: i32, err: ErrorCode, request_result_json: *const c_char)>) -> ErrorCode;
+                                   cb: Option<extern fn(xcommand_handle: i32, err: ErrorCode, request_json: *const c_char)>) -> ErrorCode;
 
     #[no_mangle]
     fn indy_build_get_cred_def_request(command_handle: i32,

libindy/include/indy_ledger.h

@@ -476,7 +476,7 @@ extern "C" {
                                                                      const char*   request_json)
                                                );
 
-    /// Builds a GET_VALIDATOR_INFO request.
+        /// Builds a GET_VALIDATOR_INFO request.
         ///
         /// #Params
         /// command_handle: command handle to map callback to caller context.

libindy/src/services/pool/mod.rs

@@ -306,7 +306,6 @@ impl PoolWorker {
                 }
             }
         }
-
         if poll_items[0].is_readable() {
             let cmd = self.cmd_sock.recv_multipart(zmq::DONTWAIT)?;
             trace!("cmd {:?}", cmd);

libindy/src/services/pool/transaction_handler.rs

@@ -91,7 +91,6 @@ impl TransactionHandler {
             Ok(raw_msg) => raw_msg["result"].clone(),
             Err(err) => return warn!("{:?}", err)
         };
-
         let mut msg_result_without_proof: SJsonValue = msg_result.clone();
         msg_result_without_proof.as_object_mut().map(|obj| obj.remove("state_proof"));
         if msg_result_without_proof["data"].is_object() {

libindy/tests/utils/types.rs

@@ -91,14 +91,14 @@ pub struct GetSchemaResultData {
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct GetValidatorInfoResult {
-    /*pub identifier: String,
+    pub identifier: String,
     #[serde(rename = "reqId")]
     pub req_id: u64,
     #[serde(rename = "seqNo")]
     pub seq_no: Option<i32>,
     #[serde(rename = "type")]
-    pub _type: String,
-    pub data: Option<serde_json::Value>*/
+    pub type_: String,
+    pub data: Option<serde_json::Value>
 }
 
 #[derive(Debug, Serialize, Deserialize)]

wrappers/ios/libindy-pod/Indy-demo.xcodeproj/xcshareddata/xcschemes/Indy-demo.xcscheme

@@ -56,9 +56,6 @@
                <Test
                   Identifier = "AnoncredsHignCases/testAnoncreds">
                </Test>
-               <Test
-                  Identifier = "LedgerGetValidatorInfo/testGetValidatorInfoWorks">
-               </Test>
                <Test
                   Identifier = "LedgerHignCases/testGetTxnRequestWorks">
                </Test>

wrappers/ios/libindy-pod/Indy-demoTests/Test Utils/LedgerUtils.mm

@@ -209,17 +209,17 @@ - (NSError *)buildGetSchemaRequestWithSubmitterDid:(NSString *)submitterDid
     XCTestExpectation *completionExpectation = [[XCTestExpectation alloc] initWithDescription:@"completion finished"];
     __block NSError *err = nil;
     __block NSString *result = nil;
-    
+
     [IndyLedger buildGetSchemaRequestWithSubmitterDid:submitterDid
                                                    id:id
                                            completion:^(NSError *error, NSString *request) {
                                                err = error;
                                                result = request;
                                                [completionExpectation fulfill];
                                            }];
-    
+
     [self waitForExpectations:@[completionExpectation] timeout:[TestUtils longTimeout]];
-    
+
     if (resultJson) {*resultJson = result;}
     return err;
 }

wrappers/java/src/test/java/org/hyperledger/indy/sdk/ledger/GetValidatorInfoRequestTest.java

@@ -5,10 +5,8 @@
 import org.hyperledger.indy.sdk.utils.PoolUtils;
 import org.json.JSONObject;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 public class GetValidatorInfoRequestTest extends IndyIntegrationTestWithPoolAndSingleWallet {