Sulkta-OSS/pallas
3
0
Fork 0
Code Issues 1 Pull requests 4 Projects Releases Packages Wiki Activity Actions

chore: fix clippy warnings (#262)

Browse source
This commit is contained in:
Santiago Carmuega 2023-06-12 02:41:23 +02:00 • committed by GitHub
parent efd82c72e1
commit 65331e8346
2 changed files with 21 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pallas-traverse/src/tx.rs
View file

@ -239,7 +239,7 @@ impl<'b> MultiEraTx<'b> {
pub fn total_collateral(&self) -> Option<u64> { pub fn total_collateral(&self) -> Option<u64> {
match self { match self {
MultiEraTx::Babbage(x) => x.transaction_body.total_collateral.clone(), MultiEraTx::Babbage(x) => x.transaction_body.total_collateral,
_ => None, _ => None,
} }
} }

47
pallas-utxorpc/src/lib.rs
View file

@ -58,7 +58,7 @@ pub fn map_tx_output(x: &trv::MultiEraOutput) -> u5c::TxOutput {
}, },
script: match x.script_ref().map(|x| x.deref()) { script: match x.script_ref().map(|x| x.deref()) {
Some(babbage::Script::NativeScript(x)) => u5c::Script { Some(babbage::Script::NativeScript(x)) => u5c::Script {
script: u5c::script::Script::Native(map_native_script(&x)).into(), script: u5c::script::Script::Native(map_native_script(x)).into(),
} }
.into(), .into(),
Some(babbage::Script::PlutusV1Script(x)) => u5c::Script { Some(babbage::Script::PlutusV1Script(x)) => u5c::Script {
@ -95,13 +95,13 @@ pub fn map_relay(x: &alonzo::Relay) -> u5c::Relay {
ip_v4: v4.as_ref().map(|x| x.to_vec().into()).unwrap_or_default(), ip_v4: v4.as_ref().map(|x| x.to_vec().into()).unwrap_or_default(),
ip_v6: v6.as_ref().map(|x| x.to_vec().into()).unwrap_or_default(), ip_v6: v6.as_ref().map(|x| x.to_vec().into()).unwrap_or_default(),
dns_name: String::default(), dns_name: String::default(),
port: port.clone().unwrap_or_default(), port: port.unwrap_or_default(),
}, },
babbage::Relay::SingleHostName(port, name) => u5c::Relay { babbage::Relay::SingleHostName(port, name) => u5c::Relay {
ip_v4: Default::default(), ip_v4: Default::default(),
ip_v6: Default::default(), ip_v6: Default::default(),
dns_name: name.clone(), dns_name: name.clone(),
port: port.clone().unwrap_or_default(), port: port.unwrap_or_default(),
}, },
babbage::Relay::MultiHostName(name) => u5c::Relay { babbage::Relay::MultiHostName(name) => u5c::Relay {
ip_v4: Default::default(), ip_v4: Default::default(),
@ -149,13 +149,10 @@ pub fn map_cert(x: &trv::MultiEraCert) -> u5c::Certificate {
reward_account: reward_account.to_vec().into(), reward_account: reward_account.to_vec().into(),
pool_owners: pool_owners.iter().map(|x| x.to_vec().into()).collect(), pool_owners: pool_owners.iter().map(|x| x.to_vec().into()).collect(),
relays: relays.iter().map(map_relay).collect(), relays: relays.iter().map(map_relay).collect(),
pool_metadata: pool_metadata pool_metadata: pool_metadata.as_ref().map(|x| u5c::PoolMetadata {
.as_ref() url: x.url.clone(),
.map(|x| u5c::PoolMetadata { hash: x.hash.to_vec().into(),
url: x.url.clone(), }),
hash: x.hash.to_vec().into(),
})
.into(),
}), }),
babbage::Certificate::PoolRetirement(a, b) => { babbage::Certificate::PoolRetirement(a, b) => {
u5c::certificate::Certificate::PoolRetirement(u5c::PoolRetirementCert { u5c::certificate::Certificate::PoolRetirement(u5c::PoolRetirementCert {
@ -235,18 +232,18 @@ pub fn map_native_script(x: &alonzo::NativeScript) -> u5c::NativeScript {
} }
babbage::NativeScript::ScriptAll(x) => { babbage::NativeScript::ScriptAll(x) => {
u5c::native_script::NativeScript::ScriptAll(u5c::NativeScriptList { u5c::native_script::NativeScript::ScriptAll(u5c::NativeScriptList {
items: x.iter().map(|x| map_native_script(x)).collect(), items: x.iter().map(map_native_script).collect(),
}) })
} }
babbage::NativeScript::ScriptAny(x) => { babbage::NativeScript::ScriptAny(x) => {
u5c::native_script::NativeScript::ScriptAll(u5c::NativeScriptList { u5c::native_script::NativeScript::ScriptAll(u5c::NativeScriptList {
items: x.iter().map(|x| map_native_script(x)).collect(), items: x.iter().map(map_native_script).collect(),
}) })
} }
babbage::NativeScript::ScriptNOfK(n, k) => { babbage::NativeScript::ScriptNOfK(n, k) => {
u5c::native_script::NativeScript::ScriptNOfK(u5c::ScriptNOfK { u5c::native_script::NativeScript::ScriptNOfK(u5c::ScriptNOfK {
k: *n, k: *n,
scripts: k.iter().map(|x| map_native_script(x)).collect(), scripts: k.iter().map(map_native_script).collect(),
}) })
} }
babbage::NativeScript::InvalidBefore(s) => { babbage::NativeScript::InvalidBefore(s) => {
@ -293,8 +290,8 @@ fn collect_all_scripts(tx: &trv::MultiEraTx) -> Vec<u5c::Script> {
pub fn map_plutus_constr(x: &alonzo::Constr<alonzo::PlutusData>) -> u5c::Constr { pub fn map_plutus_constr(x: &alonzo::Constr<alonzo::PlutusData>) -> u5c::Constr {
u5c::Constr { u5c::Constr {
tag: x.tag as u32, tag: x.tag as u32,
any_constructor: x.any_constructor.clone().unwrap_or_default(), any_constructor: x.any_constructor.unwrap_or_default(),
fields: x.fields.iter().map(|f| map_plutus_datum(f)).collect(), fields: x.fields.iter().map(map_plutus_datum).collect(),
} }
} }
@ -312,7 +309,7 @@ pub fn map_plutus_map(
} }
} }
pub fn map_plutus_array(x: &Vec<alonzo::PlutusData>) -> u5c::PlutusDataArray { pub fn map_plutus_array(x: &[alonzo::PlutusData]) -> u5c::PlutusDataArray {
u5c::PlutusDataArray { u5c::PlutusDataArray {
items: x.iter().map(map_plutus_datum).collect(), items: x.iter().map(map_plutus_datum).collect(),
} }
@ -362,7 +359,7 @@ pub fn map_metadatum(x: &alonzo::Metadatum) -> u5c::Metadatum {
} }
babbage::Metadatum::Text(x) => u5c::metadatum::Metadatum::Text(x.clone()), babbage::Metadatum::Text(x) => u5c::metadatum::Metadatum::Text(x.clone()),
babbage::Metadatum::Array(x) => u5c::metadatum::Metadatum::Array(u5c::MetadatumArray { babbage::Metadatum::Array(x) => u5c::metadatum::Metadatum::Array(u5c::MetadatumArray {
items: x.iter().map(|x| map_metadatum(x)).collect(), items: x.iter().map(map_metadatum).collect(),
}), }),
babbage::Metadatum::Map(x) => u5c::metadatum::Metadatum::Map(u5c::MetadatumMap { babbage::Metadatum::Map(x) => u5c::metadatum::Metadatum::Map(u5c::MetadatumMap {
pairs: x pairs: x
@ -383,7 +380,7 @@ pub fn map_metadatum(x: &alonzo::Metadatum) -> u5c::Metadatum {
pub fn map_metadata(label: u64, datum: &alonzo::Metadatum) -> u5c::Metadata { pub fn map_metadata(label: u64, datum: &alonzo::Metadatum) -> u5c::Metadata {
u5c::Metadata { u5c::Metadata {
label, label,
value: map_metadatum(&datum).into(), value: map_metadatum(datum).into(),
} }
} }
@ -412,26 +409,22 @@ fn collect_all_aux_scripts(tx: &trv::MultiEraTx) -> Vec<u5c::Script> {
pub fn map_tx(tx: &trv::MultiEraTx) -> u5c::Tx { pub fn map_tx(tx: &trv::MultiEraTx) -> u5c::Tx {
u5c::Tx { u5c::Tx {
inputs: tx.inputs().iter().map(|i| map_tx_input(i, tx)).collect(), inputs: tx.inputs().iter().map(|i| map_tx_input(i, tx)).collect(),
outputs: tx.outputs().iter().map(|o| map_tx_output(o)).collect(), outputs: tx.outputs().iter().map(map_tx_output).collect(),
certificates: tx.certs().iter().map(|x| map_cert(x)).collect(), certificates: tx.certs().iter().map(map_cert).collect(),
withdrawals: tx withdrawals: tx
.withdrawals() .withdrawals()
.collect::<Vec<_>>() .collect::<Vec<_>>()
.iter() .iter()
.map(|x| map_withdrawals(x)) .map(map_withdrawals)
.collect(), .collect(),
mint: tx.mints().iter().map(|x| map_policy_assets(x)).collect(), mint: tx.mints().iter().map(map_policy_assets).collect(),
reference_inputs: tx reference_inputs: tx
.reference_inputs() .reference_inputs()
.iter() .iter()
.map(|x| map_tx_input(x, tx)) .map(|x| map_tx_input(x, tx))
.collect(), .collect(),
witnesses: u5c::WitnessSet { witnesses: u5c::WitnessSet {
vkeywitness: tx vkeywitness: tx.vkey_witnesses().iter().map(map_vkey_witness).collect(),
.vkey_witnesses()
.iter()
.map(|x| map_vkey_witness(x))
.collect(),
script: collect_all_scripts(tx), script: collect_all_scripts(tx),
plutus_datums: tx plutus_datums: tx
.plutus_data() .plutus_data()