From 0f0214ff58f13c145b6dbdbe336db99e37348f77 Mon Sep 17 00:00:00 2001 From: Szilard Parrag Date: Tue, 9 May 2023 14:22:15 +0200 Subject: [PATCH] rename register_enclave to register_ias_enclave --- sidechain/src/tests.rs | 24 ++++----- teeracle/src/benchmarking.rs | 4 +- teeracle/src/tests.rs | 20 ++++---- teerex/src/benchmarking.rs | 6 +-- teerex/src/lib.rs | 6 +-- teerex/src/tests/skip_ias_check_tests.rs | 16 +++--- teerex/src/tests/test_cases.rs | 62 ++++++++++++------------ teerex/src/weights.rs | 6 +-- 8 files changed, 72 insertions(+), 72 deletions(-) diff --git a/sidechain/src/tests.rs b/sidechain/src/tests.rs index 7a481abd..56f05e7a 100644 --- a/sidechain/src/tests.rs +++ b/sidechain/src/tests.rs @@ -36,7 +36,7 @@ fn confirm_imported_sidechain_block_invalid_next_finalization_candidate() { let block_number = 1; - register_enclave7(); + register_ias_enclave7(); assert_err!( Sidechain::confirm_imported_sidechain_block( @@ -62,7 +62,7 @@ fn confirm_imported_sidechain_block_works_for_correct_shard() { let block_number = 1; let next_finalization_block_candidate = 20; - register_enclave7(); + register_ias_enclave7(); assert_ok!(Sidechain::confirm_imported_sidechain_block( RuntimeOrigin::signed(signer7.clone()), @@ -86,7 +86,7 @@ fn confirm_imported_sidechain_block_from_shard_neq_mrenclave_errs() { let signer7 = get_signer(TEST7_SIGNER_PUB); let shard4 = H256::from_slice(&TEST4_MRENCLAVE); - register_enclave7(); + register_ias_enclave7(); let block_number = 1; @@ -109,7 +109,7 @@ fn confirm_imported_sidechain_block_correct_order() { Timestamp::set_timestamp(TEST7_TIMESTAMP); let shard7 = H256::from_slice(&TEST7_MRENCLAVE); - register_enclave7(); + register_ias_enclave7(); assert_ok!(confirm_block7(1, 2, H256::random(), true)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 1); @@ -135,7 +135,7 @@ fn confirm_imported_sidechain_block_wrong_next() { Timestamp::set_timestamp(TEST7_TIMESTAMP); let shard7 = H256::from_slice(&TEST7_MRENCLAVE); - register_enclave7(); + register_ias_enclave7(); assert_ok!(confirm_block7(1, 2, H256::random(), true)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 1); @@ -161,7 +161,7 @@ fn confirm_imported_sidechain_block_outdated() { Timestamp::set_timestamp(TEST7_TIMESTAMP); let shard7 = H256::from_slice(&TEST7_MRENCLAVE); - register_enclave7(); + register_ias_enclave7(); assert_ok!(confirm_block7(1, 2, H256::random(), true)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 1); @@ -187,23 +187,23 @@ fn dont_process_confirmation_of_second_registered_enclave() { Timestamp::set_timestamp(TEST7_TIMESTAMP); let shard7 = H256::from_slice(&TEST7_MRENCLAVE); - register_enclave(TEST7_SIGNER_PUB, TEST7_CERT, 1); - register_enclave(TEST6_SIGNER_PUB, TEST6_CERT, 2); + register_ias_enclave(TEST7_SIGNER_PUB, TEST7_CERT, 1); + register_ias_enclave(TEST6_SIGNER_PUB, TEST6_CERT, 2); assert_ok!(confirm_block(shard7, TEST6_SIGNER_PUB, 1, 2, H256::default(), false)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 0); }) } -fn register_enclave7() { - register_enclave(TEST7_SIGNER_PUB, TEST7_CERT, 1); +fn register_ias_enclave7() { + register_ias_enclave(TEST7_SIGNER_PUB, TEST7_CERT, 1); } -fn register_enclave(signer_pub_key: &MrSigner, cert: &[u8], expected_enclave_count: u64) { +fn register_ias_enclave(signer_pub_key: &MrSigner, cert: &[u8], expected_enclave_count: u64) { let signer7 = get_signer(signer_pub_key); //Ensure that enclave is registered - assert_ok!(Teerex::::register_enclave( + assert_ok!(Teerex::::register_ias_enclave( RuntimeOrigin::signed(signer7), cert.to_vec(), URL.to_vec(), diff --git a/teeracle/src/benchmarking.rs b/teeracle/src/benchmarking.rs index bef4b14f..3a656eba 100644 --- a/teeracle/src/benchmarking.rs +++ b/teeracle/src/benchmarking.rs @@ -51,7 +51,7 @@ benchmarks! { let data_source: DataSource = "https://api.coingecko.com".into(); // simply register the enclave before to make sure it already // exists when running the benchmark - Teerex::::register_enclave( + Teerex::::register_ias_enclave( RawOrigin::Signed(signer.clone()).into(), TEST4_SETUP.cert.to_vec(), URL.to_vec() @@ -74,7 +74,7 @@ benchmarks! { vec![1].try_into().expect("Can Convert to OracleDataBlob; QED"); // simply register the enclave before to make sure it already // exists when running the benchmark - Teerex::::register_enclave( + Teerex::::register_ias_enclave( RawOrigin::Signed(signer.clone()).into(), TEST4_SETUP.cert.to_vec(), URL.to_vec() diff --git a/teeracle/src/tests.rs b/teeracle/src/tests.rs index b0a971d0..e1b55d1e 100644 --- a/teeracle/src/tests.rs +++ b/teeracle/src/tests.rs @@ -36,10 +36,10 @@ fn get_signer(pubkey: &[u8; 32]) -> AccountId { test_utils::get_signer(pubkey) } -fn register_enclave_and_add_oracle_to_whitelist_ok(src: &str) { +fn register_ias_enclave_and_add_oracle_to_whitelist_ok(src: &str) { Timestamp::set_timestamp(TEST4_TIMESTAMP); let signer = get_signer(TEST4_SIGNER_PUB); - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer), TEST4_CERT.to_vec(), URL.to_vec() @@ -61,7 +61,7 @@ fn update_exchange_rate_dot_dollars_ok(src: &str, rate: Option) { #[test] fn update_exchange_rate_works() { new_test_ext().execute_with(|| { - register_enclave_and_add_oracle_to_whitelist_ok(COINGECKO_SRC); + register_ias_enclave_and_add_oracle_to_whitelist_ok(COINGECKO_SRC); let rate = U32F32::from_num(43.65); update_exchange_rate_dot_dollars_ok(COINGECKO_SRC, Some(rate)); @@ -89,7 +89,7 @@ fn update_exchange_rate_works() { fn update_oracle_works() { new_test_ext().execute_with(|| { let signer = get_signer(TEST4_SIGNER_PUB); - register_enclave_and_add_oracle_to_whitelist_ok(&DataSource::from("Test_Source_Name")); + register_ias_enclave_and_add_oracle_to_whitelist_ok(&DataSource::from("Test_Source_Name")); let oracle_blob: crate::OracleDataBlob = vec![1].try_into().expect("Can Convert to BoundedVec; QED"); assert_ok!(Teeracle::update_oracle( @@ -118,7 +118,7 @@ fn update_oracle_works() { fn get_existing_exchange_rate_works() { new_test_ext().execute_with(|| { let rate = U32F32::from_num(43.65); - register_enclave_and_add_oracle_to_whitelist_ok(COINGECKO_SRC); + register_ias_enclave_and_add_oracle_to_whitelist_ok(COINGECKO_SRC); update_exchange_rate_dot_dollars_ok(COINGECKO_SRC, Some(rate)); assert_eq!( Teeracle::exchange_rate(DOT_USD_TRADING_PAIR.to_owned(), COINGECKO_SRC.to_owned()), @@ -144,7 +144,7 @@ fn get_inexisting_exchange_rate_is_zero() { #[test] fn update_exchange_rate_to_none_delete_exchange_rate() { new_test_ext().execute_with(|| { - register_enclave_and_add_oracle_to_whitelist_ok(COINGECKO_SRC); + register_ias_enclave_and_add_oracle_to_whitelist_ok(COINGECKO_SRC); let rate = U32F32::from_num(43.65); update_exchange_rate_dot_dollars_ok(COINGECKO_SRC, Some(rate)); @@ -165,7 +165,7 @@ fn update_exchange_rate_to_none_delete_exchange_rate() { #[test] fn update_exchange_rate_to_zero_delete_exchange_rate() { new_test_ext().execute_with(|| { - register_enclave_and_add_oracle_to_whitelist_ok(COINGECKO_SRC); + register_ias_enclave_and_add_oracle_to_whitelist_ok(COINGECKO_SRC); let rate = Some(U32F32::from_num(43.65)); update_exchange_rate_dot_dollars_ok(COINGECKO_SRC, rate); @@ -222,7 +222,7 @@ fn update_exchange_rate_from_not_whitelisted_oracle_fails() { new_test_ext().execute_with(|| { Timestamp::set_timestamp(TEST4_TIMESTAMP); let signer = get_signer(TEST4_SIGNER_PUB); - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec() @@ -246,7 +246,7 @@ fn update_oracle_from_not_whitelisted_oracle_fails() { new_test_ext().execute_with(|| { Timestamp::set_timestamp(TEST4_TIMESTAMP); let signer = get_signer(TEST4_SIGNER_PUB); - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec() @@ -267,7 +267,7 @@ fn update_oracle_from_not_whitelisted_oracle_fails() { #[test] fn update_exchange_rate_with_too_long_trading_pair_fails() { new_test_ext().execute_with(|| { - register_enclave_and_add_oracle_to_whitelist_ok(COINGECKO_SRC); + register_ias_enclave_and_add_oracle_to_whitelist_ok(COINGECKO_SRC); let rate = Some(U32F32::from_num(43.65)); let signer = get_signer(TEST4_SIGNER_PUB); diff --git a/teerex/src/benchmarking.rs b/teerex/src/benchmarking.rs index 2a15c7e8..172bc33a 100644 --- a/teerex/src/benchmarking.rs +++ b/teerex/src/benchmarking.rs @@ -60,17 +60,17 @@ benchmarks! { where_clause { where T::AccountId: From<[u8; 32]>, T::Hash: From<[u8; 32]>,} - // Benchmark `register_enclave` with the worst possible conditions: + // Benchmark `register_ias_enclave` with the worst possible conditions: // * remote attestation is valid // * enclave already exists - register_enclave { + register_ias_enclave { ensure_not_skipping_ra_check(); timestamp::Pallet::::set_timestamp(TEST4_SETUP.timestamp.checked_into().unwrap()); let signer: T::AccountId = get_signer(TEST4_SETUP.signer_pub); // simply register the enclave before to make sure it already // exists when running the benchmark - Teerex::::register_enclave( + Teerex::::register_ias_enclave( RawOrigin::Signed(signer.clone()).into(), TEST4_SETUP.cert.to_vec(), URL.to_vec() diff --git a/teerex/src/lib.rs b/teerex/src/lib.rs index 2eed3b4c..e6ad10e2 100644 --- a/teerex/src/lib.rs +++ b/teerex/src/lib.rs @@ -149,13 +149,13 @@ pub mod pallet { { // the integritee-service wants to register his enclave #[pallet::call_index(0)] - #[pallet::weight((::WeightInfo::register_enclave(), DispatchClass::Normal, Pays::Yes))] - pub fn register_enclave( + #[pallet::weight((::WeightInfo::register_ias_enclave(), DispatchClass::Normal, Pays::Yes))] + pub fn register_ias_enclave( origin: OriginFor, ra_report: Vec, worker_url: Vec, ) -> DispatchResultWithPostInfo { - log::info!("teerex: called into runtime call register_enclave()"); + log::info!("teerex: called into runtime call register_ias_enclave()"); let sender = ensure_signed(origin)?; ensure!(ra_report.len() <= MAX_RA_REPORT_LEN, >::RaReportTooLong); ensure!(worker_url.len() <= MAX_URL_LEN, >::EnclaveUrlTooLong); diff --git a/teerex/src/tests/skip_ias_check_tests.rs b/teerex/src/tests/skip_ias_check_tests.rs index 8df951e1..78122c27 100644 --- a/teerex/src/tests/skip_ias_check_tests.rs +++ b/teerex/src/tests/skip_ias_check_tests.rs @@ -34,9 +34,9 @@ fn test_enclave() -> Enclave> { } #[test] -fn register_enclave_with_empty_mrenclave_works() { +fn register_ias_enclave_with_empty_mrenclave_works() { new_test_ext().execute_with(|| { - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(AccountKeyring::Alice.to_account_id()), Vec::new(), URL.to_vec() @@ -48,9 +48,9 @@ fn register_enclave_with_empty_mrenclave_works() { } #[test] -fn register_enclave_with_mrenclave_works() { +fn register_ias_enclave_with_mrenclave_works() { new_test_ext().execute_with(|| { - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(AccountKeyring::Alice.to_account_id()), TEST4_MRENCLAVE.to_vec(), URL.to_vec() @@ -64,9 +64,9 @@ fn register_enclave_with_mrenclave_works() { } #[test] -fn register_enclave_with_faulty_mrenclave_inserts_default() { +fn register_ias_enclave_with_faulty_mrenclave_inserts_default() { new_test_ext().execute_with(|| { - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(AccountKeyring::Alice.to_account_id()), [1u8, 2].to_vec(), URL.to_vec() @@ -78,9 +78,9 @@ fn register_enclave_with_faulty_mrenclave_inserts_default() { } #[test] -fn register_enclave_with_empty_url_inserts_default() { +fn register_ias_enclave_with_empty_url_inserts_default() { new_test_ext().execute_with(|| { - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(AccountKeyring::Alice.to_account_id()), Vec::new(), Vec::new(), diff --git a/teerex/src/tests/test_cases.rs b/teerex/src/tests/test_cases.rs index 71f08333..48911d48 100644 --- a/teerex/src/tests/test_cases.rs +++ b/teerex/src/tests/test_cases.rs @@ -132,7 +132,7 @@ fn add_enclave_works() { // set the now in the runtime such that the remote attestation reports are within accepted range (24h) Timestamp::set_timestamp(TEST4_TIMESTAMP); let signer = get_signer(TEST4_SIGNER_PUB); - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer), TEST4_CERT.to_vec(), URL.to_vec() @@ -146,7 +146,7 @@ fn add_and_remove_enclave_works() { new_test_ext().execute_with(|| { Timestamp::set_timestamp(TEST4_TIMESTAMP); let signer = get_signer(TEST4_SIGNER_PUB); - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec() @@ -163,7 +163,7 @@ fn add_enclave_without_timestamp_fails() { new_test_ext().execute_with(|| { Timestamp::set_timestamp(0); let signer = get_signer(TEST4_SIGNER_PUB); - assert!(Teerex::register_enclave( + assert!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec(), @@ -185,7 +185,7 @@ fn list_enclaves_works() { url: URL.to_vec(), sgx_mode: SgxBuildMode::Debug, }; - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec(), @@ -232,7 +232,7 @@ fn remove_middle_enclave_works() { sgx_mode: SgxBuildMode::Debug, }; - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer5), TEST5_CERT.to_vec(), URL.to_vec(), @@ -241,7 +241,7 @@ fn remove_middle_enclave_works() { assert_eq!(list_enclaves(), vec![(1, e_1.clone())]); // add enclave 2 - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer6.clone()), TEST6_CERT.to_vec(), URL.to_vec(), @@ -252,7 +252,7 @@ fn remove_middle_enclave_works() { assert!(enclaves.contains(&(2, e_2.clone()))); // add enclave 3 - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer7), TEST7_CERT.to_vec(), URL.to_vec(), @@ -273,11 +273,11 @@ fn remove_middle_enclave_works() { } #[test] -fn register_enclave_with_different_signer_fails() { +fn register_ias_enclave_with_different_signer_fails() { new_test_ext().execute_with(|| { let signer = get_signer(TEST7_SIGNER_PUB); assert_err!( - Teerex::register_enclave( + Teerex::register_ias_enclave( RuntimeOrigin::signed(signer), TEST5_CERT.to_vec(), URL.to_vec() @@ -288,12 +288,12 @@ fn register_enclave_with_different_signer_fails() { } #[test] -fn register_enclave_with_to_old_attestation_report_fails() { +fn register_ias_enclave_with_to_old_attestation_report_fails() { new_test_ext().execute_with(|| { Timestamp::set_timestamp(TEST7_TIMESTAMP + TWENTY_FOUR_HOURS + 1); let signer = get_signer(TEST7_SIGNER_PUB); assert_err!( - Teerex::register_enclave( + Teerex::register_ias_enclave( RuntimeOrigin::signed(signer), TEST7_CERT.to_vec(), URL.to_vec(), @@ -304,11 +304,11 @@ fn register_enclave_with_to_old_attestation_report_fails() { } #[test] -fn register_enclave_with_almost_too_old_report_works() { +fn register_ias_enclave_with_almost_too_old_report_works() { new_test_ext().execute_with(|| { Timestamp::set_timestamp(TEST7_TIMESTAMP + TWENTY_FOUR_HOURS - 1); let signer = get_signer(TEST7_SIGNER_PUB); - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer), TEST7_CERT.to_vec(), URL.to_vec(), @@ -331,14 +331,14 @@ fn update_enclave_url_works() { sgx_mode: SgxBuildMode::Debug, }; - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec(), )); assert_eq!(Teerex::enclave(1).unwrap().url, URL.to_vec()); - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), url2.to_vec(), @@ -358,7 +358,7 @@ fn update_ipfs_hash_works() { let block_number = 3; let signer = get_signer(TEST4_SIGNER_PUB); - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec(), @@ -418,7 +418,7 @@ fn unshield_is_only_executed_once_for_the_same_call_hash() { let call_hash: H256 = H256::from([1u8; 32]); let bonding_account = get_signer(&TEST4_MRENCLAVE); - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec(), @@ -478,17 +478,17 @@ fn timestamp_callback_works() { }; //Register 3 enclaves: 5, 6 ,7 - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer5.clone()), TEST5_CERT.to_vec(), URL.to_vec(), )); - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer6.clone()), TEST6_CERT.to_vec(), URL.to_vec(), )); - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer7.clone()), TEST7_CERT.to_vec(), URL.to_vec(), @@ -541,7 +541,7 @@ fn debug_mode_enclave_attest_works_when_sgx_debug_mode_is_allowed() { }; //Register an enclave compiled in debug mode - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer4), TEST4_CERT.to_vec(), URL.to_vec(), @@ -567,7 +567,7 @@ fn production_mode_enclave_attest_works_when_sgx_debug_mode_is_allowed() { }; //Register an enclave compiled in production mode - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer8), TEST8_CERT.to_vec(), URL.to_vec(), @@ -586,7 +586,7 @@ fn debug_mode_enclave_attest_fails_when_sgx_debug_mode_not_allowed() { let signer4 = get_signer(TEST4_SIGNER_PUB); //Try to register an enclave compiled in debug mode assert_err!( - Teerex::register_enclave( + Teerex::register_ias_enclave( RuntimeOrigin::signed(signer4), TEST4_CERT.to_vec(), URL.to_vec(), @@ -610,7 +610,7 @@ fn production_mode_enclave_attest_works_when_sgx_debug_mode_not_allowed() { }; //Register an enclave compiled in production mode - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer8), TEST8_CERT.to_vec(), URL.to_vec(), @@ -631,7 +631,7 @@ fn verify_unshield_funds_works() { let incognito_account = INCOGNITO_ACCOUNT.to_vec(); //Register enclave - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer4.clone()), TEST4_CERT.to_vec(), URL.to_vec(), @@ -701,7 +701,7 @@ fn unshield_funds_from_enclave_neq_bonding_account_errs() { let not_bonding_account = get_signer(&TEST7_MRENCLAVE); //Ensure that enclave is registered - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer4.clone()), TEST4_CERT.to_vec(), URL.to_vec(), @@ -750,7 +750,7 @@ fn confirm_processed_parentchain_block_works() { let signer7 = get_signer(TEST7_SIGNER_PUB); //Ensure that enclave is registered - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer7.clone()), TEST7_CERT.to_vec(), URL.to_vec(), @@ -782,7 +782,7 @@ fn ensure_registered_enclave_works() { let signer6 = get_signer(TEST6_SIGNER_PUB); //Ensure that enclave is registered - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer4.clone()), TEST4_CERT.to_vec(), URL.to_vec(), @@ -804,7 +804,7 @@ fn publish_hash_works() { let signer4 = get_signer(TEST4_SIGNER_PUB); //Ensure that enclave is registered - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer4.clone()), TEST4_CERT.to_vec(), URL.to_vec(), @@ -876,7 +876,7 @@ fn publish_hash_with_too_many_topics_fails() { let signer4 = get_signer(TEST4_SIGNER_PUB); //Ensure that enclave is registered - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer4.clone()), TEST4_CERT.to_vec(), URL.to_vec(), @@ -906,7 +906,7 @@ fn publish_hash_with_too_much_data_fails() { let signer4 = get_signer(TEST4_SIGNER_PUB); //Ensure that enclave is registered - assert_ok!(Teerex::register_enclave( + assert_ok!(Teerex::register_ias_enclave( RuntimeOrigin::signed(signer4.clone()), TEST4_CERT.to_vec(), URL.to_vec(), diff --git a/teerex/src/weights.rs b/teerex/src/weights.rs index 95019d94..2bef51b6 100644 --- a/teerex/src/weights.rs +++ b/teerex/src/weights.rs @@ -50,7 +50,7 @@ use sp_std::marker::PhantomData; /// Weight functions needed for pallet_teerex. pub trait WeightInfo { - fn register_enclave() -> Weight; + fn register_ias_enclave() -> Weight; fn register_dcap_enclave() -> Weight; fn register_quoting_enclave() -> Weight; fn unregister_enclave() -> Weight; @@ -62,7 +62,7 @@ pub trait WeightInfo { /// Weights for pallet_teerex using the Integritee parachain node and recommended hardware. pub struct IntegriteeWeight(PhantomData); impl WeightInfo for IntegriteeWeight { - fn register_enclave() -> Weight { + fn register_ias_enclave() -> Weight { Weight::from_ref_time(1_969_500_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) @@ -101,7 +101,7 @@ impl WeightInfo for IntegriteeWeight { // For tests impl WeightInfo for () { - fn register_enclave() -> Weight { + fn register_ias_enclave() -> Weight { Weight::from_ref_time(1_969_500_000) .saturating_add(RocksDbWeight::get().reads(2)) .saturating_add(RocksDbWeight::get().writes(1))