Skip to content

Commit df2d907

Browse files
authored
[Prover Service] Cleanups and improvements to the existing tests (#106)
* [Prover Service] Remove playground.rs tests. * [Prover Service] Pass over training_wheels.rs and add failure test. * [Prover Service] Reshuffle common test code. * [Prover Service] Clean ups to smoke tests. * [Prover Service] Rename smoke.rs -> prover_handler.rs * [Prover Service] Clean up to test utils. * [Prover Service] Clean up to test types.rs
1 parent 1879cd5 commit df2d907

File tree

11 files changed

+557
-686
lines changed

11 files changed

+557
-686
lines changed

prover-service/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,6 @@ tokio = { workspace = true }
5353

5454
[dev-dependencies]
5555
aptos-time-service = { workspace = true, features = ["testing"] }
56+
57+
[package.metadata.cargo-machete]
58+
ignored = ["hex"]

prover-service/src/tests/common/mod.rs

Lines changed: 0 additions & 185 deletions
This file was deleted.

prover-service/src/tests/common/rsa.rs

Lines changed: 0 additions & 89 deletions
This file was deleted.

prover-service/src/tests/federated_jwk.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use crate::external_resources::jwk_fetcher::{
44
get_federated_jwk, AUTH0_ISSUER_NAME, AUTH0_REGEX_STR, COGNITO_ISSUER_NAME, COGNITO_REGEX_STR,
55
};
66
use crate::external_resources::jwk_types::{FederatedJWKIssuerInterface, FederatedJWKs, KeyID};
7-
use crate::tests::common::gen_test_jwk_keypair_with_kid_override;
8-
use crate::tests::common::types::{ProofTestCase, TestJWTPayload};
7+
use crate::tests::types::{ProofTestCase, TestJWTPayload};
8+
use crate::tests::utils;
99
use aptos_keyless_common::input_processing::jwt::DecodedJWT;
1010
use aptos_types::jwks::rsa::{INSECURE_TEST_RSA_JWK, RSA_JWK};
1111
use regex::Regex;
@@ -189,7 +189,7 @@ async fn test_federated_jwk_fetch_fails_for_missing_kid() {
189189
fn get_decoded_jwt(kid: &str, jwt_payload: TestJWTPayload) -> DecodedJWT {
190190
// Create the prover request input
191191
let testcase = ProofTestCase::default_with_payload(jwt_payload).compute_nonce();
192-
let jwk_keypair = gen_test_jwk_keypair_with_kid_override(kid);
192+
let jwk_keypair = utils::generate_test_jwk_keypair_with_kid(kid);
193193
let prover_request_input = testcase.convert_to_prover_request(&jwk_keypair);
194194

195195
// Return the decoded JWT

prover-service/src/tests/mod.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// Copyright (c) Aptos Foundation
2-
3-
pub mod common;
42
pub mod federated_jwk;
53
pub mod jwk_fetcher;
6-
pub mod playground;
4+
pub mod prover_handler;
75
pub mod request_handler;
8-
pub mod smoke;
96
pub mod training_wheels;
7+
pub mod types;
8+
pub mod utils;

0 commit comments

Comments
 (0)