Clippy'd again

Firaenix · Apr 19, 2023 · afe15a4 · afe15a4
1 parent 3dbd0c7
commit afe15a4
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 31 deletions.
diff --git a/src/chainparams/mod.rs b/src/chainparams/mod.rs
@@ -10,9 +10,8 @@ pub struct ChainParams {
     pub magic: u32,
 }
 
-impl ChainParams {
-    // #[cfg_attr(all(feature = "wasm-bindgen-address"), wasm_bindgen(constructor))]
-    pub fn default() -> ChainParams {
+impl Default for ChainParams {
+    fn default() -> ChainParams {
         ChainParams {
             p2pkh: 0x00,
             p2sh: 0x05,
@@ -22,7 +21,10 @@ impl ChainParams {
             magic: 0xe3e1f3e8,
         }
     }
+}
 
+impl ChainParams {
+    // #[cfg_attr(all(feature = "wasm-bindgen-address"), wasm_bindgen(constructor))]
     pub fn new(p2pkh: u8, p2sh: u8, privkey: u8, xpub: u32, xpriv: u32, magic: u32) -> ChainParams {
         ChainParams {
             p2pkh,

diff --git a/src/interpreter/mod.rs b/src/interpreter/mod.rs
@@ -15,16 +15,13 @@ pub mod state;
 pub use state::*;
 mod script_matching;
 
-#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[derive(Default)]
+#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
 pub enum Status {
     #[default]
     Running,
     Finished,
 }
 
-
-
 #[derive(Clone, Serialize, Deserialize)]
 pub struct TxScript {
     pub(crate) tx: Transaction,

diff --git a/src/signature/mod.rs b/src/signature/mod.rs
@@ -2,7 +2,7 @@ use crate::{get_hash_digest, BSVErrors, PublicKey, SigHash, SigningHash, ECDSA};
 use k256::{ecdsa::recoverable, ecdsa::Signature as SecpSignature, FieldBytes};
 use num_traits::FromPrimitive;
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub struct RecoveryInfo {
     is_y_odd: bool,
     is_x_reduced: bool,
@@ -25,14 +25,6 @@ impl RecoveryInfo {
             is_pubkey_compressed,
         }
     }
-
-    pub fn default() -> RecoveryInfo {
-        RecoveryInfo {
-            is_y_odd: false,
-            is_x_reduced: false,
-            is_pubkey_compressed: false,
-        }
-    }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -139,7 +131,7 @@ impl Signature {
             is_y_odd,
             is_x_reduced,
             is_pubkey_compressed,
-        } = recovery_info.or_else(|| self.recovery.clone()).unwrap_or_else(RecoveryInfo::default);
+        } = recovery_info.or_else(|| self.recovery.clone()).unwrap_or_default();
 
         let mut recovery = ((is_x_reduced as u8) << 1 | (is_y_odd as u8)) + 27 + 4;
 

diff --git a/src/transaction/mod.rs b/src/transaction/mod.rs
@@ -18,7 +18,7 @@ pub use sighash::*;
 pub use txin::*;
 pub use txout::*;
 
-#[derive(Debug, Clone, PartialEq, Eq, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Transaction {
     pub(super) version: u32,
     pub(super) inputs: Vec<TxIn>,
@@ -28,6 +28,12 @@ pub struct Transaction {
     pub(super) hash_cache: HashCache,
 }
 
+impl Default for Transaction {
+    fn default() -> Transaction {
+        Transaction::new_impl(2, vec![], vec![], 0)
+    }
+}
+
 impl Transaction {
     pub(crate) fn new_impl(version: u32, inputs: Vec<TxIn>, outputs: Vec<TxOut>, n_locktime: u32) -> Transaction {
         Transaction {
@@ -266,9 +272,6 @@ impl Transaction {
     }
 
     // #[cfg_attr(all(feature = "wasm-bindgen-transaction"), wasm_bindgen)]
-    pub fn default() -> Transaction {
-        Transaction::new_impl(2, vec![], vec![], 0)
-    }
 
     // #[cfg_attr(all(feature = "wasm-bindgen-transaction"), wasm_bindgen(js_name = setVersion))]
     pub fn set_version(&mut self, version: u32) -> Transaction {

diff --git a/src/transaction/txin.rs b/src/transaction/txin.rs
@@ -41,6 +41,19 @@ pub struct TxIn {
     pub(crate) satoshis: Option<u64>,
 }
 
+impl Default for TxIn {
+    fn default() -> TxIn {
+        TxIn {
+            prev_tx_id: vec![],
+            satoshis: None,
+            unlocking_script: Script::default(),
+            sequence: u32::MAX,
+            locking_script: None,
+            vout: 0,
+        }
+    }
+}
+
 impl TxIn {
     pub(crate) fn get_finalised_script_impl(&self) -> Result<Script, BSVErrors> {
         match self.locking_script.as_ref() {
@@ -221,16 +234,6 @@ impl TxIn {
     }
 
     // #[cfg_attr(all(feature = "wasm-bindgen-transaction"), wasm_bindgen)]
-    pub fn default() -> TxIn {
-        TxIn {
-            prev_tx_id: vec![],
-            satoshis: None,
-            unlocking_script: Script::default(),
-            sequence: u32::MAX,
-            locking_script: None,
-            vout: 0,
-        }
-    }
 
     // #[cfg_attr(all(feature = "wasm-bindgen-transaction"), wasm_bindgen(js_name = getPrevTxId))]
     pub fn get_prev_tx_id(&self, little_endian: Option<bool>) -> Vec<u8> {