Fold ohttp relay into mailroom (payjoin#1409)

Author: spacebear21

.github/ISSUE_TEMPLATE/bug-general.yml

@@ -30,7 +30,6 @@ body:
         - payjoin-mailroom
         - payjoin-test-utils
         - payjoin-ffi
-        - ohttp-relay
   - type: dropdown
     attributes:
       label: How did you obtain this crate?

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -12,7 +12,6 @@ body:
         - payjoin-mailroom
         - payjoin-test-utils
         - payjoin-ffi
-        - ohttp-relay
   - type: textarea
     id: feature
     attributes:

.github/ISSUE_TEMPLATE/general.yml

@@ -11,7 +11,6 @@ body:
         - payjoin-mailroom
         - payjoin-test-utils
         - payjoin-ffi
-        - ohttp-relay
   - type: textarea
     id: question
     attributes:

.github/ISSUE_TEMPLATE/good-first-issue.yml

@@ -12,7 +12,6 @@ body:
         - payjoin-mailroom
         - payjoin-test-utils
         - payjoin-ffi
-        - ohttp-relay
   - type: markdown
     attributes:
       value: |

.github/workflows/rust.yml

@@ -33,7 +33,7 @@ jobs:
         uses: DeterminateSystems/magic-nix-cache-action@main
       - name: "Add nginxWithStream to PATH"
         run: |
-          # This is necessary for ohttp-relay integration tests
+          # This is necessary for payjoin-mailroom integration tests
           echo "$(nix build .#nginx-with-stream --print-out-paths --no-link)/bin" >> $GITHUB_PATH
       - name: "Use cache"
         uses: Swatinem/rust-cache@v2
@@ -93,7 +93,7 @@ jobs:
         uses: DeterminateSystems/magic-nix-cache-action@main
       - name: "Add nginxWithStream to PATH"
         run: |
-          # This is necessary for ohttp-relay integration tests
+          # This is necessary for payjoin-mailroom integration tests
           echo "$(nix build .#nginx-with-stream --print-out-paths --no-link)/bin" >> $GITHUB_PATH
       - name: "Use cache"
         uses: Swatinem/rust-cache@v2

Cargo-minimal.lock

@@ -2556,34 +2556,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "ohttp-relay"
-version = "0.0.11"
-dependencies = [
- "byteorder",
- "bytes",
- "futures",
- "hex-conservative 0.1.2",
- "http",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-util",
- "mockito",
- "rcgen 0.12.1",
- "reqwest",
- "rustls 0.23.31",
- "tempfile",
- "tokio",
- "tokio-rustls",
- "tokio-tungstenite",
- "tokio-util",
- "tower",
- "tracing",
- "tracing-subscriber",
- "uuid",
-]
-
 [[package]]
 name = "oid-registry"
 version = "0.8.1"
@@ -2867,31 +2839,42 @@ dependencies = [
  "bhttp",
  "bitcoin 0.32.8",
  "bitcoin-ohttp",
+ "byteorder",
+ "bytes",
  "clap 4.5.46",
  "config",
  "flate2",
  "futures",
+ "hex-conservative 0.1.2",
+ "http",
  "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-util",
  "ipnet",
  "maxminddb",
- "ohttp-relay",
+ "mockito",
  "opentelemetry",
  "opentelemetry-otlp",
  "opentelemetry_sdk",
  "payjoin",
  "payjoin-test-utils",
  "rand 0.8.5",
+ "rcgen 0.12.1",
  "reqwest",
  "rustls 0.23.31",
  "serde",
  "tempfile",
  "tokio",
  "tokio-listener",
+ "tokio-rustls",
  "tokio-rustls-acme",
  "tokio-stream",
+ "tokio-tungstenite",
  "tower",
  "tracing",
  "tracing-subscriber",
+ "uuid",
 ]
 
 [[package]]

Cargo-recent.lock

@@ -2556,34 +2556,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "ohttp-relay"
-version = "0.0.11"
-dependencies = [
- "byteorder",
- "bytes",
- "futures",
- "hex-conservative 0.1.2",
- "http",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-util",
- "mockito",
- "rcgen 0.12.1",
- "reqwest",
- "rustls 0.23.31",
- "tempfile",
- "tokio",
- "tokio-rustls",
- "tokio-tungstenite",
- "tokio-util",
- "tower",
- "tracing",
- "tracing-subscriber",
- "uuid",
-]
-
 [[package]]
 name = "oid-registry"
 version = "0.8.1"
@@ -2867,31 +2839,42 @@ dependencies = [
  "bhttp",
  "bitcoin 0.32.8",
  "bitcoin-ohttp",
+ "byteorder",
+ "bytes",
  "clap 4.5.46",
  "config",
  "flate2",
  "futures",
+ "hex-conservative 0.1.2",
+ "http",
  "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-util",
  "ipnet",
  "maxminddb",
- "ohttp-relay",
+ "mockito",
  "opentelemetry",
  "opentelemetry-otlp",
  "opentelemetry_sdk",
  "payjoin",
  "payjoin-test-utils",
  "rand 0.8.5",
+ "rcgen 0.12.1",
  "reqwest",
  "rustls 0.23.31",
  "serde",
  "tempfile",
  "tokio",
  "tokio-listener",
+ "tokio-rustls",
  "tokio-rustls-acme",
  "tokio-stream",
+ "tokio-tungstenite",
  "tower",
  "tracing",
  "tracing-subscriber",
+ "uuid",
 ]
 
 [[package]]

Cargo.toml

@@ -1,7 +1,6 @@
 [workspace]
 members = [
   "fuzz",
-  "ohttp-relay",
   "payjoin",
   "payjoin-cli",
   "payjoin-test-utils",
@@ -12,7 +11,6 @@ resolver = "2"
 
 [patch.crates-io]
 payjoin-fuzz = { path = "fuzz" }
-ohttp-relay = { path = "ohttp-relay" }
 payjoin = { path = "payjoin" }
 payjoin-mailroom = { path = "payjoin-mailroom" }
 payjoin-test-utils = { path = "payjoin-test-utils" }

README.md

@@ -39,7 +39,7 @@ A CLI tool which performs no-frills Payjoin. It is a reference implementation of
 
 ### [`payjoin-mailroom`](https://github.com/payjoin/rust-payjoin/tree/master/payjoin-mailroom)
 
-An [Oblivious HTTP (OHTTP) Relay](https://github.com/payjoin/rust-payjoin/tree/master/ohttp-relay) and a BIP77 [Payjoin Directory](https://github.com/payjoin/rust-payjoin/tree/master/payjoin-directory) combined in one binary.
+A combined [Oblivious HTTP (OHTTP)](https://en.wikipedia.org/wiki/Oblivious_HTTP) Relay and BIP77 Payjoin Directory in one binary.
 
 ### [`payjoin-test-utils`](https://github.com/payjoin/rust-payjoin/tree/master/payjoin-test-utils)
 

contrib/test.sh

@@ -24,7 +24,7 @@ if [ -f "$LOCKFILE" ]; then
 fi
 
 DEPS="recent minimal"
-CRATES="ohttp-relay payjoin payjoin-cli payjoin-ffi payjoin-mailroom"
+CRATES="payjoin payjoin-cli payjoin-ffi payjoin-mailroom"
 
 for dep in $DEPS; do
     cargo --version