Fix CI (#111)

* Fix CI
* Take test config from environment

Co-authored-by: Juan Leni <juan.leni@zondax.ch>

Author: c410-f3r

.circleci/config.yml

@@ -64,10 +64,6 @@ jobs:
           name: Initial configuration
           command: |
             sudo apt-get install -y default-jdk g++ gcc valgrind snapd
-            wget -O sdk.install.sh "https://get.sdkman.io"
-            sudo bash sdk.install.sh
-            sudo source "/root/.sdkman/bin/sdkman-init.sh"
-            sudo sdk install kotlin
             rustup install nightly
             cargo +nightly install cbindgen
       - run: OUT_DIR=/tmp/c ./.circleci/test_c.sh
@@ -195,6 +191,8 @@ workflows:
           <<: *no-tags
       - tests_rust:
           <<: *no-tags
+      - tests_ffi:
+          <<: *no-tags
       - tests_wasm:
           <<: *no-tags
       - tests_service:
@@ -206,6 +204,8 @@ workflows:
           <<: *only-release-tags
       - tests_rust:
           <<: *only-release-tags
+      - tests_ffi:
+          <<: *only-release-tags
       - tests_wasm:
           <<: *only-release-tags
       - tests_service:

.circleci/test_c.sh

@@ -3,7 +3,6 @@ mkdir $OUT_DIR
 cp -r ../examples/ffi/c/* $OUT_DIR
 rustup default nightly
 cbindgen --config cbindgen.toml --crate filecoin-signer-ffi --lang c --output $OUT_DIR/filecoin_signer_ffi.h
-rustup default stable
 cargo build
 cp ../target/debug/libfilecoin_signer_ffi.so $OUT_DIR
 ( cd $OUT_DIR; gcc main.c -L. -lfilecoin_signer_ffi -o main )

.circleci/test_cpp.sh

@@ -3,7 +3,6 @@ mkdir $OUT_DIR
 cp -r ../examples/ffi/c++/* $OUT_DIR
 rustup default nightly
 cbindgen --config cbindgen.toml --crate filecoin-signer-ffi --lang c++ --output $OUT_DIR/filecoin_signer_ffi.h
-rustup default stable
 cargo build
 cp ../target/debug/libfilecoin_signer_ffi.so $OUT_DIR
 ( cd $OUT_DIR; g++ main.cpp -L. -lfilecoin_signer_ffi -o main )

.circleci/test_kotlin.sh

@@ -1,3 +1,8 @@
+wget -O sdk.install.sh "https://get.sdkman.io"
+bash sdk.install.sh
+. ~/.sdkman/bin/sdkman-init.sh
+sdk install kotlin
+
 cd signer-ffi
 mkdir $OUT_DIR
 cp -r ../examples/ffi/kotlin/* $OUT_DIR

service/src/service/client.rs

@@ -122,14 +122,12 @@ pub async fn get_status(url: &str, jwt: &str, cid_message: Value) -> Result<Valu
 #[cfg(test)]
 mod tests {
     use crate::service::client::{get_nonce, get_status};
+    use crate::service::test_helper::tests;
 
     use jsonrpc_core::types::error::{Error, ErrorCode};
     use jsonrpc_core::Response;
     use serde_json::json;
 
-    const TEST_URL: &str = "http://86.192.13.13:1234/rpc/v0";
-    const JWT: &str = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJBbGxvdyI6WyJyZWFkIiwid3JpdGUiLCJzaWduIiwiYWRtaW4iXX0.xK1G26jlYnAEnGLJzN1RLywghc4p4cHI6ax_6YOv0aI";
-
     #[tokio::test]
     async fn decode_error() {
         let data = b"{\"jsonrpc\":\"2.0\",\"id\":1,\"error\":{\"code\":1,\"message\":\"cbor input had wrong number of fields\"}}\n";
@@ -141,7 +139,8 @@ mod tests {
     async fn example_something_else_and_retrieve_nonce() {
         let addr = "t02";
 
-        let nonce = get_nonce(&TEST_URL, &JWT, &addr).await;
+        let credentials = tests::get_remote_credentials();
+        let nonce = get_nonce(&credentials.url, &credentials.jwt, &addr).await;
 
         println!("{:?}", nonce);
 
@@ -164,7 +163,10 @@ mod tests {
             "Params":""
         });
 
-        let status = get_status(&TEST_URL, &JWT, params).await.unwrap();
+        let credentials = tests::get_remote_credentials();
+        let status = get_status(&credentials.url, &credentials.jwt, params)
+            .await
+            .unwrap();
 
         println!("{:?}", status);
 
@@ -176,7 +178,8 @@ mod tests {
         let params =
             json!({ "/": "bafy2bzaceaxm23epjsmh75yvzcecsrbavlmkcxnva66bkdebdcnyw3bjrc74u" });
 
-        let status = get_status(&TEST_URL, &JWT, params).await;
+        let credentials = tests::get_remote_credentials();
+        let status = get_status(&credentials.url, &credentials.jwt, params).await;
 
         println!("{:?}", status);
         let _err_jsonrpc = Error {
@@ -194,7 +197,8 @@ mod tests {
         let params =
             json!({ "/": "bafy2bzacedbo3svni7n2jb57exuqh4v5zvjjethf3p74zgv7yfdtczce2yu4u" });
 
-        let status = get_status(&TEST_URL, &JWT, params).await;
+        let credentials = tests::get_remote_credentials();
+        let status = get_status(&credentials.url, &credentials.jwt, params).await;
 
         println!("{:?}", status);
         assert!(status.is_err());

service/src/service/handlers.rs

@@ -79,13 +79,13 @@ impl warp::reject::Reject for ServiceError {}
 mod tests {
     use crate::config::RemoteNodeSection;
     use crate::service::handlers::v0_post;
+    use crate::service::test_helper::tests;
+
+    use crate::service::test_helper::tests::get_remote_credentials;
     use futures_await_test::async_test;
     use jsonrpc_core::{Call, Id, MethodCall, Params, Version};
     use warp::Reply;
 
-    const TEST_URL: &str = "http://86.192.13.13:1234/rpc/v0";
-    const JWT: &str = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJBbGxvdyI6WyJyZWFkIiwid3JpdGUiLCJzaWduIiwiYWRtaW4iXX0.xK1G26jlYnAEnGLJzN1RLywghc4p4cHI6ax_6YOv0aI";
-
     #[async_test]
     async fn returns_jsonrpc_error_not_found() {
         let bad_call = Call::from(MethodCall {
@@ -95,11 +95,7 @@ mod tests {
             id: Id::Num(1),
         });
 
-        let config = RemoteNodeSection {
-            url: TEST_URL.to_string(),
-            jwt: JWT.to_string(),
-        };
-
+        let config = get_remote_credentials();
         let response = v0_post(bad_call, config).await;
 
         assert!(response.is_err());
@@ -116,11 +112,7 @@ mod tests {
             id: Id::Num(1),
         });
 
-        let config = RemoteNodeSection {
-            url: TEST_URL.to_string(),
-            jwt: JWT.to_string(),
-        };
-
+        let config = get_remote_credentials();
         let reply = v0_post(bad_call, config).await.unwrap();
 
         let response = reply.into_response();

service/src/service/methods.rs

@@ -260,13 +260,11 @@ pub async fn send_signed_tx(
 mod tests {
     use crate::config::RemoteNodeSection;
     use crate::service::methods::get_status;
+    use crate::service::test_helper::tests;
+    use crate::service::test_helper::tests::get_remote_credentials;
     use jsonrpc_core::{Id, MethodCall, Params, Success, Version};
     use serde_json::json;
 
-    //const TEST_URL: &str = "http://86.192.13.13:1234/rpc/v0";
-    const TEST_URL: &str = "https://proxy.openworklabs.com/rpc/v0";
-    const JWT: &str = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJBbGxvdyI6WyJyZWFkIiwid3JpdGUiLCJzaWduIiwiYWRtaW4iXX0.xK1G26jlYnAEnGLJzN1RLywghc4p4cHI6ax_6YOv0aI";
-
     #[tokio::test]
     async fn example_get_status_transaction() {
         let params_str = json!({ "cid_message": "bafy2bzacea2ob4bctlucgp2okbczqvk5ctx4jqjapslz57mbcmnnzyftgeqgu" });
@@ -295,11 +293,7 @@ mod tests {
             id: Id::Num(123),
         };
 
-        let config = RemoteNodeSection {
-            url: TEST_URL.to_string(),
-            jwt: JWT.to_string(),
-        };
-
+        let config = get_remote_credentials();
         let status = get_status(mc, config).await.unwrap();
 
         println!("{:?}", status);
@@ -332,11 +326,7 @@ mod tests {
             id: Id::Num(0),
         };
 
-        let config = RemoteNodeSection {
-            url: TEST_URL.to_string(),
-            jwt: JWT.to_string(),
-        };
-
+        let config = get_remote_credentials();
         let status = get_status(mc, config).await;
 
         println!("{:?}", status);
@@ -367,11 +357,7 @@ mod tests {
             id: Id::Num(0),
         };
 
-        let config = RemoteNodeSection {
-            url: TEST_URL.to_string(),
-            jwt: JWT.to_string(),
-        };
-
+        let config = get_remote_credentials();
         let status = get_status(mc, config).await;
 
         println!("{:?}", status);

service/src/service/mod.rs

@@ -13,6 +13,9 @@ mod error;
 mod handlers;
 mod methods;
 
+#[cfg(test)]
+mod test_helper;
+
 fn jsonrpc_body() -> impl Filter<Extract = (Call,), Error = warp::Rejection> + Clone {
     // When accepting a body, we want a JSON body and to reject huge payloads)...
     const MAX_SIZE: u64 = 1024 * 16;

service/src/service/test_helper.rs

@@ -0,0 +1,22 @@
+#[cfg(test)]
+pub mod tests {
+    use crate::config::RemoteNodeSection;
+    use std::env;
+
+    pub fn get_remote_credentials() -> RemoteNodeSection {
+        const DEFAULT_TEST_URL: &str = "http://127.0.0.1:1234/rpc/v0";
+        const DEFAULT_JWT: &str = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJBbGxvdyI6WyJyZWFkIiwid3JpdGUiLCJzaWduIiwiYWRtaW4iXX0.xK1G26jlYnAEnGLJzN1RLywghc4p4cHI6ax_6YOv0aI";
+
+        let url = match env::var_os("LOTUS_SECRET_URL") {
+            Some(val) => String::from(val.to_string_lossy()),
+            None => DEFAULT_TEST_URL.to_string(),
+        };
+
+        let jwt = match env::var_os("LOTUS_SECRET_JWT") {
+            Some(val) => String::from(val.to_string_lossy()),
+            None => DEFAULT_JWT.to_string(),
+        };
+
+        RemoteNodeSection { url, jwt }
+    }
+}