chore(crypto): CRP-2664 remove mock canister from threshold-schnorr examples (#1105)

Author: altkdf

.github/workflows/rust-threshold-schnorr-example.yml

@@ -29,10 +29,7 @@ jobs:
         run: |
           dfx start --background
           pushd rust/threshold-schnorr
-          make deploy
-# This should be re-enabled when Pocket IC supports threshold Schnorr
-# sleep 10
-# make test
+          make test
   rust-threshold-schnorr-linux:
     runs-on: ubuntu-22.04
     steps:
@@ -45,7 +42,4 @@ jobs:
         run: |
           dfx start --background
           pushd rust/threshold-schnorr
-          make deploy
-# This should be re-enabled when Pocket IC supports threshold Schnorr
-# sleep 10
-# make test
+          make test

motoko/threshold-schnorr/Makefile

@@ -6,18 +6,9 @@ all: deploy
 deploy:
 	dfx deploy
 
-.PHONY: mock
-.SILENT: mock
-mock: deploy
-	SCHNORR_MOCK_CANISTER_ID=$(shell dfx canister id chainkey_testing_canister); \
-	SCHNORR_EXAMPLE_CANISTER_ID=$(shell dfx canister id schnorr_example_motoko); \
-	echo "Changing to using mock canister instead of management canister for signing"; \
-	CMD="dfx canister call "$${SCHNORR_EXAMPLE_CANISTER_ID}" for_test_only_change_management_canister_id '("\"$${SCHNORR_MOCK_CANISTER_ID}\"")'"; \
-	eval "$${CMD}"
-
 .PHONY: test
 .SILENT: test
-test: mock
+test: deploy
 	bash test.sh hellohellohellohellohellohello12
 
 .PHONY: clean

motoko/threshold-schnorr/README.md

@@ -76,8 +76,7 @@ make test
 
 - `npm install` installs test javascript dependencies
 - `make test` deploys and tests the canister code on the local version of the
-  IC, and also makes the canister call a mock canister for Schnorr API instead
-  of the management canister
+  IC
 
 
 ## Deploying the canister on the mainnet
@@ -93,22 +92,6 @@ Deploying to the Internet Computer requires
 [cycles](https://internetcomputer.org/docs/current/developer-docs/getting-started/tokens-and-cycles)
 (the equivalent of "gas" on other blockchains).
 
-#### Update management canister ID reference for testing
-
-The latest version of `dfx`, `v0.24.3`, does not yet support BIP341
-`opt_merkle_tree_root_hex` that is not `None`. Therefore, for local tests, [the
-chain-key testing canister](https://github.com/dfinity/chainkey-testing-canister)
-can be installed and used instead of the management canister. Note also that the
-chain-key testing canister is deployed on the mainnet and can be used for mainnet
-testing to reduce the costs, see the linked repo for more details.
-
-This sample canister allows the caller to change the management canister address
-for Schnorr by calling the `for_test_only_change_management_canister_id`
-endpoint with the target canister principal. With `dfx`, this can be done
-automatically with `make mock`, which will install the chain-key testing canister
-and use it instead of the management canister. Note that `dfx` should be running
-to successfully run `make mock`.
-
 ### Update source code with the right key ID
 
 To deploy the sample code, the canister needs the right key ID for the right environment. Specifically, one needs to replace the value of the `key_id` in the `src/schnorr_example_motoko/src/lib.rs` file of the sample code. Before deploying to mainnet, one should modify the code to use the right name of the `key_id`.

motoko/threshold-schnorr/dfx.json

@@ -5,11 +5,6 @@
       "package": "schnorr_example_motoko",
       "main": "src/schnorr_example_motoko/main.mo",
       "type": "motoko"
-    },
-    "chainkey_testing_canister": {
-      "type": "custom",
-      "candid": "https://github.com/dfinity/chainkey-testing-canister/releases/download/v0.1.0/chainkey_testing_canister.did",
-      "wasm": "https://github.com/dfinity/chainkey-testing-canister/releases/download/v0.1.0/chainkey_testing_canister.wasm.gz"
     }
   }
 }

motoko/threshold-schnorr/src/schnorr_example_motoko/main.mo

@@ -37,10 +37,6 @@ actor {
 
   var ic : IC = actor ("aaaaa-aa");
 
-  public func for_test_only_change_management_canister_id(mock_id : Text) {
-    ic := actor (mock_id);
-  };
-
   public shared ({ caller }) func public_key(algorithm : SchnorrAlgorithm) : async {
     #Ok : { public_key_hex : Text };
     #Err : Text;
@@ -49,7 +45,7 @@ actor {
       let { public_key } = await ic.schnorr_public_key({
         canister_id = null;
         derivation_path = [Principal.toBlob(caller)];
-        key_id = { algorithm; name = "insecure_test_key_1" };
+        key_id = { algorithm; name = "dfx_test_key" };
       });
       #Ok({ public_key_hex = Hex.encode(Blob.toArray(public_key)) });
     } catch (err) {
@@ -72,7 +68,7 @@ actor {
       let signArgs = {
         message = Text.encodeUtf8(message_arg);
         derivation_path = [Principal.toBlob(caller)];
-        key_id = { algorithm; name = "insecure_test_key_1" };
+        key_id = { algorithm; name = "dfx_test_key" };
         aux;
       };
       let { signature } = await ic.sign_with_schnorr(signArgs);