Skip to content

Commit

Permalink
Remove now dead code.
Browse files Browse the repository at this point in the history
  • Loading branch information
@murisi
murisi committed Jun 27, 2024
1 parent 7a80d59 commit 1ebcb5e
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 272 deletions.
32 changes: 9 additions & 23 deletions crates/light_sdk/src/transaction/transfer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,15 @@ pub struct TransferBuilder(Tx);

impl TransferBuilder {
/// Build a transparent transfer transaction from the given parameters
pub fn transparent(transfers: Transfer, args: GlobalArgs) -> Self {
pub fn transparent(transfers: Vec<TransferData>, args: GlobalArgs) -> Self {
let data = namada_sdk::token::Transfer {
data: transfers,
shielded_section_hash: None,
};

Self(transaction::build_tx(
args,
transfers,
data,
TX_TRANSFER_WASM.to_string(),
))
}
Expand All @@ -42,27 +47,8 @@ impl TransferBuilder {
Self(tx)
}

/// Build a shielding transfer transaction from the given parameters
pub fn shielding(
transfers: Vec<TransferData>,
shielded_section_hash: Hash,
transaction: Transaction,
args: GlobalArgs,
) -> Self {
let data = namada_sdk::token::Transfer {
data: transfers,
shielded_section_hash: Some(shielded_section_hash),
};

let mut tx =
transaction::build_tx(args, data, TX_TRANSFER_WASM.to_string());
tx.add_masp_tx_section(transaction);

Self(tx)
}

/// Build an unshielding transfer transaction from the given parameters
pub fn unshielding(
/// Build a MASP transfer transaction from the given parameters
pub fn masp(
transfers: Vec<TransferData>,
shielded_section_hash: Hash,
transaction: Transaction,
Expand Down
10 changes: 4 additions & 6 deletions crates/sdk/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -908,9 +908,7 @@ pub mod testing {
VoteProposal(VoteProposalData),
Withdraw(Withdraw),
TransparentTransfer(Transfer),
ShieldedTransfer(Transfer, (StoredBuildParams, String)),
ShieldingTransfer(Transfer, (StoredBuildParams, String)),
UnshieldingTransfer(Transfer, (StoredBuildParams, String)),
MaspTransfer(Transfer, (StoredBuildParams, String)),
Bond(Bond),
Redelegation(Redelegation),
UpdateStewardCommission(UpdateStewardCommission),
Expand Down Expand Up @@ -1128,7 +1126,7 @@ pub mod testing {
shielded_section_hash: Some(shielded_section_hash),
};
tx.add_data(data.clone());
TxData::ShieldedTransfer(data, (build_params, build_param_bytes))
TxData::MaspTransfer(data, (build_params, build_param_bytes))
},
MaspTxType::Shielding => {
// Set the transparent amount and token
Expand All @@ -1152,7 +1150,7 @@ pub mod testing {
shielded_section_hash: Some(shielded_section_hash),
};
tx.add_data(data.clone());
TxData::ShieldingTransfer(data, (build_params, build_param_bytes))
TxData::MaspTransfer(data, (build_params, build_param_bytes))
},
MaspTxType::Unshielding => {
// Set the transparent amount and token
Expand All @@ -1173,7 +1171,7 @@ pub mod testing {
).collect();
let data = Transfer{data, shielded_section_hash: Some(shielded_section_hash) };
tx.add_data(data.clone());
TxData::UnshieldingTransfer(data, (build_params, build_param_bytes))
TxData::MaspTransfer(data, (build_params, build_param_bytes))
},
};
tx.add_masp_builder(MaspBuilder {
Expand Down
117 changes: 39 additions & 78 deletions crates/sdk/src/signing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -706,68 +706,57 @@ enum TransferSide<'a> {
Target(&'a Address),
}

enum TokenTransfer<'a> {
Transparent(&'a token::Transfer),
}
struct TokenTransfer<'a>(&'a token::Transfer);

impl TokenTransfer<'_> {
fn sources(&self) -> Vec<&Address> {
match self {
TokenTransfer::Transparent(transfers) => transfers
.data
.iter()
.map(|transfer| &transfer.source)
.collect(),
}
self.0
.data
.iter()
.map(|transfer| &transfer.source)
.collect()
}

fn targets(&self) -> Vec<&Address> {
match self {
TokenTransfer::Transparent(transfers) => transfers
.data
.iter()
.map(|transfer| &transfer.target)
.collect(),
}
self.0
.data
.iter()
.map(|transfer| &transfer.target)
.collect()
}

fn tokens_and_amounts(
&self,
address: TransferSide<'_>,
) -> Result<HashMap<&Address, DenominatedAmount>, Error> {
Ok(match self {
TokenTransfer::Transparent(transfers) => {
let mut map: HashMap<&Address, DenominatedAmount> =
HashMap::new();

match address {
TransferSide::Source(source) => {
for transfer in &transfers.data {
if source == &transfer.source {
Self::update_token_amount_map(
&mut map,
&transfer.token,
transfer.amount,
)?;
}
}
let mut map: HashMap<&Address, DenominatedAmount> =
HashMap::new();

match address {
TransferSide::Source(source) => {
for transfer in &self.0.data {
if source == &transfer.source {
Self::update_token_amount_map(
&mut map,
&transfer.token,
transfer.amount,
)?;
}
TransferSide::Target(target) => {
for transfer in &transfers.data {
if target == &transfer.target {
Self::update_token_amount_map(
&mut map,
&transfer.token,
transfer.amount,
)?;
}
}
}
}
TransferSide::Target(target) => {
for transfer in &self.0.data {
if target == &transfer.target {
Self::update_token_amount_map(
&mut map,
&transfer.token,
transfer.amount,
)?;
}
}

map
}
})
}
Ok(map)
}

fn update_token_amount_map<'a>(
Expand Down Expand Up @@ -1340,34 +1329,6 @@ pub async fn to_ledger_vector(
.map_err(|err| {
Error::from(EncodingError::Conversion(err.to_string()))
})?;

tv.name = "Transfer_0".to_string();

tv.output.push("Type : TransparentTransfer".to_string());
make_ledger_token_transfer_endpoints(
&tokens,
&mut tv.output,
TokenTransfer::Transparent(&transfer),
None,
&HashMap::default(),
)
.await?;
make_ledger_token_transfer_endpoints(
&tokens,
&mut tv.output_expert,
TokenTransfer::Transparent(&transfer),
None,
&HashMap::default(),
)
.await?;
} else if code_sec.tag == Some(TX_TRANSFER_WASM.to_string()) {
let transfer = token::Transfer::try_from_slice(
&tx.data(cmt)
.ok_or_else(|| Error::Other("Invalid Data".to_string()))?,
)
.map_err(|err| {
Error::from(EncodingError::Conversion(err.to_string()))
})?;
// To facilitate lookups of MASP AssetTypes
let mut asset_types = HashMap::new();
let builder = tx.sections.iter().find_map(|x| match x {
Expand All @@ -1389,21 +1350,21 @@ pub async fn to_ledger_vector(
_ => None,
});

tv.name = "ShieldedTransfer_0".to_string();
tv.name = "Transfer_0".to_string();

tv.output.push("Type : ShieldedTransfer".to_string());
tv.output.push("Type : Transfer".to_string());
make_ledger_token_transfer_endpoints(
&tokens,
&mut tv.output,
TokenTransfer::Transparent(&transfer),
TokenTransfer(&transfer),
builder,
&asset_types,
)
.await?;
make_ledger_token_transfer_endpoints(
&tokens,
&mut tv.output_expert,
TokenTransfer::Transparent(&transfer),
TokenTransfer(&transfer),
builder,
&asset_types,
)
Expand Down
18 changes: 0 additions & 18 deletions wasm/tx_shielded_transfer/Cargo.toml
View file

This file was deleted.

29 changes: 0 additions & 29 deletions wasm/tx_shielded_transfer/src/lib.rs
View file

This file was deleted.

18 changes: 0 additions & 18 deletions wasm/tx_shielding_transfer/Cargo.toml
View file

This file was deleted.

41 changes: 0 additions & 41 deletions wasm/tx_shielding_transfer/src/lib.rs
View file

This file was deleted.

18 changes: 0 additions & 18 deletions wasm/tx_unshielding_transfer/Cargo.toml
View file

This file was deleted.

Loading

0 comments on commit 1ebcb5e

Please sign in to comment.