Skip to content

Fix clippy warnings #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2024
Merged

Fix clippy warnings #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions crates/floresta-chain/src/pruned_utreexo/chain_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ impl<PersistedState: ChainStore> ChainState<PersistedState> {
let inner = read_lock!(self);
let mut ser_acc: Vec<u8> = Vec::new();
inner.acc.leaves.consensus_encode(&mut ser_acc)?;
#[allow(clippy::significant_drop_in_scrutinee)]

for root in inner.acc.roots.iter() {
ser_acc
.write_all(&**root)
Expand All @@ -463,7 +463,6 @@ impl<PersistedState: ChainStore> ChainState<PersistedState> {
.expect("Chain store is not working");
Ok(())
}
#[allow(clippy::await_holding_lock)]
fn notify(&self, block: &Block, height: u32) {
let inner = self.inner.read();
let subs = inner.subscribers.iter();
Expand Down
49 changes: 24 additions & 25 deletions crates/floresta-electrum/src/electrum_protocol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,18 +830,18 @@ pub async fn client_accept_loop(
/// 1. order confirmed transactions to the script hash by increasing height (and position in the block if there are more than one in a block)
///
/// 2. form a string that is the concatenation of strings "tx_hash:height:" for each
/// transaction in order, where:
/// transaction in order, where:
///
/// tx_hash is the transaction hash in hexadecimal
/// height is the height of the block it is in.
///
/// 3. Next, with mempool transactions in any order, append a similar string for those
/// transactions, but where height is -1 if the transaction has at least one unconfirmed
/// input, and 0 if all inputs are confirmed.
/// transactions, but where height is -1 if the transaction has at least one unconfirmed
/// input, and 0 if all inputs are confirmed.
///
/// 4. The status of the script hash is the sha256() hash of the full string expressed
/// as a hexadecimal string, or null if the string is empty because there are no
/// transactions.
/// as a hexadecimal string, or null if the string is empty because there are no
/// transactions.
fn get_status(transactions: Vec<CachedTransaction>) -> sha256::Hash {
let mut status_preimage = String::new();
for transaction in transactions {
Expand Down Expand Up @@ -1011,7 +1011,7 @@ mod test {
)),
Ok(Ok(n)) => {
let response: std::borrow::Cow<str> = String::from_utf8_lossy(&response[..n]);
let response: Value = serde_json::from_str(&response).unwrap();
let response: Value = serde_json::from_str(&response)?;
Ok(response)
}
Ok(Err(e)) => {
Expand Down Expand Up @@ -1136,30 +1136,29 @@ mod test {
/// server.ping *
/// server.version *
fn generate_request(req_params: &mut Vec<Value>) -> Value {
let params: Vec<Value>;
let binding = req_params.pop().unwrap();
let method = binding.as_str().unwrap();

match method {
"server.banner" => params = vec![],
"blockchain.block.header" => params = vec![req_params.pop().unwrap()],
let params = match method {
"server.banner" => vec![],
"blockchain.block.header" => vec![req_params.pop().unwrap()],
"blockchain.block.headers" => {
params = vec![req_params.pop().unwrap(), req_params.pop().unwrap()]
vec![req_params.pop().unwrap(), req_params.pop().unwrap()]
}
"blockchain.estimatefee" => params = vec![],
"blockchain.relayfee" => params = vec![],
"blockchain.scripthash.subscribe" => params = vec![req_params.pop().unwrap()],
"blockchain.scripthash.unsubscribe" => params = vec![req_params.pop().unwrap()],
"blockchain.scripthash.get_mempool" => params = vec![],
"blockchain.scripthash.get_balance" => params = vec![req_params.pop().unwrap()],
"blockchain.scripthash.get_history" => params = vec![req_params.pop().unwrap()],
"blockchain.scripthash.listunspent" => params = vec![req_params.pop().unwrap()],
"blockchain.transaction.broadcast" => params = vec![req_params.pop().unwrap()],
"blockchain.transaction.get" => params = vec![req_params.pop().unwrap()],
"blockchain.transaction.get_merkle" => params = vec![req_params.pop().unwrap()],

_ => params = vec![],
}
"blockchain.estimatefee" => vec![],
"blockchain.relayfee" => vec![],
"blockchain.scripthash.subscribe" => vec![req_params.pop().unwrap()],
"blockchain.scripthash.unsubscribe" => vec![req_params.pop().unwrap()],
"blockchain.scripthash.get_mempool" => vec![],
"blockchain.scripthash.get_balance" => vec![req_params.pop().unwrap()],
"blockchain.scripthash.get_history" => vec![req_params.pop().unwrap()],
"blockchain.scripthash.listunspent" => vec![req_params.pop().unwrap()],
"blockchain.transaction.broadcast" => vec![req_params.pop().unwrap()],
"blockchain.transaction.get" => vec![req_params.pop().unwrap()],
"blockchain.transaction.get_merkle" => vec![req_params.pop().unwrap()],

_ => vec![],
};

json!({
"id": rand::random::<u32>(),
Expand Down
5 changes: 3 additions & 2 deletions crates/floresta-electrum/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ use serde::Serialize;
pub mod electrum_protocol;
pub mod error;
pub mod request;

#[derive(Debug, Deserialize, Serialize)]
struct TransactionHistoryEntry {
pub struct TransactionHistoryEntry {
height: u32,
tx_hash: String,
}
#[derive(Debug, Deserialize, Serialize)]
struct MempoolTransaction {
pub struct MempoolTransaction {
height: u32,
tx_hash: String,
fee: u32,
Expand Down
1 change: 1 addition & 0 deletions crates/floresta-watch-only/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,7 @@ impl<D: AddressCacheDatabase> AddressCache<D> {
)
}

#[allow(clippy::too_many_arguments)]
pub fn cache_transaction(
&self,
transaction: &Transaction,
Expand Down
6 changes: 2 additions & 4 deletions crates/floresta-wire/src/p2p_wire/address_man.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,14 +510,12 @@ impl AddressMan {
self.good_addresses.push(idx);
}

self.addresses.get(&idx).cloned().map(|address| {
if let Some(address) = self.addresses.get(&idx).cloned() {
self.push_if_has_service(&address, service_flags::UTREEXO.into());
self.push_if_has_service(&address, ServiceFlags::from(1 << 25)); // UTREEXO_FILTER
self.push_if_has_service(&address, ServiceFlags::NONE); // this means any peer
self.push_if_has_service(&address, ServiceFlags::COMPACT_FILTERS);

address
});
}
}
AddressState::NeverTried => {
self.good_addresses.retain(|&x| x != idx);
Expand Down
3 changes: 2 additions & 1 deletion crates/floresta-wire/src/p2p_wire/peer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ impl<T: AsyncWrite + Unpin> Peer<T> {
}
}
}
};
}

if self.shutdown {
return Ok(());
Expand Down Expand Up @@ -597,6 +597,7 @@ impl<T: AsyncWrite + Unpin> Peer<T> {
Ok(())
}

#[allow(clippy::too_many_arguments)]
pub async fn create_peer(
id: u32,
mempool: Arc<RwLock<Mempool>>,
Expand Down
8 changes: 4 additions & 4 deletions crates/floresta-wire/src/p2p_wire/tests/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ struct Block {

#[derive(Debug)]
pub struct TestPeer {
headers: Vec<Header>,
_headers: Vec<Header>,
blocks: HashMap<BlockHash, UtreexoBlock>,
filters: HashMap<BlockHash, Vec<u8>>,
_filters: HashMap<BlockHash, Vec<u8>>,
node_tx: UnboundedSender<NodeNotification>,
node_rx: UnboundedReceiver<NodeRequest>,
peer_id: u32,
Expand All @@ -64,9 +64,9 @@ impl TestPeer {
peer_id: u32,
) -> Self {
TestPeer {
headers,
_headers: headers,
blocks,
filters,
_filters: filters,
node_tx,
node_rx,
peer_id,
Expand Down