f Change pkg name to payjoin-defaults

.github/workflows/rust.yml

@@ -34,7 +34,7 @@ jobs:
       - name: test payjoin v1 integration
         run: cargo test --package payjoin --verbose --features=send,receive --test integration
       - name: test payjoin v2 integration
-        run: cargo test --package payjoin-io --verbose --features=danger-local-https,v2 --test integration
+        run: cargo test --package payjoin-defaults --verbose --features=danger-local-https,v2 --test integration
       - name: test payjoin-cli bin v1
         run: cargo test --package payjoin-cli --verbose --features=danger-local-https
       - name: build payjoin-cli bin v2

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["payjoin", "payjoin-cli", "payjoin-directory", "payjoin-io"]
+members = ["payjoin", "payjoin-cli", "payjoin-directory", "payjoin-defaults"]
 resolver = "2"
 
 [patch.crates-io.payjoin]

payjoin-cli/Cargo.toml

@@ -20,7 +20,7 @@ path = "src/main.rs"
 [features]
 native-certs = ["ureq/native-certs"]
 danger-local-https = ["rcgen", "rustls", "hyper-rustls"]
-v2 = ["payjoin/v2", "payjoin-io"]
+v2 = ["payjoin/v2", "payjoin-defaults/v2"]
 
 [dependencies]
 anyhow = "1.0.70"
@@ -40,7 +40,7 @@ serde = { version = "1.0.160", features = ["derive"] }
 tokio = { version = "1.12.0", features = ["full"] }
 ureq = "2.9.4"
 url = { version = "2.3.1", features = ["serde"] }
-payjoin-io = { path = "../payjoin-io", optional = true}
+payjoin-defaults = { path = "../payjoin-defaults", optional = true}
 
 [dev-dependencies]
 bitcoind = { version = "0.31.1", features = ["0_21_2"] }

payjoin-cli/src/app/v2.rs

@@ -310,7 +310,7 @@ async fn unwrap_ohttp_keys_or_else_fetch(config: AppConfig) -> Result<payjoin::O
         Ok(keys)
     } else {
         Ok(tokio::task::spawn_blocking(move || {
-            payjoin_io::fetch_ohttp_keys(config.ohttp_relay.clone(), config.pj_endpoint.clone())
+            payjoin_defaults::fetch_ohttp_keys(config.ohttp_relay.clone(), config.pj_endpoint.clone())
         })
         .await
         .map_err(|e| anyhow!("Failed to fetch ohttp keys: {}", e))??)

payjoin-io/Cargo.toml → payjoin-defaults/Cargo.toml

@@ -4,7 +4,7 @@ description = "IO utilities for Payjoin"
 edition = "2021"
 keywords = ["bip77", "payjoin", "bitcoin", "networking"]
 license = "MITNFA"
-name = "payjoin-io"
+name = "payjoin-defaults"
 readme = "README.md"
 repository = "https://github.com/payjoin/rust-payjoin"
 resolver = "2"

payjoin-io/README.md → payjoin-defaults/README.md

@@ -1,8 +1,8 @@
-# payjoin-io
+# payjoin-defaults
 
 This provides a collection of I/O utilities for working with the
 payjoin crate.  The payjoin crate only deals with the low-level
-protocol. payjoin-io provides sane defaults to make implementing
+protocol. payjoin-defaults provides sane defaults to make implementing
 payjoin easy.
 
 To learn more about payjoin, refer to [Payjoin Website](https://payjoin.org/).

payjoin-io/tests/integration.rs → payjoin-defaults/tests/integration.rs

@@ -357,7 +357,7 @@ mod integration {
             cert_der: Vec<u8>,
         ) -> Result<payjoin::OhttpKeys, BoxError> {
             let res = tokio::task::spawn_blocking(move || {
-                payjoin_io::fetch_ohttp_keys(ohttp_relay.clone(), directory.clone(), cert_der)
+                payjoin_defaults::fetch_ohttp_keys(ohttp_relay.clone(), directory.clone(), cert_der)
             })
             .await
             .map_err(|e| e.to_string())?