Revise

Author: casey

src/subcommand/server.rs

@@ -1492,10 +1492,10 @@ impl Server {
         return Ok(
           r::content_response(
             &server_config,
-            inscription,
             inscription_id,
             accept_encoding,
             sec_fetch_dest,
+            inscription,
           )?
           .ok_or_not_found(|| format!("inscription {inscription_id} content"))?
           .into_response(),

src/subcommand/server/r.rs

@@ -238,10 +238,10 @@ pub(super) async fn content(
     Ok(
       content_response(
         &server_config,
-        inscription,
         inscription_id,
         accept_encoding,
         sec_fetch_dest,
+        inscription,
       )?
       .ok_or_not_found(|| format!("inscription {inscription_id} content"))?
       .into_response(),
@@ -293,11 +293,10 @@ impl IntoResponse for ContentResponse {
 
 pub(crate) fn content_response(
   server_config: &ServerConfig,
-  // todo: Swap these?
-  inscription: Inscription,
   inscription_id: InscriptionId,
   accept_encoding: AcceptEncoding,
   sec_fetch_dest: SecFetchDest,
+  inscription: Inscription,
 ) -> ServerResult<Option<ContentResponse>> {
   if sec_fetch_dest == SecFetchDest::Document {
     return Ok(Some(ContentResponse {
@@ -649,10 +648,10 @@ pub(super) async fn undelegated_content(
     Ok(
       r::content_response(
         &server_config,
-        inscription,
         inscription_id,
         accept_encoding,
         sec_fetch_dest,
+        inscription,
       )?
       .ok_or_not_found(|| format!("inscription {inscription_id} content"))?
       .into_response(),
@@ -668,14 +667,14 @@ mod tests {
   fn content_response_no_content_type() {
     let content_response = r::content_response(
       &ServerConfig::default(),
+      inscription_id(0),
+      AcceptEncoding::default(),
+      SecFetchDest::Other,
       Inscription {
         content_type: None,
         body: Some(Vec::new()),
         ..default()
       },
-      inscription_id(0),
-      AcceptEncoding::default(),
-      SecFetchDest::Other,
     )
     .unwrap()
     .unwrap();
@@ -688,14 +687,14 @@ mod tests {
   fn content_response_bad_content_type() {
     let content_response = r::content_response(
       &ServerConfig::default(),
+      inscription_id(0),
+      AcceptEncoding::default(),
+      SecFetchDest::Other,
       Inscription {
         content_type: Some("\n".as_bytes().to_vec()),
         body: Some(Vec::new()),
         ..Default::default()
       },
-      inscription_id(0),
-      AcceptEncoding::default(),
-      SecFetchDest::Other,
     )
     .unwrap()
     .unwrap();
@@ -708,14 +707,14 @@ mod tests {
   fn content_response_no_content() {
     assert!(r::content_response(
       &ServerConfig::default(),
+      inscription_id(0),
+      AcceptEncoding::default(),
+      SecFetchDest::Other,
       Inscription {
         content_type: Some("text/plain".as_bytes().to_vec()),
         body: None,
         ..default()
       },
-      inscription_id(0),
-      AcceptEncoding::default(),
-      SecFetchDest::Other,
     )
     .unwrap()
     .is_none());
@@ -725,14 +724,14 @@ mod tests {
   fn content_response_with_content() {
     let response = r::content_response(
       &ServerConfig::default(),
+      inscription_id(0),
+      AcceptEncoding::default(),
+      SecFetchDest::Other,
       Inscription {
         content_type: Some("text/plain".as_bytes().to_vec()),
         body: Some(vec![1, 2, 3]),
         ..default()
       },
-      inscription_id(0),
-      AcceptEncoding::default(),
-      SecFetchDest::Other,
     )
     .unwrap()
     .unwrap();
@@ -745,14 +744,14 @@ mod tests {
   fn content_security_policy_no_origin() {
     let response = r::content_response(
       &ServerConfig::default(),
+      inscription_id(0),
+      AcceptEncoding::default(),
+      SecFetchDest::Other,
       Inscription {
         content_type: Some("text/plain".as_bytes().to_vec()),
         body: Some(vec![1, 2, 3]),
         ..default()
       },
-      inscription_id(0),
-      AcceptEncoding::default(),
-      SecFetchDest::Other,
     )
     .unwrap()
     .unwrap();
@@ -770,14 +769,14 @@ mod tests {
         csp_origin: Some("https://ordinals.com".into()),
         ..default()
       },
+      inscription_id(0),
+      AcceptEncoding::default(),
+      SecFetchDest::Other,
       Inscription {
         content_type: Some("text/plain".as_bytes().to_vec()),
         body: Some(vec![1, 2, 3]),
         ..default()
       },
-      inscription_id(0),
-      AcceptEncoding::default(),
-      SecFetchDest::Other,
     )
     .unwrap()
     .unwrap();