Merge remote-tracking branch 'upstream/master'

Groestlcoin · Oct 30, 2023 · d9d1325 · d9d1325
2 parents c37746d + 60318c4
commit d9d1325
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 114 deletions.
diff --git a/Cargo-minimal.lock b/Cargo-minimal.lock
@@ -123,7 +123,7 @@ dependencies = [
 
 [[package]]
 name = "groestlcoin"
-version = "0.31.0-rc2"
+version = "0.31.0"
 dependencies = [
  "base64",
  "bech32",

diff --git a/Cargo-recent.lock b/Cargo-recent.lock
@@ -122,7 +122,7 @@ dependencies = [
 
 [[package]]
 name = "groestlcoin"
-version = "0.31.0-rc2"
+version = "0.31.0"
 dependencies = [
  "base64",
  "bech32",

diff --git a/contrib/test.sh b/contrib/test.sh
@@ -17,7 +17,7 @@ if cargo --version | grep ${MSRV}; then
     cargo update -p schemars --precise 0.8.12
     # schemars_derive 0.8.13 uses edition 2021
     cargo update -p schemars_derive --precise 0.8.12
-    # memcrh 2.6.0 uses edition 2021
+    # memchr 2.6.0 uses edition 2021
     cargo update -p memchr --precise 2.5.0
     # byteorder 1.5.0 uses edition 2021
     cargo update -p byteorder --precise 1.4.3

diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
@@ -10,7 +10,7 @@ cargo-fuzz = true
 
 [dependencies]
 honggfuzz = { version = "0.5.55", default-features = false }
-groestlcoin = { version = "0.31.0-rc2", features = [ "serde" ] }
+groestlcoin = { version = "0.31.0", features = [ "serde" ] }
 
 serde = { version = "1.0.103", features = [ "derive" ] }
 serde_json = "1.0"

diff --git a/fuzz/generate-files.sh b/fuzz/generate-files.sh
@@ -21,7 +21,7 @@ cargo-fuzz = true
 
 [dependencies]
 honggfuzz = { version = "0.5.55", default-features = false }
-groestlcoin = { version = "0.31.0-rc2", features = [ "serde" ] }
+groestlcoin = { version = "0.31.0", features = [ "serde" ] }
 
 serde = { version = "1.0.103", features = [ "derive" ] }
 serde_json = "1.0"

diff --git a/groestlcoin/Cargo.toml b/groestlcoin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "groestlcoin"
-version = "0.31.0-rc2"
+version = "0.31.0"
 authors = ["Groestlcoin Developers <[email protected]>"]
 license = "CC0-1.0"
 repository = "https://github.com/Groestlcoin/rust-groestlcoin/"

diff --git a/groestlcoin/src/psbt/macros.rs b/groestlcoin/src/psbt/macros.rs
@@ -1,60 +1,6 @@
 // SPDX-License-Identifier: CC0-1.0
 
 #[allow(unused_macros)]
-macro_rules! hex_psbt {
-    ($s:expr) => {
-        <$crate::psbt::Psbt>::deserialize(
-            &<$crate::prelude::Vec<u8> as $crate::hex::FromHex>::from_hex($s).unwrap(),
-        )
-    };
-}
-
-#[cfg(test)]
-macro_rules! psbt_with_values {
-    ($input:expr, $output:expr) => {
-        Psbt {
-            unsigned_tx: Transaction {
-                version: transaction::Version::TWO,
-                lock_time: absolute::LockTime::ZERO,
-                input: vec![TxIn {
-                    previous_output: OutPoint {
-                        txid: "f61b1742ca13176464adb3cb66050c00787bb3a4eead37e985f2df1e37718126"
-                            .parse()
-                            .unwrap(),
-                        vout: 0,
-                    },
-                    script_sig: ScriptBuf::new(),
-                    sequence: Sequence::ENABLE_LOCKTIME_NO_RBF,
-                    witness: Witness::default(),
-                }],
-                output: vec![TxOut {
-                    value: Amount::from_sat($output),
-                    script_pubkey: ScriptBuf::from_hex(
-                        "a9143545e6e33b832c47050f24d3eeb93c9c03948bc787",
-                    )
-                    .unwrap(),
-                }],
-            },
-            xpub: Default::default(),
-            version: 0,
-            proprietary: BTreeMap::new(),
-            unknown: BTreeMap::new(),
-
-            inputs: vec![Input {
-                witness_utxo: Some(TxOut {
-                    value: Amount::from_sat($input),
-                    script_pubkey: ScriptBuf::from_hex(
-                        "a914339725ba21efd62ac753a9bcd067d6c7a6a39d0587",
-                    )
-                    .unwrap(),
-                }),
-                ..Default::default()
-            }],
-            outputs: vec![],
-        }
-    };
-}
-
 macro_rules! combine {
     ($thing:ident, $slf:ident, $other:ident) => {
         if let (&None, Some($thing)) = (&$slf.$thing, $other.$thing) {

diff --git a/groestlcoin/src/psbt/mod.rs b/groestlcoin/src/psbt/mod.rs