Skip to content

Commit d847ac8

Browse files
committed
fix http_server tests
1 parent 688a8a3 commit d847ac8

File tree

2 files changed

+2
-78
lines changed

2 files changed

+2
-78
lines changed

mithril-aggregator/src/http_server.rs

Lines changed: 1 addition & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ mod router {
7575
) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
7676
warp::path!("certificate-pending")
7777
.and(warp::get())
78-
.and(with_certificate_pending_store(dependency_manager.clone()))
78+
.and(with_certificate_pending_store(dependency_manager))
7979
.and_then(handlers::certificate_pending)
8080
}
8181

@@ -480,7 +480,6 @@ mod tests {
480480

481481
use crate::CertificatePendingStore;
482482

483-
use super::super::beacon_store::MockBeaconStore;
484483
use super::super::entities::*;
485484
use super::super::multi_signer::MockMultiSigner;
486485
use super::super::multi_signer::ProtocolError;
@@ -585,81 +584,6 @@ mod tests {
585584
.expect("OpenAPI error");
586585
}
587586

588-
#[tokio::test]
589-
async fn test_certificate_pending_get_ko_signers_500() {
590-
let fake_protocol_parameters = fake_data::protocol_parameters();
591-
let mut beacon_store = MockBeaconStore::new();
592-
beacon_store
593-
.expect_get_current_beacon()
594-
.return_once(|| Ok(Some(fake_data::beacon())));
595-
let mut mock_multi_signer = MockMultiSigner::new();
596-
mock_multi_signer
597-
.expect_get_protocol_parameters()
598-
.return_once(|| Some(fake_protocol_parameters.into()));
599-
mock_multi_signer
600-
.expect_get_signers()
601-
.return_once(|| Err(ProtocolError::Codec("an error occurred".to_string())));
602-
mock_multi_signer
603-
.expect_get_multi_signature()
604-
.return_once(|| Ok(None));
605-
let mut dependency_manager = setup_dependency_manager();
606-
dependency_manager
607-
.with_multi_signer(Arc::new(RwLock::new(mock_multi_signer)))
608-
.with_beacon_store(Arc::new(RwLock::new(beacon_store)));
609-
610-
let method = Method::GET.as_str();
611-
let path = "/certificate-pending";
612-
613-
let response = request()
614-
.method(method)
615-
.path(&format!("/{}{}", SERVER_BASE_PATH, path))
616-
.reply(&router::routes(Arc::new(dependency_manager)))
617-
.await;
618-
619-
APISpec::from_file(API_SPEC_FILE)
620-
.method(method)
621-
.path(path)
622-
.validate_request(&Null)
623-
.unwrap()
624-
.validate_response(&response)
625-
.expect("OpenAPI error");
626-
}
627-
628-
#[tokio::test]
629-
async fn test_certificate_pending_get_ko_protocol_parameters_500() {
630-
let mut beacon_store = MockBeaconStore::new();
631-
beacon_store
632-
.expect_get_current_beacon()
633-
.return_once(|| Ok(Some(fake_data::beacon())));
634-
let mut mock_multi_signer = MockMultiSigner::new();
635-
mock_multi_signer
636-
.expect_get_protocol_parameters()
637-
.return_once(|| None);
638-
mock_multi_signer
639-
.expect_get_multi_signature()
640-
.return_once(|| Ok(None));
641-
let mut dependency_manager = setup_dependency_manager();
642-
dependency_manager
643-
.with_multi_signer(Arc::new(RwLock::new(mock_multi_signer)))
644-
.with_beacon_store(Arc::new(RwLock::new(beacon_store)));
645-
646-
let method = Method::GET.as_str();
647-
let path = "/certificate-pending";
648-
649-
let response = request()
650-
.method(method)
651-
.path(&format!("/{}{}", SERVER_BASE_PATH, path))
652-
.reply(&router::routes(Arc::new(dependency_manager)))
653-
.await;
654-
APISpec::from_file(API_SPEC_FILE)
655-
.method(method)
656-
.path(path)
657-
.validate_request(&Null)
658-
.unwrap()
659-
.validate_response(&response)
660-
.expect("OpenAPI error");
661-
}
662-
663587
#[tokio::test]
664588
async fn test_certificate_certificate_hash_get_ok() {
665589
let mut certificate_store = CertificateStore::new(Box::new(DumbStoreAdapter::<

mithril-aggregator/src/store/pending_certificate_store.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use mithril_common::store::adapter::StoreAdapter;
55

66
type Adapter = Box<dyn StoreAdapter<Key = String, Record = CertificatePending>>;
77

8-
const KEY: &'static str = "certificate_pending";
8+
const KEY: &str = "certificate_pending";
99

1010
pub struct CertificatePendingStore {
1111
adapter: Adapter,

0 commit comments

Comments
 (0)