From bd1618e78e4c4305a73bdd40004de2abe46c3ceb Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Sat, 18 Apr 2020 19:30:05 +0200
Subject: Remove proto.rs & move some definitions out of data.rs

---
 src/server.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/server.rs')

diff --git a/src/server.rs b/src/server.rs
index 57faea21..099e087e 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -2,6 +2,7 @@ use std::io::{Read, Write};
 use std::net::SocketAddr;
 use std::path::PathBuf;
 use std::sync::Arc;
+use std::time::Duration;
 
 pub use futures_util::future::FutureExt;
 use serde::Deserialize;
@@ -10,12 +11,16 @@ use tokio::sync::watch;
 use crate::api_server;
 use crate::background::*;
 use crate::block::*;
+use crate::block_ref_table::*;
 use crate::data::*;
 use crate::error::Error;
 use crate::membership::System;
-use crate::proto::*;
+use crate::object_table::*;
 use crate::rpc_server::RpcServer;
 use crate::table::*;
+use crate::version_table::*;
+
+pub const DEFAULT_TIMEOUT: Duration = Duration::from_secs(10);
 
 #[derive(Deserialize, Debug, Clone)]
 pub struct Config {
-- 
cgit v1.2.3