Merge #561: Use explicit error in integration test

70e30ea Use explicit error in integration test (0xb10c)

Pull request description:

  Fix the `getorphantxs` test to explicitly state the error types.

  Taken out of #490 and redundant parts removed.

  Co-authored-by: 0xb10c <b10c@b10c.me>

ACKs for top commit:
  tcharding:
    ACK 70e30ea

Tree-SHA512: 4924a4763b772cc8ecc978bc2db6360670beb5fe76d0ab9eb920b2cb24a912aa9d276e8df1be4a224663f9c243fe32a50e61be3095e62e5b54593d18c3b5ff3e

Author: tcharding

integration_test/tests/hidden.rs

@@ -150,9 +150,15 @@ fn hidden__get_orphan_txs__modelled() {
     let json_v2: GetOrphanTxsVerboseTwo =
         node2.client.get_orphan_txs_verbosity_2().expect("getorphantxs 2");
 
-    let model_v0: mtype::GetOrphanTxs = json_v0.into_model().unwrap();
-    let model_v1: mtype::GetOrphanTxsVerboseOne = json_v1.into_model().unwrap();
-    let model_v2: mtype::GetOrphanTxsVerboseTwo = json_v2.into_model().unwrap();
+    let model_v0: Result<mtype::GetOrphanTxs, GetOrphanTxsError> = json_v0.into_model();
+    let model_v1: Result<mtype::GetOrphanTxsVerboseOne, GetOrphanTxsVerboseOneEntryError> =
+        json_v1.into_model();
+    let model_v2: Result<mtype::GetOrphanTxsVerboseTwo, GetOrphanTxsVerboseTwoEntryError> =
+        json_v2.into_model();
+
+    let model_v0 = model_v0.unwrap();
+    let model_v1 = model_v1.unwrap();
+    let model_v2 = model_v2.unwrap();
 
     assert_eq!(model_v0.0.len(), NUM_ORPHANS as usize);
     assert_eq!(model_v1.0.len(), NUM_ORPHANS as usize);