From de4276202ad2be8a2e07f2a6f2f48d9c25cdc32c Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 19 Oct 2021 16:16:10 +0200
Subject: Improve CLI, adapt tests, update documentation

---
 src/model/block.rs  | 4 +++-
 src/model/garage.rs | 7 +------
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/model')

diff --git a/src/model/block.rs b/src/model/block.rs
index a1dcf776..1e04ee58 100644
--- a/src/model/block.rs
+++ b/src/model/block.rs
@@ -98,7 +98,9 @@ impl BlockManager {
 			.open_tree("block_local_resync_queue")
 			.expect("Unable to open block_local_resync_queue tree");
 
-		let endpoint = system.netapp.endpoint(format!("garage_model/block.rs/Rpc"));
+		let endpoint = system
+			.netapp
+			.endpoint("garage_model/block.rs/Rpc".to_string());
 
 		let block_manager = Arc::new(Self {
 			replication,
diff --git a/src/model/garage.rs b/src/model/garage.rs
index 482c4df7..d12c781f 100644
--- a/src/model/garage.rs
+++ b/src/model/garage.rs
@@ -57,14 +57,9 @@ impl Garage {
 		info!("Initialize membership management system...");
 		let system = System::new(
 			network_key,
-			config.metadata_dir.clone(),
 			background.clone(),
 			replication_mode.replication_factor(),
-			config.rpc_bind_addr,
-			config.rpc_public_addr,
-			config.bootstrap_peers.clone(),
-			config.consul_host.clone(),
-			config.consul_service_name.clone(),
+			&config,
 		);
 
 		let data_rep_param = TableShardedReplication {
-- 
cgit v1.2.3