Remove dependency on bitcoin-internals

Currently we have a dependency on `bitcoin_internals` just for the
`write_err` macro.

Copy the macro here and remove the dependency. Make the macro and module
private.

Author: tcharding

Cargo-minimal.lock

@@ -120,7 +120,6 @@ name = "corepc-types"
 version = "0.5.0"
 dependencies = [
  "bitcoin",
- "bitcoin-internals",
  "serde",
  "serde_json",
 ]

Cargo-recent.lock

@@ -120,7 +120,6 @@ name = "corepc-types"
 version = "0.5.0"
 dependencies = [
  "bitcoin",
- "bitcoin-internals",
  "serde",
  "serde_json",
 ]

types/Cargo.toml

@@ -14,11 +14,10 @@ exclude = ["tests", "contrib"]
 
 [features]
 default = ["std"]
-std = ["bitcoin/std", "internals/std"]
+std = ["bitcoin/std"]
 
 [dependencies]
 bitcoin = { version = "0.32.0", default-features = false, features = ["serde", "base64"] }
-internals = { package = "bitcoin-internals", version = "0.3.0", default-features = false, features = ["alloc"]}
 serde = { version = "1.0.103", default-features = false, features = [ "derive", "alloc" ] }
 serde_json = { version = "1.0.117" }
 

types/src/error.rs

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: CC0-1.0
+
+/// Formats error.
+///
+/// If `std` feature is OFF appends error source (delimited by `: `). We do this because
+/// `e.source()` is only available in std builds, without this macro the error source is lost for
+/// no-std builds.
+macro_rules! write_err {
+    ($writer:expr, $string:literal $(, $args:expr)*; $source:expr) => {
+        {
+            #[cfg(feature = "std")]
+            {
+                let _ = &$source;   // Prevents clippy warnings.
+                write!($writer, $string $(, $args)*)
+            }
+            #[cfg(not(feature = "std"))]
+            {
+                write!($writer, concat!($string, ": {}") $(, $args)*, $source)
+            }
+        }
+    }
+}
+pub(crate) use write_err;

types/src/lib.rs

@@ -27,6 +27,7 @@ pub mod v26;
 pub mod v27;
 pub mod v28;
 
+mod error;
 // JSON types that model _all_ `bitcoind` versions.
 pub mod model;
 

types/src/v17/blockchain/error.rs

@@ -6,8 +6,8 @@ use bitcoin::amount::{self, ParseAmountError};
 use bitcoin::consensus::encode;
 use bitcoin::error::UnprefixedHexError;
 use bitcoin::{address, hex, network};
-use internals::write_err;
 
+use crate::error::write_err;
 use crate::NumericError;
 
 /// Error when converting a `GetBlockVerbosityOne` type into the model type.

types/src/v17/network/error.rs

@@ -3,7 +3,8 @@
 use core::fmt;
 
 use bitcoin::amount::ParseAmountError;
-use internals::write_err;
+
+use crate::error::write_err;
 
 /// Error when converting a `GetTransaction` type into the model type.
 #[derive(Debug)]

types/src/v17/wallet/error.rs

@@ -6,8 +6,8 @@ use bitcoin::amount::ParseAmountError;
 use bitcoin::consensus::encode;
 use bitcoin::psbt::PsbtParseError;
 use bitcoin::{address, bip32, hex, key, witness_program, witness_version};
-use internals::write_err;
 
+use crate::error::write_err;
 use crate::NumericError;
 
 /// Error when converting a `AddMultisigAddress` type into the model type.

types/src/v19/blockchain.rs

@@ -9,9 +9,9 @@ use core::fmt;
 
 use bitcoin::error::UnprefixedHexError;
 use bitcoin::{hex, network, BlockHash, Network, Work};
-use internals::write_err;
 use serde::{Deserialize, Serialize};
 
+use crate::error::write_err;
 use crate::{model, NumericError};
 
 /// Result of JSON-RPC method `getblockchaininfo`.

types/src/v28/raw_transactions/error.rs

@@ -4,8 +4,8 @@ use core::fmt;
 
 use bitcoin::amount::ParseAmountError;
 use bitcoin::hex::HexToArrayError;
-use internals::write_err;
 
+use crate::error::write_err;
 use crate::NumericError;
 
 /// Error when converting a `SubmitPackage` type into the model type.