diff --git a/chronik/chronik-db/src/group.rs b/chronik/chronik-db/src/group.rs --- a/chronik/chronik-db/src/group.rs +++ b/chronik/chronik-db/src/group.rs @@ -54,7 +54,7 @@ /// time we compare/hash elements for grouping. /// /// Note: For group history, this will be suffixed by a 4-byte page number. - type MemberSer<'a>: AsRef<[u8]> + 'a; + type MemberSer: AsRef<[u8]>; /// Auxillary data when grouping members type Aux; @@ -85,7 +85,7 @@ ) -> Self::Iter<'a>; /// Serialize the given member. - fn ser_member<'a>(&self, member: &Self::Member<'a>) -> Self::MemberSer<'a>; + fn ser_member(&self, member: &Self::Member<'_>) -> Self::MemberSer; /// The [`GroupHistoryConf`] for this group. fn tx_history_conf() -> GroupHistoryConf; diff --git a/chronik/chronik-db/src/groups/script.rs b/chronik/chronik-db/src/groups/script.rs --- a/chronik/chronik-db/src/groups/script.rs +++ b/chronik/chronik-db/src/groups/script.rs @@ -68,7 +68,7 @@ type Aux = (); type Iter<'a> = ScriptGroupIter<'a>; type Member<'a> = &'a Script; - type MemberSer<'a> = Bytes; + type MemberSer = Bytes; type UtxoData = UtxoDataValue; fn input_members<'a>( @@ -97,7 +97,7 @@ } } - fn ser_member<'a>(&self, member: &Self::Member<'a>) -> Self::MemberSer<'a> { + fn ser_member(&self, member: &Self::Member<'_>) -> Self::MemberSer { compress_script_variant(&member.variant()) } diff --git a/chronik/chronik-db/src/groups/token_id.rs b/chronik/chronik-db/src/groups/token_id.rs --- a/chronik/chronik-db/src/groups/token_id.rs +++ b/chronik/chronik-db/src/groups/token_id.rs @@ -51,7 +51,7 @@ type Aux = TokenIdGroupAux; type Iter<'a> = Vec>; type Member<'a> = TokenId; - type MemberSer<'a> = [u8; 32]; + type MemberSer = [u8; 32]; type UtxoData = UtxoDataOutput; fn input_members<'a>( @@ -99,7 +99,7 @@ output_scripts } - fn ser_member<'a>(&self, member: &Self::Member<'a>) -> Self::MemberSer<'a> { + fn ser_member(&self, member: &Self::Member<'_>) -> Self::MemberSer { member.to_be_bytes() } diff --git a/chronik/chronik-db/src/io/group_history.rs b/chronik/chronik-db/src/io/group_history.rs --- a/chronik/chronik-db/src/io/group_history.rs +++ b/chronik/chronik-db/src/io/group_history.rs @@ -116,7 +116,7 @@ struct FetchedNumTxs<'tx, G: Group> { members_num_txs: Vec, grouped_txs: BTreeMap, Vec>, - ser_members: Vec>, + ser_members: Vec, } pub(crate) fn bytes_to_num_txs(bytes: &[u8]) -> Result { diff --git a/chronik/chronik-db/src/mem/group_history.rs b/chronik/chronik-db/src/mem/group_history.rs --- a/chronik/chronik-db/src/mem/group_history.rs +++ b/chronik/chronik-db/src/mem/group_history.rs @@ -39,7 +39,7 @@ tx: &tx.tx, }; for member in tx_members_for_group(&self.group, query, aux) { - let member_ser: G::MemberSer<'_> = self.group.ser_member(&member); + let member_ser: G::MemberSer = self.group.ser_member(&member); if !self.history.contains_key(member_ser.as_ref()) { self.history .insert(member_ser.as_ref().to_vec(), BTreeSet::new()); @@ -59,7 +59,7 @@ tx: &tx.tx, }; for member in tx_members_for_group(&self.group, query, aux) { - let member_ser: G::MemberSer<'_> = self.group.ser_member(&member); + let member_ser: G::MemberSer = self.group.ser_member(&member); if let Some(entries) = self.history.get_mut(member_ser.as_ref()) { entries.remove(&(tx.time_first_seen, tx.tx.txid())); if entries.is_empty() { diff --git a/chronik/chronik-db/src/test/value_group.rs b/chronik/chronik-db/src/test/value_group.rs --- a/chronik/chronik-db/src/test/value_group.rs +++ b/chronik/chronik-db/src/test/value_group.rs @@ -20,7 +20,7 @@ type Aux = (); type Iter<'a> = Vec>; type Member<'a> = i64; - type MemberSer<'a> = [u8; 8]; + type MemberSer = [u8; 8]; type UtxoData = UtxoDataValue; fn input_members( @@ -57,7 +57,7 @@ outputs } - fn ser_member<'a>(&self, value: &i64) -> Self::MemberSer<'a> { + fn ser_member(&self, value: &i64) -> Self::MemberSer { ser_value(*value) }