Skip to content

Commit c5d2854

Browse files
committed
bindings: renamed Sequence to TxSequence to avoid swift conflicts
1 parent fd403c8 commit c5d2854

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

lwk_bindings/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pub use blockdata::wallet_tx_out::WalletTxOut;
7070

7171
pub use crate::contract::Contract;
7272
pub use crate::signer::{Bip, Signer};
73-
pub use crate::types::{PublicKey, Sequence, XOnlyPublicKey};
73+
pub use crate::types::{PublicKey, TxSequence, XOnlyPublicKey};
7474
pub use crate::wollet::Wollet;
7575
pub use chain::Chain;
7676
pub use currency_code::CurrencyCode;

lwk_bindings/src/types/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ mod asset_id;
88
mod hex;
99
mod public_key;
1010
mod secret_key;
11-
mod sequence;
11+
mod tx_sequence;
1212
mod xonly_public_key;
1313

1414
pub use asset_id::AssetId;
1515
pub use hex::Hex;
1616
pub use public_key::PublicKey;
1717
pub use secret_key::SecretKey;
18-
pub use sequence::Sequence;
18+
pub use tx_sequence::TxSequence;
1919
pub use xonly_public_key::XOnlyPublicKey;
Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,88 +6,88 @@ use std::sync::Arc;
66
///
77
/// See [`elements::Sequence`] for more details.
88
#[derive(uniffi::Object, PartialEq, Eq, Debug, Clone, Copy)]
9-
pub struct Sequence {
9+
pub struct TxSequence {
1010
inner: elements::Sequence,
1111
}
1212

13-
impl From<elements::Sequence> for Sequence {
13+
impl From<elements::Sequence> for TxSequence {
1414
fn from(inner: elements::Sequence) -> Self {
15-
Sequence { inner }
15+
TxSequence { inner }
1616
}
1717
}
1818

19-
impl From<Sequence> for elements::Sequence {
20-
fn from(value: Sequence) -> Self {
19+
impl From<TxSequence> for elements::Sequence {
20+
fn from(value: TxSequence) -> Self {
2121
value.inner
2222
}
2323
}
2424

25-
impl From<&Sequence> for elements::Sequence {
26-
fn from(value: &Sequence) -> Self {
25+
impl From<&TxSequence> for elements::Sequence {
26+
fn from(value: &TxSequence) -> Self {
2727
value.inner
2828
}
2929
}
3030

31-
impl AsRef<elements::Sequence> for Sequence {
31+
impl AsRef<elements::Sequence> for TxSequence {
3232
fn as_ref(&self) -> &elements::Sequence {
3333
&self.inner
3434
}
3535
}
3636

3737
#[uniffi::export]
38-
impl Sequence {
38+
impl TxSequence {
3939
/// See [`elements::Sequence::from_consensus`].
4040
#[uniffi::constructor]
4141
pub fn from_consensus(value: u32) -> Arc<Self> {
42-
Arc::new(Sequence {
42+
Arc::new(TxSequence {
4343
inner: elements::Sequence::from_consensus(value),
4444
})
4545
}
4646

4747
/// See [`elements::Sequence::ZERO`].
4848
#[uniffi::constructor]
4949
pub fn zero() -> Arc<Self> {
50-
Arc::new(Sequence {
50+
Arc::new(TxSequence {
5151
inner: elements::Sequence::ZERO,
5252
})
5353
}
5454

5555
/// See [`elements::Sequence::MAX`].
5656
#[uniffi::constructor]
5757
pub fn max() -> Arc<Self> {
58-
Arc::new(Sequence {
58+
Arc::new(TxSequence {
5959
inner: elements::Sequence::MAX,
6060
})
6161
}
6262

6363
/// See [`elements::Sequence::ENABLE_RBF_NO_LOCKTIME`].
6464
#[uniffi::constructor]
6565
pub fn enable_rbf_no_locktime() -> Arc<Self> {
66-
Arc::new(Sequence {
66+
Arc::new(TxSequence {
6767
inner: elements::Sequence::ENABLE_RBF_NO_LOCKTIME,
6868
})
6969
}
7070

7171
/// See [`elements::Sequence::ENABLE_LOCKTIME_NO_RBF`].
7272
#[uniffi::constructor]
7373
pub fn enable_locktime_no_rbf() -> Arc<Self> {
74-
Arc::new(Sequence {
74+
Arc::new(TxSequence {
7575
inner: elements::Sequence::ENABLE_LOCKTIME_NO_RBF,
7676
})
7777
}
7878

7979
/// See [`elements::Sequence::from_height`].
8080
#[uniffi::constructor]
8181
pub fn from_height(height: u16) -> Arc<Self> {
82-
Arc::new(Sequence {
82+
Arc::new(TxSequence {
8383
inner: elements::Sequence::from_height(height),
8484
})
8585
}
8686

8787
/// See [`elements::Sequence::from_512_second_intervals`].
8888
#[uniffi::constructor]
8989
pub fn from_512_second_intervals(intervals: u16) -> Arc<Self> {
90-
Arc::new(Sequence {
90+
Arc::new(TxSequence {
9191
inner: elements::Sequence::from_512_second_intervals(intervals),
9292
})
9393
}
@@ -97,19 +97,19 @@ impl Sequence {
9797
pub fn from_seconds_floor(seconds: u32) -> Result<Arc<Self>, LwkError> {
9898
let inner =
9999
elements::Sequence::from_seconds_floor(seconds).map_err(|e| LwkError::Generic {
100-
msg: format!("Sequence from_seconds_floor error: {e}"),
100+
msg: format!("TxSequence from_seconds_floor error: {e}"),
101101
})?;
102-
Ok(Arc::new(Sequence { inner }))
102+
Ok(Arc::new(TxSequence { inner }))
103103
}
104104

105105
/// See [`elements::Sequence::from_seconds_ceil`].
106106
#[uniffi::constructor]
107107
pub fn from_seconds_ceil(seconds: u32) -> Result<Arc<Self>, LwkError> {
108108
let inner =
109109
elements::Sequence::from_seconds_ceil(seconds).map_err(|e| LwkError::Generic {
110-
msg: format!("Sequence from_seconds_ceil error: {e}"),
110+
msg: format!("TxSequence from_seconds_ceil error: {e}"),
111111
})?;
112-
Ok(Arc::new(Sequence { inner }))
112+
Ok(Arc::new(TxSequence { inner }))
113113
}
114114

115115
/// See [`elements::Sequence::to_consensus_u32`].

0 commit comments

Comments
 (0)