From 23666c01b29178d3d8dbe2f7c1e94f2acb1a0b7a Mon Sep 17 00:00:00 2001
From: Linwei Shang <linwei.shang@dfinity.org>
Date: Thu, 26 Oct 2023 12:07:28 -0400
Subject: [PATCH] refactor management example

---
 examples/management_canister/dfx.json         |  8 ------
 .../management_canister/src/caller/lib.rs     |  2 +-
 examples/management_canister/tests/basic.bats | 25 +++++++++++++------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/examples/management_canister/dfx.json b/examples/management_canister/dfx.json
index bdcaab5f6..1420a1204 100644
--- a/examples/management_canister/dfx.json
+++ b/examples/management_canister/dfx.json
@@ -7,13 +7,5 @@
       "wasm": "target/wasm32-unknown-unknown/release/caller-opt.wasm",
       "build": "sh ../build.sh management_canister caller"
     }
-  },
-  "defaults": {
-    "canister_http": {
-      "enabled": true
-    },
-    "bitcoin": {
-      "enabled": true
-    }
   }
 }
\ No newline at end of file
diff --git a/examples/management_canister/src/caller/lib.rs b/examples/management_canister/src/caller/lib.rs
index 00aba3ec4..f170175f2 100644
--- a/examples/management_canister/src/caller/lib.rs
+++ b/examples/management_canister/src/caller/lib.rs
@@ -129,7 +129,7 @@ mod bitcoin {
         assert!(response.is_err());
         if let Err((rejection_code, rejection_reason)) = response {
             assert_eq!(rejection_code, RejectionCode::CanisterReject);
-            assert_eq!(&rejection_reason, "bitcoin_send_transaction failed: Can't deserialize transaction because it's malformed.");
+            assert_eq!(&rejection_reason, "send_transaction failed: MalformedTransaction");
         };
     }
 }
diff --git a/examples/management_canister/tests/basic.bats b/examples/management_canister/tests/basic.bats
index 86146adf2..aa9fdf7ec 100644
--- a/examples/management_canister/tests/basic.bats
+++ b/examples/management_canister/tests/basic.bats
@@ -1,20 +1,29 @@
 # Executed before each test.
 setup() {
   cd examples/management_canister
-  bitcoind -regtest -daemonwait
-  # Make sure the directory is clean.
-  dfx start --clean --background
 }
 
 # executed after each test
 teardown() {
   dfx stop
-  bitcoin-cli -regtest stop
 }
 
-@test "All management canister methods succeed" {
+@test "http_request example succeed" {
+  dfx start --clean --background --enable-canister-http
+  dfx deploy
+  dfx canister call caller http_request_example
+}
+
+@test "ecdsa methods succeed" {
+  dfx start --clean --background
+  dfx deploy
+  dfx canister call caller execute_ecdsa_methods
+}
+
+@test "bitcoin methods succeed" {
+  bitcoind -regtest -daemonwait
+  dfx start --clean --background --enable-bitcoin
   dfx deploy
-  run dfx canister call caller http_request_example
-  run dfx canister call caller execute_ecdsa_methods
-  run dfx canister call caller execute_bitcoin_methods
+  dfx canister call caller execute_bitcoin_methods
+  bitcoin-cli -regtest stop
 }