Skip to content

Commit 633afd9

Browse files
committed
Mark cfg(test) and fix builds.
1 parent cd0d82b commit 633afd9

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

rust/api/src/kv_store.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ use crate::types::{
44
ListKeyVersionsRequest, ListKeyVersionsResponse, PutObjectRequest, PutObjectResponse,
55
};
66
use async_trait::async_trait;
7+
#[cfg(test)]
78
use bytes::Bytes;
9+
#[cfg(test)]
810
use rand::distributions::Alphanumeric;
11+
#[cfg(test)]
912
use rand::{thread_rng, Rng};
1013

1114
pub const GLOBAL_VERSION_KEY: &str = "global_version";
@@ -74,6 +77,7 @@ macro_rules! define_kv_store_tests {
7477
}
7578

7679
#[async_trait]
80+
#[cfg(test)]
7781
pub(crate) trait KvStoreTestSuite {
7882
type Store: KvStore + 'static;
7983

@@ -555,12 +559,14 @@ pub(crate) trait KvStoreTestSuite {
555559
}
556560
}
557561

562+
#[cfg(test)]
558563
pub struct TestContext<'a> {
559564
kv_store: &'a dyn KvStore,
560565
user_token: String,
561566
store_id: String,
562567
}
563568

569+
#[cfg(test)]
564570
impl<'a> TestContext<'a> {
565571
pub fn new(kv_store: &'a dyn KvStore) -> Self {
566572
let store_id: String = (0..7).map(|_| thread_rng().sample(Alphanumeric) as char).collect();
@@ -621,6 +627,7 @@ impl<'a> TestContext<'a> {
621627
}
622628
}
623629

630+
#[cfg(test)]
624631
fn kv(key: &str, value: &str, version: i64) -> KeyValue {
625632
KeyValue { key: key.to_string(), version, value: Bytes::from(value.to_string()) }
626633
}

rust/server/src/main.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
use hyper::service::Service;
2-
use prost::Message;
31
use std::net::SocketAddr;
42

53
use tokio::net::TcpListener;
@@ -9,10 +7,9 @@ use hyper::server::conn::http1;
97
use hyper_util::rt::TokioIo;
108

119
use crate::vss_service::VssService;
12-
use api::auth::NoopAuthorizer;
10+
use api::auth::{Authorizer, NoopAuthorizer};
1311
use api::kv_store::KvStore;
1412
use impls::postgres_store::PostgresBackendImpl;
15-
use std::str::FromStr;
1613
use std::sync::Arc;
1714

1815
pub(crate) mod vss_service;
@@ -51,7 +48,7 @@ fn main() {
5148
match res {
5249
Ok((stream, _)) => {
5350
let io_stream = TokioIo::new(stream);
54-
let vss_service = VssService::new(Arc::clone(&store) as Arc<dyn KvStore>,authorizer );
51+
let vss_service = VssService::new(Arc::clone(&store) as Arc<dyn KvStore>, Arc::clone(&authorizer) as Arc<dyn Authorizer>);
5552
runtime.spawn(async move {
5653
if let Err(err) = http1::Builder::new().serve_connection(io_stream, vss_service).await {
5754
eprintln!("Failed to serve connection: {}", err);

0 commit comments

Comments
 (0)