Skip to content

Commit d692e4f

Browse files
committed
Rename rescan_policy -> rescan_since to be more consistent
1 parent e839e86 commit d692e4f

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

src/wallet.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ pub struct Wallet {
193193
checksum: Checksum,
194194
keys_info: Vec<DescKeyInfo>,
195195
network: Network,
196-
rescan_policy: RescanSince,
196+
rescan_since: RescanSince,
197197

198198
gap_limit: u32,
199199
initial_import_size: u32,
@@ -208,7 +208,7 @@ impl Wallet {
208208
network: Network,
209209
gap_limit: u32,
210210
initial_import_size: u32,
211-
rescan_policy: RescanSince,
211+
rescan_since: RescanSince,
212212
) -> Result<Self> {
213213
ensure!(
214214
descriptor::derive_address(&desc, 0, network).is_some(),
@@ -229,7 +229,7 @@ impl Wallet {
229229
gap_limit,
230230
// setting initial_import_size < gap_limit makes no sense, the user probably meant to increase both
231231
initial_import_size: initial_import_size.max(gap_limit),
232-
rescan_policy,
232+
rescan_since,
233233
done_initial_import: false,
234234
max_funded_index: None,
235235
max_imported_index: None,
@@ -241,14 +241,14 @@ impl Wallet {
241241
network: Network,
242242
gap_limit: u32,
243243
initial_import_size: u32,
244-
rescan_policy: RescanSince,
244+
rescan_since: RescanSince,
245245
) -> Result<Self> {
246246
Self::from_descriptor(
247247
xpub.as_descriptor([][..].into()),
248248
network,
249249
gap_limit,
250250
initial_import_size,
251-
rescan_policy,
251+
rescan_since,
252252
)
253253
}
254254

@@ -257,7 +257,7 @@ impl Wallet {
257257
network: Network,
258258
gap_limit: u32,
259259
initial_import_size: u32,
260-
rescan_policy: RescanSince,
260+
rescan_since: RescanSince,
261261
) -> Result<Vec<Self>> {
262262
Ok(vec![
263263
// external chain (receive)
@@ -266,15 +266,15 @@ impl Wallet {
266266
network,
267267
gap_limit,
268268
initial_import_size,
269-
rescan_policy,
269+
rescan_since,
270270
)?,
271271
// internal chain (change)
272272
Self::from_descriptor(
273273
xpub.as_descriptor([1.into()][..].into()),
274274
network,
275275
gap_limit,
276276
initial_import_size,
277-
rescan_policy,
277+
rescan_since,
278278
)?,
279279
])
280280
}
@@ -302,7 +302,7 @@ impl Wallet {
302302
rescan: bool,
303303
) -> Vec<(Address, RescanSince, String)> {
304304
let rescan_since = if rescan {
305-
self.rescan_policy
305+
self.rescan_since
306306
} else {
307307
RescanSince::Now
308308
};
@@ -487,7 +487,7 @@ impl Serialize for Wallet {
487487
rgb.serialize_field("network", &self.network)?;
488488
rgb.serialize_field("is_ranged", &self.is_ranged)?;
489489
rgb.serialize_field("bip32_origins", &bip32_origins)?;
490-
rgb.serialize_field("rescan_policy", &self.rescan_policy)?;
490+
rgb.serialize_field("rescan_since", &self.rescan_since)?;
491491
rgb.serialize_field("done_initial_import", &self.done_initial_import)?;
492492
rgb.serialize_field("max_funded_index", &self.max_funded_index)?;
493493
rgb.serialize_field("max_imported_index", &self.max_imported_index)?;

0 commit comments

Comments
 (0)