From a23d9e7d31057e2e202dc6bbd7d1d5c34fff3322 Mon Sep 17 00:00:00 2001
From: Dr Maxim Orlovsky <orlovsky@lnp-bp.org>
Date: Fri, 6 Oct 2023 10:03:06 +0200
Subject: [PATCH] chore: update to new amplify ByteArray APIs

---
 Cargo.lock                  |  4 ++--
 Cargo.toml                  |  2 +-
 dbc/src/tapret/tapscript.rs |  4 ++--
 primitives/src/coding.rs    |  8 ++++----
 primitives/src/tx.rs        | 10 +++++-----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8377f1c4..8727111e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "amplify"
-version = "4.1.1"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f58ae011435caa061fb64894c7b05d615321011d35dd07b53b2843a4b61933"
+checksum = "add3e79c9c3e33209e1676562e0fda882bc20701f52870ba162d9f046b7d8b0b"
 dependencies = [
  "amplify_apfloat",
  "amplify_derive 3.0.1",
diff --git a/Cargo.toml b/Cargo.toml
index 11fedf1e..7c6fc667 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ edition = "2021"
 license = "Apache-2.0"
 
 [workspace.dependencies]
-amplify = "4.0.2"
+amplify = "4.2.0"
 strict_encoding = "2.5.0"
 commit_verify = "0.10.5"
 single_use_seals = "0.10.0"
diff --git a/dbc/src/tapret/tapscript.rs b/dbc/src/tapret/tapscript.rs
index 97fd526a..00d68836 100644
--- a/dbc/src/tapret/tapscript.rs
+++ b/dbc/src/tapret/tapscript.rs
@@ -118,7 +118,7 @@ impl CommitVerify<TapretCommitment, Lnpbp12> for TapScript {
 
 #[cfg(test)]
 mod test {
-    use amplify::RawArray;
+    use amplify::ByteArray;
     use commit_verify::{Digest, Sha256};
 
     use super::*;
@@ -126,7 +126,7 @@ mod test {
     pub fn commitment() -> TapretCommitment {
         let msg = Sha256::digest("test data");
         TapretCommitment {
-            mpc: mpc::Commitment::from_raw_array(msg),
+            mpc: mpc::Commitment::from_byte_array(msg),
             nonce: 8,
         }
     }
diff --git a/primitives/src/coding.rs b/primitives/src/coding.rs
index 676a61e6..eb2d0ff4 100644
--- a/primitives/src/coding.rs
+++ b/primitives/src/coding.rs
@@ -24,7 +24,7 @@ use std::io::{self, Cursor, Read, Write};
 
 use amplify::confinement::{Confined, U32};
 use amplify::hex::{self, FromHex, ToHex};
-use amplify::{confinement, Bytes32, IoError, RawArray, Wrapper};
+use amplify::{confinement, ByteArray, Bytes32, IoError, Wrapper};
 
 use crate::{
     ControlBlock, InternalPk, LockTime, Outpoint, RedeemScript, Sats, ScriptBytes, ScriptPubkey,
@@ -313,7 +313,7 @@ impl ConsensusDecode for Outpoint {
 
 impl ConsensusEncode for Txid {
     fn consensus_encode(&self, writer: &mut impl Write) -> Result<usize, IoError> {
-        writer.write_all(&self.to_raw_array())?;
+        writer.write_all(&self.to_byte_array())?;
         Ok(32)
     }
 }
@@ -453,7 +453,7 @@ impl ConsensusEncode for InternalPk {
 
 impl ConsensusEncode for TapBranchHash {
     fn consensus_encode(&self, writer: &mut impl Write) -> Result<usize, IoError> {
-        writer.write_all(&self.to_raw_array())?;
+        writer.write_all(&self.to_byte_array())?;
         Ok(32)
     }
 }
@@ -462,7 +462,7 @@ impl ConsensusDecode for TapBranchHash {
     fn consensus_decode(reader: &mut impl Read) -> Result<Self, ConsensusDecodeError> {
         let mut buf = [0u8; 32];
         reader.read_exact(&mut buf)?;
-        Ok(TapBranchHash::from_raw_array(buf))
+        Ok(TapBranchHash::from_byte_array(buf))
     }
 }
 
diff --git a/primitives/src/tx.rs b/primitives/src/tx.rs
index 93224319..c550cc38 100644
--- a/primitives/src/tx.rs
+++ b/primitives/src/tx.rs
@@ -27,7 +27,7 @@ use std::num::ParseIntError;
 use std::str::FromStr;
 
 use amplify::hex::{self, FromHex, ToHex};
-use amplify::{Bytes32StrRev, RawArray, Wrapper};
+use amplify::{ByteArray, Bytes32StrRev, Wrapper};
 use commit_verify::{DigestExt, Sha256};
 
 use crate::{
@@ -57,7 +57,7 @@ impl Txid {
     #[inline]
     pub const fn coinbase() -> Self { Self(Bytes32StrRev::zero()) }
     #[inline]
-    pub fn is_coinbase(&self) -> bool { self.to_raw_array() == [0u8; 32] }
+    pub fn is_coinbase(&self) -> bool { self.to_byte_array() == [0u8; 32] }
 }
 
 impl FromHex for Txid {
@@ -529,7 +529,7 @@ impl Tx {
     ///
     /// This gives a way to identify a transaction that is "the same" as
     /// another in the sense of having same inputs and outputs.
-    pub fn ntxid(&self) -> [u8; 32] { self.to_unsigned_tx().txid().to_raw_array() }
+    pub fn ntxid(&self) -> [u8; 32] { self.to_unsigned_tx().txid().to_byte_array() }
 
     /// Computes the [`Txid`].
     ///
@@ -553,7 +553,7 @@ impl Tx {
             .expect("engines don't error");
         let mut double = Sha256::default();
         double.input_raw(&enc.finish());
-        Txid::from_raw_array(double.finish())
+        Txid::from_byte_array(double.finish())
     }
 
     /// Computes the segwit version of the transaction id.
@@ -568,7 +568,7 @@ impl Tx {
             .expect("engines don't error");
         let mut double = Sha256::default();
         double.input_raw(&enc.finish());
-        Wtxid::from_raw_array(double.finish())
+        Wtxid::from_byte_array(double.finish())
     }
 }