fixup: install-code feature

Author: Hans Larsen

dfx/src/lib/api_client.rs

@@ -183,9 +183,13 @@ pub fn install_code(
             arg: arg.unwrap_or_else(|| Blob(vec![])),
         },
     )
-    .and_then(|response| match response.error_for_status() {
-        Ok(_) => ok(()),
-        Err(e) => err(DfxError::from(e)),
+    .and_then(|response| {
+        result(
+            response
+                .error_for_status()
+                .map(|_| ())
+                .map_err(DfxError::from),
+        )
     })
 }
 
@@ -399,4 +403,96 @@ mod tests {
             Err(e) => assert!(false, format!("{:#?}", e)),
         }
     }
+
+    #[test]
+    fn install_code_request_serialization() {
+        use serde_cbor::Value;
+        use std::convert::TryInto;
+
+        let canister_id = 1;
+        let module = Blob(vec![1]);
+        let arg = Blob(vec![2]);
+
+        let request = SubmitRequest::InstallCode {
+            canister_id,
+            module,
+            arg,
+        };
+
+        let actual: Value = serde_cbor::from_slice(&serde_cbor::to_vec(&request).unwrap()).unwrap();
+
+        let expected = Value::Map(
+            vec![
+                (
+                    Value::Text("request_type".to_string()),
+                    Value::Text("install_code".to_string()),
+                ),
+                (
+                    Value::Text("canister_id".to_string()),
+                    Value::Integer(canister_id.try_into().unwrap()),
+                ),
+                (Value::Text("module".to_string()), Value::Bytes(vec![1])),
+                (Value::Text("arg".to_string()), Value::Bytes(vec![2])),
+            ]
+            .into_iter()
+            .collect(),
+        );
+
+        assert_eq!(actual, expected);
+    }
+
+    #[test]
+    fn install_code_response_replied() {
+        let _ = env_logger::try_init();
+
+        let _m = mock("POST", "/api/v1/submit")
+            .with_status(200)
+            .with_header("content-type", "application/cbor")
+            .create();
+
+        let client = Client::new(ClientConfig {
+            url: mockito::server_url(),
+        });
+
+        let future = install_code(client, 1, Blob(vec![1]), None);
+
+        let mut runtime = tokio::runtime::Runtime::new().expect("Unable to create a runtime");
+        let result = runtime.block_on(future);
+
+        _m.assert();
+
+        match result {
+            Ok(()) => {}
+            Err(e) => assert!(false, format!("{:#?}", e)),
+        }
+    }
+
+    #[test]
+    fn install_code_response_rejected() {
+        let _ = env_logger::try_init();
+
+        let _m = mock("POST", "/api/v1/submit")
+            .with_status(400)
+            .with_header("content-type", "application/cbor")
+            .create();
+
+        let client = Client::new(ClientConfig {
+            url: mockito::server_url(),
+        });
+
+        let future = install_code(client, 1, Blob(vec![1]), None);
+
+        let mut runtime = tokio::runtime::Runtime::new().expect("Unable to create a runtime");
+        let result = runtime.block_on(future);
+
+        _m.assert();
+
+        match result {
+            Ok(()) => assert!(false, "Install succeeded."),
+            Err(e) => match e {
+                DfxError::Reqwest(_err) => (),
+                _ => assert!(false, format!("{:#?}", e)),
+            },
+        }
+    }
 }