Rename to new

src/inscriptions/inscription.rs

@@ -25,16 +25,7 @@ pub struct Inscription {
 }
 
 impl Inscription {
- #[cfg(test)]
- pub(crate) fn new(content_type: Option<Vec<u8>>, body: Option<Vec<u8>>) -> Self {
- Self {
- content_type,
- body,
- ..default()
- }
- }
-
- pub(crate) fn from(
+ pub(crate) fn new(
  chain: Chain,
  compress: bool,
  delegate: Option<InscriptionId>,
@@ -778,7 +769,7 @@ mod tests {
 
  write!(file, "foo").unwrap();
 
- let inscription = Inscription::from(
+ let inscription = Inscription::new(
  Chain::Mainnet,
  false,
  None,
@@ -793,7 +784,7 @@ mod tests {
 
  assert_eq!(inscription.pointer, None);
 
- let inscription = Inscription::from(
+ let inscription = Inscription::new(
  Chain::Mainnet,
  false,
  None,
@@ -808,7 +799,7 @@ mod tests {
 
  assert_eq!(inscription.pointer, Some(Vec::new()));
 
- let inscription = Inscription::from(
+ let inscription = Inscription::new(
  Chain::Mainnet,
  false,
  None,
@@ -823,7 +814,7 @@ mod tests {
 
  assert_eq!(inscription.pointer, Some(vec![1]));
 
- let inscription = Inscription::from(
+ let inscription = Inscription::new(
  Chain::Mainnet,
  false,
  None,

src/subcommand/server.rs

@@ -3165,7 +3165,12 @@ mod tests {
  3,
  0,
  0,
- Inscription::new(None, Some("hello".as_bytes().into())).to_witness(),
+ Inscription {
+ content_type: None,
+ body: Some("hello".as_bytes().into()),
+ ..default()
+ }
+ .to_witness(),
  )],
  ..default()
  });
@@ -4013,7 +4018,11 @@ mod tests {
  fn content_response_no_content() {
  assert_eq!(
  Server::content_response(
- Inscription::new(Some("text/plain".as_bytes().to_vec()), None),
+ Inscription {
+ content_type: Some("text/plain".as_bytes().to_vec()),
+ body: None,
+ ..default()
+ },
  AcceptEncoding::default(),
  &ServerConfig::default(),
  )
@@ -4025,7 +4034,11 @@ mod tests {
  #[test]
  fn content_response_with_content() {
  let (headers, body) = Server::content_response(
- Inscription::new(Some("text/plain".as_bytes().to_vec()), Some(vec![1, 2, 3])),
+ Inscription {
+ content_type: Some("text/plain".as_bytes().to_vec()),
+ body: Some(vec![1, 2, 3]),
+ ..default()
+ },
  AcceptEncoding::default(),
  &ServerConfig::default(),
  )
@@ -4039,7 +4052,11 @@ mod tests {
  #[test]
  fn content_security_policy_no_origin() {
  let (headers, _) = Server::content_response(
- Inscription::new(Some("text/plain".as_bytes().to_vec()), Some(vec![1, 2, 3])),
+ Inscription {
+ content_type: Some("text/plain".as_bytes().to_vec()),
+ body: Some(vec![1, 2, 3]),
+ ..default()
+ },
  AcceptEncoding::default(),
  &ServerConfig::default(),
  )
@@ -4055,7 +4072,11 @@ mod tests {
  #[test]
  fn content_security_policy_with_origin() {
  let (headers, _) = Server::content_response(
- Inscription::new(Some("text/plain".as_bytes().to_vec()), Some(vec![1, 2, 3])),
+ Inscription {
+ content_type: Some("text/plain".as_bytes().to_vec()),
+ body: Some(vec![1, 2, 3]),
+ ..default()
+ },
  AcceptEncoding::default(),
  &ServerConfig {
  csp_origin: Some("https://ordinals.com".into()),
@@ -4146,7 +4167,11 @@ mod tests {
  #[test]
  fn content_response_no_content_type() {
  let (headers, body) = Server::content_response(
- Inscription::new(None, Some(Vec::new())),
+ Inscription {
+ content_type: None,
+ body: Some(Vec::new()),
+ ..default()
+ },
  AcceptEncoding::default(),
  &ServerConfig::default(),
  )
@@ -4160,7 +4185,11 @@ mod tests {
  #[test]
  fn content_response_bad_content_type() {
  let (headers, body) = Server::content_response(
- Inscription::new(Some("\n".as_bytes().to_vec()), Some(Vec::new())),
+ Inscription {
+ content_type: Some("\n".as_bytes().to_vec()),
+ body: Some(Vec::new()),
+ ..Default::default()
+ },
  AcceptEncoding::default(),
  &ServerConfig::default(),
  )
@@ -4510,7 +4539,12 @@ mod tests {
  1,
  0,
  0,
- Inscription::new(Some("foo/bar".as_bytes().to_vec()), None).to_witness(),
+ Inscription {
+ content_type: Some("foo/bar".as_bytes().to_vec()),
+ body: None,
+ ..default()
+ }
+ .to_witness(),
  )],
  ..default()
  });
@@ -4539,7 +4573,12 @@ mod tests {
  1,
  0,
  0,
- Inscription::new(Some("image/png".as_bytes().to_vec()), None).to_witness(),
+ Inscription {
+ content_type: Some("image/png".as_bytes().to_vec()),
+ body: None,
+ ..default()
+ }
+ .to_witness(),
  )],
  ..default()
  });

src/subcommand/wallet/inscribe.rs

@@ -59,7 +59,7 @@ impl Inscribe {
  }],
  dry_run: self.shared.dry_run,
  etching: None,
- inscriptions: vec![Inscription::from(
+ inscriptions: vec![Inscription::new(
  chain,
  self.shared.compress,
  self.delegate,

src/test.rs

@@ -93,7 +93,11 @@ impl From<InscriptionTemplate> for Inscription {
 }
 
 pub(crate) fn inscription(content_type: &str, body: impl AsRef<[u8]>) -> Inscription {
- Inscription::new(Some(content_type.into()), Some(body.as_ref().into()))
+ Inscription {
+ content_type: Some(content_type.into()),
+ body: Some(body.as_ref().into()),
+ ..default()
+ }
 }
 
 pub(crate) fn inscription_id(n: u32) -> InscriptionId {

src/wallet/batch/file.rs

@@ -129,7 +129,7 @@ impl File {
  }
  }
 
- inscriptions.push(Inscription::from(
+ inscriptions.push(Inscription::new(
  wallet.chain(),
  compress,
  entry.delegate,