Fold ohttp-relay into rust-payjoin monorepo by spacebear21 · Pull Request #1215 · payjoin/rust-payjoin

spacebear21 · 2025-12-05T18:40:34Z

Used Claude to run the git subtree command and clean up the workspace files.

Pull Request Checklist

Please confirm the following before requesting review:

I have disclosed my use of
AI
in the body of this PR.
I have read CONTRIBUTING.md and rebased my branch to produce hygienic commits.

git-subtree-dir: ohttp-relay git-subtree-split: 7bda6bd31f1131116affab93139764d098b032f5

Co-authored-by: Dan Gould <d@ngould.dev> Co-authored-by: Yuval Kogman <nothingmuch@woobling.org> Co-authored-by: benalleng <benalleng@gmail.com> Co-authored-by: Carl Dong <accounts@carldong.me> Co-authored-by: J. Azad EMERY <25751709+ethicnology@users.noreply.github.com> Co-authored-by: zealsham <shammahagwor@gmail.com>

Typos found by codespell: https://github.com/payjoin/rust-payjoin/actions/runs/19972598118/job/57280811383?pr=1215

Fix lint errors emitted when running: `cargo clippy --all-targets --keep-going --all-features -- -D warnings`

coveralls · 2025-12-09T03:48:52Z

Pull Request Test Coverage Report for Build 20071170359

Details

664 of 839 (79.14%) changed or added relevant lines in 8 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage decreased (-0.3%) to 83.176%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
ohttp-relay/src/bootstrap/connect.rs	16	19	84.21%
ohttp-relay/src/gateway_uri.rs	97	101	96.04%
ohttp-relay/src/bootstrap/ws.rs	57	83	68.67%
ohttp-relay/src/lib.rs	122	152	80.26%
ohttp-relay/src/main.rs	0	30	0.0%
ohttp-relay/src/error.rs	0	34	0.0%
ohttp-relay/src/gateway_prober.rs	367	415	88.43%

Totals
Change from base Build 20071111877:	-0.3%
Covered Lines:	9665
Relevant Lines:	11620

💛 - Coveralls

benalleng

Probably worth considering adding nixpkg channel as a workflow matrix so we can update it more easily in the future

benalleng · 2025-12-09T16:24:21Z

+      - name: "Install nix"
+        uses: cachix/install-nix-action@v25
+        with:
+          nix_path: nixpkgs=channel:nixos-23.11


We should probably update the nix channel here to 25.11

benalleng

Ack aaad1df

nothingmuch · 2025-12-09T17:09:46Z

+        # This is necessary for ohttp-relay integration tests
+      - name: "Add nginxWithStream to PATH"
+        run: |
+          nix build .#nginx-with-stream -o nginx


although -o is more stable than the usual result, i would suggest using

Suggested change

nix build .#nginx-with-stream -o nginx

echo "$( nix build .#nginx-wiith-stream --print-out-paths )/bin" >> $GITHUB_PATH

nothingmuch · 2025-12-09T17:13:18Z

+      - name: "Install nix"
+        uses: cachix/install-nix-action@v25
+        with:
+          nix_path: nixpkgs=channel:nixos-25.11
+        # This is necessary for ohttp-relay integration tests


(these are mainly notes for tomorrow's call)

determinate nix installer is flake based, so no need to specify a channel:

https://github.com/DeterminateSystems/nix-installer-action

and we can add caching with github's caching api:

https://github.com/DeterminateSystems/magic-nix-cache-action

which would be very useful for nix build and nix flake check of our own stuff

relatedly, we probably also want https://github.com/DeterminateSystems/flake-checker-action and https://github.com/DeterminateSystems/update-flake-lock

nothingmuch · 2025-12-09T17:16:24Z

                cargo-watch
                rust-analyzer
                dart
+                nginxWithStream


this kinda slows down cold starting a devshell since it must be compiled, so hopefully we can prioritize removing it before too long by replacing with tokio-rustls-acme much like the directory

nothingmuch · 2025-12-09T17:57:53Z

              doCheck = true;
              dontFixup = true;
              installPhase = "mkdir $out";
            }


