Skip to content

refactor: use macros for LockTime and PkOrF #790

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
reez merged 1 commit into from
Jul 7, 2025
Merged

refactor: use macros for LockTime and PkOrF #790

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
12 changes: 0 additions & 12 deletions bdk-ffi/src/bdk.udl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,18 +283,6 @@ typedef interface Policy;

typedef enum SatisfiableItem;

[Enum]
interface PkOrF {
Pubkey(string value);
XOnlyPubkey(string value);
Fingerprint(string value);
};

[Enum]
interface LockTime {
Blocks(u32 height);
Seconds(u32 consensus_time);
};

typedef enum Satisfaction;

Expand Down
2 changes: 0 additions & 2 deletions bdk-ffi/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ use crate::error::PsbtFinalizeError;
use crate::error::PsbtParseError;
use crate::error::RequestBuilderError;
use crate::error::TransactionError;
use crate::types::LockTime;
use crate::types::PkOrF;

use bdk_wallet::bitcoin::Network;

Expand Down
4 changes: 2 additions & 2 deletions bdk-ffi/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ impl From<BdkSatisfiableItem> for SatisfiableItem {
}
}

#[derive(Debug, Clone)]
#[derive(Debug, Clone, uniffi::Enum)]
pub enum PkOrF {
Pubkey { value: String },
XOnlyPubkey { value: String },
Expand All @@ -520,7 +520,7 @@ impl From<BdkPkOrF> for PkOrF {
}
}

#[derive(Debug, Clone)]
#[derive(Debug, Clone, uniffi::Enum)]
pub enum LockTime {
Blocks { height: u32 },
Seconds { consensus_time: u32 },
Expand Down
Loading