frost/bdk-ffi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor transaction 'id' property to 'txid'

Browse Source
This commit is contained in:
thunderbiscuit 2021-11-12 12:29:53 -05:00
parent 3f28be0854
commit 9fa6fd5133
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bindings/bdk-kotlin/demo/src/main/kotlin/Main.kt
View File

@ -18,8 +18,8 @@ fun getTransaction(wallet: OnlineWalletInterface, transactionId: String): Option
.stream() .stream()
.filter({ .filter({
when (it) { when (it) {
is Transaction.Confirmed -> it.details.id.equals(transactionId) is Transaction.Confirmed -> it.details.txid.equals(transactionId)
is Transaction.Unconfirmed -> it.details.id.equals(transactionId) is Transaction.Unconfirmed -> it.details.txid.equals(transactionId)
} }
}) })
.findFirst() .findFirst()
@ -32,7 +32,7 @@ val unconfirmedFirstThenByTimestampDescending =
(a is Transaction.Confirmed && b is Transaction.Confirmed) -> { (a is Transaction.Confirmed && b is Transaction.Confirmed) -> {
val comparison = b.confirmation.timestamp.compareTo(a.confirmation.timestamp) val comparison = b.confirmation.timestamp.compareTo(a.confirmation.timestamp)
when { when {
comparison == 0 -> b.details.id.compareTo(a.details.id) comparison == 0 -> b.details.txid.compareTo(a.details.txid)
else -> comparison else -> comparison
} }
} }

2
src/bdk.udl
View File

@ -70,7 +70,7 @@ dictionary TransactionDetails {
u64? fees; u64? fees;
u64 received; u64 received;
u64 sent; u64 sent;
string id; string txid;
}; };
dictionary Confirmation { dictionary Confirmation {

4
src/lib.rs
View File

@ -66,7 +66,7 @@ pub struct TransactionDetails {
pub fees: Option<u64>, pub fees: Option<u64>,
pub received: u64, pub received: u64,
pub sent: u64, pub sent: u64,
pub id: String, pub txid: String,
} }
type Confirmation = ConfirmationTime; type Confirmation = ConfirmationTime;
@ -86,7 +86,7 @@ impl From<&bdk::TransactionDetails> for TransactionDetails {
fn from(x: &bdk::TransactionDetails) -> TransactionDetails { fn from(x: &bdk::TransactionDetails) -> TransactionDetails {
TransactionDetails { TransactionDetails {
fees: x.fee, fees: x.fee,
id: x.txid.to_string(), txid: x.txid.to_string(),
received: x.received, received: x.received,
sent: x.sent, sent: x.sent,
} }