this needs nginx as a native build input and the nginx.conf.template file for the flake checks to pass, opening a PR to fix

spacebear21 changed the title ~~Ohttp relay monorepo~~ Fold ohttp-relay into rust-payjoin monorepo Dec 5, 2025

spacebear21 force-pushed the ohttp-relay-monorepo branch from 1f715fb to bf87f9e Compare December 5, 2025 18:59

spacebear21 mentioned this pull request Dec 9, 2025

Payjoin Mailroom Tracking Issue #941

Open

29 tasks

spacebear21 and others added 4 commits December 8, 2025 22:33

Squashed 'ohttp-relay/' content from commit 7bda6bd3

85696ee

git-subtree-dir: ohttp-relay git-subtree-split: 7bda6bd31f1131116affab93139764d098b032f5

Fix typos

c229db6

Typos found by codespell: https://github.com/payjoin/rust-payjoin/actions/runs/19972598118/job/57280811383?pr=1215

Fix lints

1f3afc7

Fix lint errors emitted when running: `cargo clippy --all-targets --keep-going --all-features -- -D warnings`

spacebear21 force-pushed the ohttp-relay-monorepo branch from bf87f9e to 63b7e87 Compare December 9, 2025 03:36

Add nginx-with-stream to top-level nix flake

2beb297

spacebear21 force-pushed the ohttp-relay-monorepo branch from 63b7e87 to a9feb45 Compare December 9, 2025 03:43

spacebear21 marked this pull request as ready for review December 9, 2025 03:47

spacebear21 requested review from benalleng and zealsham December 9, 2025 03:47

benalleng requested changes Dec 9, 2025

View reviewed changes

Add ohttp-relay to rust-payjoin workspace

aaad1df

spacebear21 force-pushed the ohttp-relay-monorepo branch from a9feb45 to aaad1df Compare December 9, 2025 16:40

benalleng approved these changes Dec 9, 2025

View reviewed changes

spacebear21 merged commit e0c4174 into payjoin:master Dec 9, 2025
10 checks passed

nothingmuch reviewed Dec 9, 2025

View reviewed changes

benalleng mentioned this pull request Dec 18, 2025

Use Cargo-recent.lock and Cargo-minimal.lock like rust-payjoin to ease MSRV pins payjoin/ohttp-relay#43

Closed

nothingmuch mentioned this pull request Dec 18, 2025

[Migrated from ohttp-relay] - Cannot build v0.0.11 in Docker due to Rust versioning issues #1239

Closed

1 task

benalleng mentioned this pull request Dec 19, 2025

[WIP] flake updates payjoin/ohttp-relay#48

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fold ohttp-relay into rust-payjoin monorepo#1215

Fold ohttp-relay into rust-payjoin monorepo#1215
spacebear21 merged 6 commits intopayjoin:masterfrom
spacebear21:ohttp-relay-monorepo

spacebear21 commented Dec 5, 2025

Uh oh!

coveralls commented Dec 9, 2025 •

edited

Loading

Uh oh!

benalleng left a comment •

edited

Loading

Uh oh!

benalleng Dec 9, 2025

Uh oh!

benalleng left a comment

Uh oh!

Uh oh!

nothingmuch Dec 9, 2025

Uh oh!

nothingmuch Dec 9, 2025

Uh oh!

nothingmuch Dec 9, 2025

Uh oh!

nothingmuch Dec 9, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	nix build .#nginx-with-stream -o nginx
	echo "$( nix build .#nginx-wiith-stream --print-out-paths )/bin" >> $GITHUB_PATH

Conversation

spacebear21 commented Dec 5, 2025

Uh oh!

coveralls commented Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Test Coverage Report for Build 20071170359

Details

💛 - Coveralls

Uh oh!

benalleng left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

benalleng Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

benalleng left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nothingmuch Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

nothingmuch Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

nothingmuch Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

nothingmuch Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

coveralls commented Dec 9, 2025 •

edited

Loading

benalleng left a comment •

edited

Loading