From f1ab2caa089bb27124c46c302853f7abdb3248a6 Mon Sep 17 00:00:00 2001
From: notplants <max@mfowler.info>
Date: Wed, 6 Jul 2022 12:39:55 +0200
Subject: [PATCH] Fix golgi imports

---
 Cargo.lock               | 26 ++++----------------------
 peach-config/Cargo.toml  |  3 +--
 peach-config/src/main.rs |  3 ++-
 peach-lib/Cargo.toml     |  3 +--
 4 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c3b84ee..bfaf051 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1079,25 +1079,7 @@ dependencies = [
 [[package]]
 name = "golgi"
 version = "0.1.4"
-source = "git+https://git.coopcloud.tech/golgi-ssb/golgi.git#ca4c1114ddf328b818144c5a1af0187b1357e9be"
-dependencies = [
- "async-std",
- "async-stream 0.3.3",
- "base64 0.13.0",
- "futures 0.3.21",
- "hex",
- "kuska-handshake",
- "kuska-sodiumoxide",
- "kuska-ssb",
- "log 0.4.17",
- "serde 1.0.137",
- "serde_json",
- "sha2",
-]
-
-[[package]]
-name = "golgi"
-version = "0.1.5"
+source = "git+https://git.coopcloud.tech/golgi-ssb/golgi#ca4c1114ddf328b818144c5a1af0187b1357e9be"
 dependencies = [
  "async-std",
  "async-stream 0.3.3",
@@ -2223,7 +2205,7 @@ dependencies = [
  "async-std",
  "clap",
  "env_logger 0.6.2",
- "golgi 0.1.5",
+ "golgi",
  "lazy_static",
  "log 0.4.17",
  "peach-lib",
@@ -2265,7 +2247,7 @@ dependencies = [
  "chrono",
  "dirs 4.0.0",
  "fslock",
- "golgi 0.1.5",
+ "golgi",
  "jsonrpc-client-core",
  "jsonrpc-client-http",
  "jsonrpc-core 8.0.1",
@@ -2359,7 +2341,7 @@ dependencies = [
  "dirs 4.0.0",
  "env_logger 0.8.4",
  "futures 0.3.21",
- "golgi 0.1.4",
+ "golgi",
  "lazy_static",
  "log 0.4.17",
  "maud",
diff --git a/peach-config/Cargo.toml b/peach-config/Cargo.toml
index acfbc4c..ee34f61 100644
--- a/peach-config/Cargo.toml
+++ b/peach-config/Cargo.toml
@@ -37,6 +37,5 @@ log = "0.4"
 lazy_static = "1.4.0"
 peach-lib = { path = "../peach-lib" }
 rpassword = "5.0"
-#golgi = { git = "https://git.coopcloud.tech/golgi-ssb/golgi.git" }
-golgi = { path = "../../golgi" }
+golgi = { git = "https://git.coopcloud.tech/golgi-ssb/golgi.git" }
 async-std = "1.10.0"
diff --git a/peach-config/src/main.rs b/peach-config/src/main.rs
index bc7c86f..289b7ff 100644
--- a/peach-config/src/main.rs
+++ b/peach-config/src/main.rs
@@ -57,7 +57,8 @@ enum PeachConfig {
     #[structopt(name = "whoami")]
     WhoAmI,
 
-    /// Publish domain and port
+    /// Publish domain and port.
+    /// It takes an address argument of the form host:port
     #[structopt(name = "publish-address")]
     PublishAddress(PublishAddressOpts),
 }
diff --git a/peach-lib/Cargo.toml b/peach-lib/Cargo.toml
index 5ffc87b..ee14e50 100644
--- a/peach-lib/Cargo.toml
+++ b/peach-lib/Cargo.toml
@@ -9,8 +9,7 @@ async-std = "1.10"
 chrono = "0.4"
 dirs = "4.0"
 fslock="0.1"
-#golgi = { git = "https://git.coopcloud.tech/golgi-ssb/golgi" }
-golgi = { path = "../../golgi" }
+golgi = { git = "https://git.coopcloud.tech/golgi-ssb/golgi" }
 jsonrpc-client-core = "0.5"
 jsonrpc-client-http = "0.5"
 jsonrpc-core = "8.0"