Reverted indy_pool dockerfile. Simplified getting reqId

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

Author: Artemkaaas

Jenkinsfile.ci

@@ -155,7 +155,7 @@ def iosTesting() {
 
                 echo "iOS Test: Running pool"
                 sh "docker rm -f indy_pool || true"
-                sh "docker build --build-arg client_ip=0.0.0.0 -f ci/indy-pool.dockerfile -t indy_pool ci"
+                sh "docker build -f ci/indy-pool.dockerfile -t indy_pool ci"
                 sh "docker run -d --name indy_pool -p 9701-9708:9701-9708 indy_pool"
 
                 setupRust()

ci/indy-pool.dockerfile

@@ -38,11 +38,6 @@ RUN apt-get update -y && apt-get install -y \
         libindy-crypto=${indy_crypto_ver} \
         vim
 
-ARG pool_ip=127.0.0.1
-ARG client_ip=$pool_ip
-
-ENV CLIENT_IP=$client_ip
-
 RUN echo "[supervisord]\n\
 logfile = /tmp/supervisord.log\n\
 logfile_maxbytes = 50MB\n\
@@ -61,25 +56,25 @@ childlogdir = /tmp\n\
 strip_ansi = false\n\
 \n\
 [program:node1]\n\
-command=start_indy_node Node1 %(ENV_CLIENT_IP)s 9701 %(ENV_CLIENT_IP)s 9702\n\
+command=start_indy_node Node1 0.0.0.0 9701 0.0.0.0 9702\n\
 directory=/home/indy\n\
 stdout_logfile=/tmp/node1.log\n\
 stderr_logfile=/tmp/node1.log\n\
 \n\
 [program:node2]\n\
-command=start_indy_node Node2 %(ENV_CLIENT_IP)s 9703 %(ENV_CLIENT_IP)s 9704\n\
+command=start_indy_node Node2 0.0.0.0 9703 0.0.0.0 9704\n\
 directory=/home/indy\n\
 stdout_logfile=/tmp/node2.log\n\
 stderr_logfile=/tmp/node2.log\n\
 \n\
 [program:node3]\n\
-command=start_indy_node Node3 %(ENV_CLIENT_IP)s 9705 %(ENV_CLIENT_IP)s 9706\n\
+command=start_indy_node Node3 0.0.0.0 9705 0.0.0.0 9706\n\
 directory=/home/indy\n\
 stdout_logfile=/tmp/node3.log\n\
 stderr_logfile=/tmp/node3.log\n\
 \n\
 [program:node4]\n\
-command=start_indy_node Node4 %(ENV_CLIENT_IP)s 9707 %(ENV_CLIENT_IP)s 9708\n\
+command=start_indy_node Node4 0.0.0.0 9707 0.0.0.0 9708\n\
 directory=/home/indy\n\
 stdout_logfile=/tmp/node4.log\n\
 stderr_logfile=/tmp/node4.log\n"\
@@ -90,6 +85,8 @@ USER indy
 RUN awk '{if (index($1, "NETWORK_NAME") != 0) {print("NETWORK_NAME = \"sandbox\"")} else print($0)}' /etc/indy/indy_config.py> /tmp/indy_config.py
 RUN mv /tmp/indy_config.py /etc/indy/indy_config.py
 
+ARG pool_ip=127.0.0.1
+
 RUN generate_indy_pool_transactions --nodes 4 --clients 5 --nodeNum 1 2 3 4 --ips="$pool_ip,$pool_ip,$pool_ip,$pool_ip"
 
 EXPOSE 9701 9702 9703 9704 9705 9706 9707 9708

libnullpay/src/services/response_storage.rs

@@ -25,20 +25,8 @@ pub fn get_response(response: &str) -> Result<String, ErrorCode> {
     let val = str_to_val(response)?;
 
     let req_id = match val["result"]["ver"].as_str() {
-        Some("1") =>
-            val.get("result")
-                .and_then(|result| result.as_object())
-                .and_then(|result| result.get("txn"))
-                .and_then(|txn| txn.as_object())
-                .and_then(|txn| txn.get("metadata"))
-                .and_then(|metadata| metadata.as_object())
-                .and_then(|metadata| metadata.get("reqId"))
-                .and_then(|req_id| req_id.as_i64()),
-        None =>
-            val.get("result")
-                .and_then(|result| result.as_object())
-                .and_then(|result| result.get("reqId"))
-                .and_then(|req_id| req_id.as_i64()),
+        Some("1") => val["result"]["txn"]["metadata"]["reqId"].as_i64(),
+        None => val["result"]["reqId"].as_i64(),
         _ => return Err(ErrorCode::CommonInvalidState)
     };