Skip to content

DCAP: rename register_enclave to register_ias_enclave #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clangenb merged 1 commit into from
May 9, 2023
Merged

DCAP: rename register_enclave to register_ias_enclave #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions sidechain/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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()),
Expand All @@ -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;

Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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::<Test>::register_enclave(
assert_ok!(Teerex::<Test>::register_ias_enclave(
RuntimeOrigin::signed(signer7),
cert.to_vec(),
URL.to_vec(),
Expand Down
4 changes: 2 additions & 2 deletions teeracle/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::<T>::register_enclave(
Teerex::<T>::register_ias_enclave(
RawOrigin::Signed(signer.clone()).into(),
TEST4_SETUP.cert.to_vec(),
URL.to_vec()
Expand All @@ -74,7 +74,7 @@ benchmarks! {
vec![1].try_into().expect("Can Convert to OracleDataBlob<T>; QED");
// simply register the enclave before to make sure it already
// exists when running the benchmark
Teerex::<T>::register_enclave(
Teerex::<T>::register_ias_enclave(
RawOrigin::Signed(signer.clone()).into(),
TEST4_SETUP.cert.to_vec(),
URL.to_vec()
Expand Down
20 changes: 10 additions & 10 deletions teeracle/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -61,7 +61,7 @@ fn update_exchange_rate_dot_dollars_ok(src: &str, rate: Option<U32F32>) {
#[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));
Expand Down Expand Up @@ -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<Test> =
vec![1].try_into().expect("Can Convert to BoundedVec; QED");
assert_ok!(Teeracle::update_oracle(
Expand Down Expand Up @@ -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()),
Expand All @@ -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));

Expand All @@ -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);

Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions teerex/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::<T>::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::<T>::register_enclave(
Teerex::<T>::register_ias_enclave(
RawOrigin::Signed(signer.clone()).into(),
TEST4_SETUP.cert.to_vec(),
URL.to_vec()
Expand Down
6 changes: 3 additions & 3 deletions teerex/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,13 @@ pub mod pallet {
{
// the integritee-service wants to register his enclave
#[pallet::call_index(0)]
#[pallet::weight((<T as Config>::WeightInfo::register_enclave(), DispatchClass::Normal, Pays::Yes))]
pub fn register_enclave(
#[pallet::weight((<T as Config>::WeightInfo::register_ias_enclave(), DispatchClass::Normal, Pays::Yes))]
pub fn register_ias_enclave(
origin: OriginFor<T>,
ra_report: Vec<u8>,
worker_url: Vec<u8>,
) -> 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, <Error<T>>::RaReportTooLong);
ensure!(worker_url.len() <= MAX_URL_LEN, <Error<T>>::EnclaveUrlTooLong);
Expand Down
16 changes: 8 additions & 8 deletions teerex/src/tests/skip_ias_check_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ fn test_enclave() -> Enclave<AccountId, Vec<u8>> {
}

#[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()
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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(),
Expand Down
Loading