nuking redundant encryption e2e tests

AztecProtocol · Sep 27, 2024 · 2b6b3ca · 2b6b3ca
1 parent 8ac788a
commit 2b6b3ca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 120 deletions.
diff --git a/noir-projects/noir-contracts/contracts/test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test_contract/src/main.nr
@@ -13,10 +13,7 @@ contract Test {
     use dep::aztec::encrypted_logs::encrypted_note_emission::encode_and_encrypt_note;
     use dep::aztec::encrypted_logs::encrypted_event_emission::encode_and_encrypt_event_with_randomness;
 
-    use dep::aztec::protocol_types::{constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, traits::Serialize, point::Point, scalar::Scalar};
-
-    use dep::aztec::encrypted_logs::header::EncryptedLogHeader;
-    use dep::aztec::encrypted_logs::payload::{compute_incoming_body_ciphertext, compute_outgoing_body_ciphertext};
+    use dep::aztec::protocol_types::{constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, traits::Serialize, point::Point};
 
     use dep::aztec::note::constants::MAX_NOTES_PER_PAGE;
     use dep::aztec::keys::getters::get_public_keys;
@@ -34,9 +31,8 @@ contract Test {
     use dep::token_portal_content_hash_lib::{get_mint_private_content_hash, get_mint_public_content_hash};
     use dep::value_note::value_note::ValueNote;
     // TODO investigate why the macros require EmbeddedCurvePoint and EmbeddedCurveScalar
-    use std::embedded_curve_ops::{EmbeddedCurveScalar, EmbeddedCurvePoint, fixed_base_scalar_mul as derive_public_key};
+    use std::embedded_curve_ops::{EmbeddedCurveScalar, EmbeddedCurvePoint};
     use std::meta::derive;
-    use std::aes128::aes128_encrypt;
 
     use crate::test_note::TestNote;
 
@@ -400,45 +396,6 @@ contract Test {
         assert(context.version() == version, "Invalid version");
     }
 
-    #[private]
-    fn encrypt(input: [u8; 64], iv: [u8; 16], key: [u8; 16]) -> [u8; 80] {
-        aes128_encrypt(input, iv, key).as_array()
-    }
-
-    #[private]
-    fn encrypt_with_padding(input: [u8; 65], iv: [u8; 16], key: [u8; 16]) -> [u8; 80] {
-        aes128_encrypt(input, iv, key).as_array()
-    }
-
-    #[private]
-    fn compute_note_header_ciphertext(secret: Scalar, ivpk: IvpkM) -> [u8; 48] {
-        EncryptedLogHeader::new(context.this_address()).compute_ciphertext(secret, ivpk)
-    }
-
-    // 64 bytes + 32 * #fields + 16 = 112 bytes
-    #[private]
-    fn compute_incoming_log_body_ciphertext(
-        secret: Scalar,
-        ivpk: IvpkM,
-        storage_slot: Field,
-        value: Field
-    ) -> [u8; 112] {
-        let note = TestNote::new(value);
-        let plaintext = note.to_be_bytes(storage_slot);
-        compute_incoming_body_ciphertext(plaintext, secret, ivpk).as_array()
-    }
-
-    #[private]
-    fn compute_outgoing_log_body_ciphertext(
-        eph_sk: Scalar,
-        recipient: AztecAddress,
-        recipient_ivpk: IvpkM,
-        ovsk_app: Scalar
-    ) -> [u8; 144] {
-        let eph_pk = derive_public_key(eph_sk);
-        compute_outgoing_body_ciphertext(recipient, recipient_ivpk, ovsk_app, eph_sk, eph_pk)
-    }
-
     #[public]
     fn assert_public_global_vars(
         chain_id: Field,

diff --git a/noir-projects/noir-contracts/contracts/test_log_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test_log_contract/src/main.nr
@@ -4,10 +4,9 @@ use dep::aztec::macros::aztec;
 contract TestLog {
     use std::meta::derive;
     use dep::aztec::prelude::PrivateSet;
-    use dep::aztec::protocol_types::{scalar::Scalar, address::AztecAddress, traits::Serialize};
-    use dep::aztec::keys::{getters::get_public_keys, public_keys::IvpkM};
+    use dep::aztec::protocol_types::{address::AztecAddress, traits::Serialize};
+    use dep::aztec::keys::getters::get_public_keys;
     use dep::value_note::value_note::ValueNote;
-    use dep::aztec::encrypted_logs::payload::compute_incoming_body_ciphertext;
     use dep::aztec::encrypted_logs::encrypted_event_emission::encode_and_encrypt_event_with_randomness;
     use dep::aztec::unencrypted_logs::unencrypted_event_emission::encode_event;
     use dep::aztec::macros::{storage::storage, events::event, functions::{private, public}};
@@ -36,19 +35,6 @@ contract TestLog {
     // EXAMPLE_EVENT_0_BYTES_LEN + 16
     global EXAMPLE_EVENT_0_CIPHERTEXT_BYTES_LEN = 144;
 
-    #[private]
-    fn compute_incoming_log_body_ciphertext(
-        secret: Scalar,
-        ivpk: IvpkM,
-        randomness: Field,
-        event_type_id: Field,
-        preimage: [Field; 2]
-    ) -> [u8; EXAMPLE_EVENT_0_CIPHERTEXT_BYTES_LEN] {
-        let event = ExampleEvent0 { value0: preimage[0], value1: preimage[1] };
-        let plaintext = event.private_to_be_bytes(randomness);
-        compute_incoming_body_ciphertext(plaintext, secret, ivpk).as_array()
-    }
-
     #[private]
     fn emit_encrypted_events(other: AztecAddress, randomness: [Field; 2], preimages: [Field; 4]) {
         let event0 = ExampleEvent0 { value0: preimages[0], value1: preimages[1] };

diff --git a/yarn-project/end-to-end/Earthfile b/yarn-project/end-to-end/Earthfile
@@ -72,10 +72,6 @@ e2e-deploy-contract:
   LOCALLY
   RUN ./scripts/e2e_test.sh ./src/e2e_deploy_contract
 
-e2e-encryption:
-  LOCALLY
-  RUN ./scripts/e2e_test.sh ./src/e2e_encryption.test.ts
-
 e2e-escrow-contract:
   LOCALLY
   RUN ./scripts/e2e_test.sh ./src/e2e_escrow_contract.test.ts

diff --git a/yarn-project/end-to-end/src/e2e_encryption.test.ts b/yarn-project/end-to-end/src/e2e_encryption.test.ts