Skip to content

Commit a8a9006

Browse files
sanducbsanducb
authored
Merge pull request #19 from interledger/18-update-response-types-to-include-all-fields
fix: update incoming and outgoing payments response types w/ missing fields
2 parents 96051e0 + 3b33063 commit a8a9006

File tree

21 files changed

+42
-44
lines changed

21 files changed

+42
-44
lines changed

‎src/client/core.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ impl AuthenticatedOpenPaymentsClient {
7878
let http_client = ReqwestClient::new();
7979

8080
let signing_key = load_or_generate_key(&config.private_key_path).map_err(|e| {
81-
OpClientError::Signature(format!("Failed to load or generate signing key: {}", e))
81+
OpClientError::Signature(format!("Failed to load or generate signing key: {e}"))
8282
})?;
8383

8484
if let Some(ref jwks_path) = config.jwks_path {
8585
let jwks_json = Jwk::generate_jwks_json(&signing_key, &config.key_id);
8686
Jwk::save_jwks(&jwks_json, jwks_path).map_err(|e| {
87-
OpClientError::Signature(format!("Failed to save JWK to file: {}", e))
87+
OpClientError::Signature(format!("Failed to save JWK to file: {e}"))
8888
})?;
8989
}
9090

‎src/client/error.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ impl From<reqwest::Error> for OpClientError {
125125
/// This implementation allows the client to automatically convert reqwest errors
126126
/// into the unified error type, providing consistent error handling across the library.
127127
fn from(err: reqwest::Error) -> Self {
128-
OpClientError::Http(format!("{}", err))
128+
OpClientError::Http(format!("{err}"))
129129
}
130130
}
131131

‎src/client/request.rs‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,8 @@ impl AuthenticatedRequest<'_> {
136136
if let Some(token) = access_token {
137137
req.headers_mut().insert(
138138
"Authorization",
139-
format!("GNAP {}", token).parse().map_err(|e| {
140-
OpClientError::HeaderParse(format!(
141-
"Failed to parse authorization header: {}",
142-
e
143-
))
139+
format!("GNAP {token}").parse().map_err(|e| {
140+
OpClientError::HeaderParse(format!("Failed to parse authorization header: {e}"))
144141
})?,
145142
);
146143
}
@@ -149,13 +146,13 @@ impl AuthenticatedRequest<'_> {
149146
req.headers_mut().insert(
150147
"Content-Length",
151148
content_length.to_string().parse().map_err(|e| {
152-
OpClientError::HeaderParse(format!("Failed to parse content length: {}", e))
149+
OpClientError::HeaderParse(format!("Failed to parse content length: {e}"))
153150
})?,
154151
);
155152
req.headers_mut().insert(
156153
"Content-Digest",
157154
content_digest.parse().map_err(|e| {
158-
OpClientError::HeaderParse(format!("Failed to parse content digest: {}", e))
155+
OpClientError::HeaderParse(format!("Failed to parse content digest: {e}"))
159156
})?,
160157
);
161158
}
@@ -165,13 +162,13 @@ impl AuthenticatedRequest<'_> {
165162
req.headers_mut().insert(
166163
"Signature",
167164
signature.parse().map_err(|e| {
168-
OpClientError::HeaderParse(format!("Failed to parse signature header: {}", e))
165+
OpClientError::HeaderParse(format!("Failed to parse signature header: {e}"))
169166
})?,
170167
);
171168
req.headers_mut().insert(
172169
"Signature-Input",
173170
signature_input.parse().map_err(|e| {
174-
OpClientError::HeaderParse(format!("Failed to parse signature input header: {}", e))
171+
OpClientError::HeaderParse(format!("Failed to parse signature input header: {e}"))
175172
})?,
176173
);
177174

@@ -196,20 +193,18 @@ impl AuthenticatedRequest<'_> {
196193
// Convert to http::Request for signing
197194
let mut http_req = Request::new(self.body.clone());
198195
*http_req.method_mut() = HttpMethod::from_bytes(req.method().as_str().as_bytes())
199-
.map_err(|e| OpClientError::HeaderParse(format!("Converting HTTP method: {}", e)))?;
196+
.map_err(|e| OpClientError::HeaderParse(format!("Converting HTTP method: {e}")))?;
200197
*http_req.uri_mut() = req
201198
.url()
202199
.as_str()
203200
.parse()
204-
.map_err(|e| OpClientError::HeaderParse(format!("Converting URL to URI: {}", e)))?;
201+
.map_err(|e| OpClientError::HeaderParse(format!("Converting URL to URI: {e}")))?;
205202

206203
for (key, value) in req.headers() {
207-
let header_name = HeaderName::from_bytes(key.as_str().as_bytes()).map_err(|e| {
208-
OpClientError::HeaderParse(format!("Converting header name: {}", e))
209-
})?;
210-
let header_value = HeaderValue::from_bytes(value.as_bytes()).map_err(|e| {
211-
OpClientError::HeaderParse(format!("Converting header value: {}", e))
212-
})?;
204+
let header_name = HeaderName::from_bytes(key.as_str().as_bytes())
205+
.map_err(|e| OpClientError::HeaderParse(format!("Converting header name: {e}")))?;
206+
let header_value = HeaderValue::from_bytes(value.as_bytes())
207+
.map_err(|e| OpClientError::HeaderParse(format!("Converting header value: {e}")))?;
213208
http_req.headers_mut().insert(header_name, header_value);
214209
}
215210

@@ -246,7 +241,7 @@ impl AuthenticatedRequest<'_> {
246241
let mut hasher = Sha512::new();
247242
hasher.update(body.as_bytes());
248243
let digest = general_purpose::STANDARD.encode(hasher.finalize());
249-
let content_digest = format!("sha-512=:{}:", digest);
244+
let content_digest = format!("sha-512=:{digest}:");
250245

251246
Some((content_length, content_digest))
252247
}

‎src/client/utils.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pub fn get_resource_server_url(wallet_address_url: &str) -> Result<String> {
4848
if resource_server_path.is_empty() {
4949
resource_url.set_path("/");
5050
} else {
51-
resource_url.set_path(&format!("/{}", resource_server_path));
51+
resource_url.set_path(&format!("/{resource_server_path}"));
5252
}
5353

5454
Ok(resource_url.to_string())

‎src/http_signature/examples/generate_signature.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ fn main() -> Result<(), HttpSignatureError> {
1313
*request.uri_mut() = Uri::from_static("http://example.com/");
1414
request.headers_mut().insert(
1515
"Content-Type",
16-
"application/json".parse().map_err(|e| {
17-
HttpSignatureError::Other(format!("Failed to parse content type: {}", e))
18-
})?,
16+
"application/json"
17+
.parse()
18+
.map_err(|e| HttpSignatureError::Other(format!("Failed to parse content type: {e}")))?,
1919
);
2020

2121
// Generate a signing key

‎src/http_signature/signatures.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ fn create_signature_base_string(
6464
.unwrap_or(""),
6565
_ => "",
6666
};
67-
parts.push(format!("\"{}\": {}", component, value));
67+
parts.push(format!("\"{component}\": {value}"));
6868
}
6969

7070
let sig_params = format!(
@@ -73,7 +73,7 @@ fn create_signature_base_string(
7373
created,
7474
keyid
7575
);
76-
parts.push(format!("\"@signature-params\": {}", sig_params));
76+
parts.push(format!("\"@signature-params\": {sig_params}"));
7777

7878
parts.join("\n")
7979
}

‎src/http_signature/validation.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn create_signature_base_string(
5757
.unwrap_or(""),
5858
_ => "",
5959
};
60-
parts.push(format!("\"{}\": {}", component, value));
60+
parts.push(format!("\"{component}\": {value}"));
6161
}
6262

6363
let sig_params = format!(
@@ -66,7 +66,7 @@ fn create_signature_base_string(
6666
created,
6767
keyid
6868
);
69-
parts.push(format!("\"@signature-params\": {}", sig_params));
69+
parts.push(format!("\"@signature-params\": {sig_params}"));
7070

7171
parts.join("\n")
7272
}

‎src/snippets/grant/outgoing_payment.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ async fn main() -> open_payments::client::Result<()> {
7777
interact,
7878
continue_,
7979
} => {
80-
println!("Received interact: {:#?}", interact);
81-
println!("Received continue: {:#?}", continue_);
80+
println!("Received interact: {interact:#?}");
81+
println!("Received continue: {continue_:#?}");
8282
}
8383
}
8484

‎src/snippets/incoming_payment/complete.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ async fn main() -> open_payments::client::Result<()> {
1515
.complete(&incoming_payment_url, Some(&gnap_token))
1616
.await?;
1717

18-
println!("Completed incoming payment: {:#?}", payment);
18+
println!("Completed incoming payment: {payment:#?}");
1919
Ok(())
2020
}

‎src/snippets/incoming_payment/create.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ async fn main() -> open_payments::client::Result<()> {
4242
.create(&resource_server_url, &request, Some(&gnap_token))
4343
.await?;
4444

45-
println!("Created incoming payment: {:#?}", payment);
45+
println!("Created incoming payment: {payment:#?}");
4646
Ok(())
4747
}

0 commit comments

Comments
 (0)