Clean up tests

soroban-sdk/src/tests/crypto.rs

@@ -2,48 +2,21 @@ use crate::{self as soroban_sdk};
 use crate::{bytes, bytesn, env::internal::U32Val, Bytes, BytesN, Env, IntoVal, Val};
 use soroban_sdk::{contract, contractimpl};
 
-#[contract]
-pub struct TestCryptoContract;
-
-#[contractimpl]
-impl TestCryptoContract {
-    pub fn keccak256(env: Env, bytes: Bytes) -> BytesN<32> {
-        env.crypto().keccak256(&bytes)
-    }
-
-    pub fn recover_key_ecdsa_secp256k1(
-        env: Env,
-        message: Bytes,
-        signature: BytesN<64>,
-        recovery_id: U32Val,
-    ) -> Bytes {
-        env.crypto()
-            .recover_key_ecdsa_secp256k1(&message, &signature, recovery_id)
-    }
-}
-
 #[test]
 fn test_keccak256() {
     let env = Env::default();
-    let contract_id = env.register_contract(None, TestCryptoContract);
-    let client = TestCryptoContractClient::new(&env, &contract_id);
 
     let bytes = b"test vector for soroban".into_val(&env);
-
-    assert_eq!(
-        client.keccak256(&bytes),
-        bytesn!(
-            &env,
-            0x352fe2eaddf44eb02eb3eab1f8d6ff4ba426df4f1734b1e3f210d621ee8853d9
-        )
+    let expect = bytesn!(
+        &env,
+        0x352fe2eaddf44eb02eb3eab1f8d6ff4ba426df4f1734b1e3f210d621ee8853d9
     );
+    assert_eq!(env.crypto().keccak256(&bytes), expect);
 }
 
 #[test]
 fn test_recover_key_ecdsa_secp256k1() {
     let env = Env::default();
-    let contract_id = env.register_contract(None, TestCryptoContract);
-    let client = TestCryptoContractClient::new(&env, &contract_id);
 
     // From ethereum: https://github.com/ethereum/go-ethereum/blob/master/crypto/secp256k1/secp256_test.go
 
@@ -63,7 +36,8 @@ fn test_recover_key_ecdsa_secp256k1() {
     );
     let recovery_id = Val::from_u32(1);
     assert_eq!(
-        client.recover_key_ecdsa_secp256k1(&message_digest, &signature, &recovery_id),
+        env.crypto()
+            .recover_key_ecdsa_secp256k1(&message_digest, &signature, recovery_id),
         public_key
     );
 }