Skip to content

Commit bc9bb18

Browse files
committed
Remove call to ticker_service on certificate_pending route
1 parent c9fab14 commit bc9bb18

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

mithril-aggregator/src/http_server/routes/certificate_routes.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ fn certificate_pending(
1818
warp::path!("certificate-pending")
1919
.and(warp::get())
2020
.and(middlewares::with_config(dependency_manager.clone()))
21-
.and(middlewares::with_ticker_service(dependency_manager.clone()))
2221
.and(middlewares::with_certificate_pending_store(
2322
dependency_manager,
2423
))
@@ -51,7 +50,6 @@ mod handlers {
5150
CertificatePendingStore, Configuration, ToCertificatePendingMessageAdapter,
5251
};
5352

54-
use mithril_common::TickerService;
5553
use slog_scope::{debug, warn};
5654
use std::convert::Infallible;
5755
use std::sync::Arc;
@@ -62,25 +60,16 @@ mod handlers {
6260
/// Certificate Pending
6361
pub async fn certificate_pending(
6462
config: Configuration,
65-
ticker_service: Arc<dyn TickerService>,
6663
certificate_pending_store: Arc<CertificatePendingStore>,
6764
) -> Result<impl warp::Reply, Infallible> {
6865
debug!("⇄ HTTP SERVER: certificate_pending");
6966

7067
let network =
7168
unwrap_to_internal_server_error!(config.get_network(), "certificate_pending::error");
72-
let time_point = unwrap_to_internal_server_error!(
73-
ticker_service.get_current_time_point().await,
74-
"certificate_pending::error"
75-
);
7669

7770
match certificate_pending_store.get().await {
7871
Ok(Some(certificate_pending)) => Ok(reply::json(
79-
&ToCertificatePendingMessageAdapter::adapt(
80-
certificate_pending,
81-
network,
82-
time_point.immutable_file_number,
83-
),
72+
&ToCertificatePendingMessageAdapter::adapt(certificate_pending, network, 0),
8473
StatusCode::OK,
8574
)),
8675
Ok(None) => Ok(reply::empty(StatusCode::NO_CONTENT)),
@@ -138,6 +127,7 @@ mod tests {
138127
use anyhow::anyhow;
139128
use mithril_common::{
140129
entities::CertificatePending,
130+
messages::CertificatePendingMessage,
141131
test_utils::{apispec::APISpec, fake_data},
142132
};
143133
use mithril_persistence::store::adapter::DumbStoreAdapter;
@@ -202,6 +192,12 @@ mod tests {
202192
&StatusCode::OK,
203193
)
204194
.unwrap();
195+
196+
let message: CertificatePendingMessage = serde_json::from_slice(response.body()).unwrap();
197+
198+
#[allow(deprecated)]
199+
let immutable_file_number = message.beacon.immutable_file_number;
200+
assert_eq!(0, immutable_file_number);
205201
}
206202

207203
#[tokio::test]

0 commit comments

Comments
 (0)