Skip to content

Commit 7319aea

Browse files
thunderbiscuitthunderbiscuit
committed
fix: rename esplora scan to full_scan
1 parent 54beb23 commit 7319aea

File tree

11 files changed

+19
-19
lines changed

11 files changed

+19
-19
lines changed

‎bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class LiveTxBuilderTest {
1212
val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
1313
val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
1414
val esploraClient = EsploraClient("https://mempool.space/testnet/api")
15-
val update = esploraClient.scan(wallet, 10uL, 1uL)
15+
val update = esploraClient.fullScan(wallet, 10uL, 1uL)
1616
wallet.applyUpdate(update)
1717
println("Balance: ${wallet.getBalance().total}")
1818

@@ -34,7 +34,7 @@ class LiveTxBuilderTest {
3434
val changeDescriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)", Network.TESTNET)
3535
val wallet = Wallet.newNoPersist(externalDescriptor, changeDescriptor, Network.TESTNET)
3636
val esploraClient = EsploraClient("https://mempool.space/testnet/api")
37-
val update = esploraClient.scan(wallet, 10uL, 1uL)
37+
val update = esploraClient.fullScan(wallet, 10uL, 1uL)
3838
wallet.applyUpdate(update)
3939
println("Balance: ${wallet.getBalance().total}")
4040

‎bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveWalletTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class LiveWalletTest {
1212
val descriptor: Descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
1313
val wallet: Wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
1414
val esploraClient: EsploraClient = EsploraClient("https://mempool.space/testnet/api")
15-
val update = esploraClient.scan(wallet, 10uL, 1uL)
15+
val update = esploraClient.fullScan(wallet, 10uL, 1uL)
1616
wallet.applyUpdate(update)
1717
println("Balance: ${wallet.getBalance().total}")
1818
val balance: Balance = wallet.getBalance()
@@ -35,7 +35,7 @@ class LiveWalletTest {
3535
val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
3636
val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
3737
val esploraClient = EsploraClient("https://mempool.space/testnet/api")
38-
val update = esploraClient.scan(wallet, 10uL, 1uL)
38+
val update = esploraClient.fullScan(wallet, 10uL, 1uL)
3939

4040
wallet.applyUpdate(update)
4141
println("Balance: ${wallet.getBalance().total}")

‎bdk-ffi/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ default = ["uniffi/cli"]
1919

2020
[dependencies]
2121
bdk = { version = "1.0.0-alpha.3", features = ["all-keys", "keys-bip39"] }
22+
bdk_esplora = { version = "0.5.0", default-features = false, features = ["std", "blocking"] }
2223

2324
# TODO 22: The bdk_esplora crate uses esplora_client which uses reqwest for async. By default it uses the system
2425
# openssl library, which is creating problems for cross-compilation. I'd rather use rustls, but it's hidden
@@ -28,7 +29,6 @@ bdk = { version = "1.0.0-alpha.3", features = ["all-keys", "keys-bip39"] }
2829
# bdk = { git = "https://github.com/thunderbiscuit/bdk.git", branch = "test-rust-tls", version = "1.0.0-alpha.2", features = ["all-keys", "keys-bip39"] }
2930
# bdk_esplora = { git = "https://github.com/thunderbiscuit/bdk.git", branch = "test-rust-tls", version = "0.4.0", package = "bdk_esplora", default-features = false, features = ["std", "blocking", "async-https-rustls"] }
3031

31-
bdk_esplora = { version = "0.5.0", default-features = false, features = ["std", "blocking"] }
3232
uniffi = { version = "=0.25.1" }
3333

3434
[build-dependencies]

‎bdk-ffi/src/bdk.udl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ interface EsploraClient {
255255
constructor(string url);
256256

257257
[Throws=Alpha3Error]
258-
Update scan(Wallet wallet, u64 stop_gap, u64 parallel_requests);
258+
Update full_scan(Wallet wallet, u64 stop_gap, u64 parallel_requests);
259259

260260
[Throws=Alpha3Error]
261261
void broadcast([ByRef] Transaction transaction);

‎bdk-ffi/src/esplora.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ impl EsploraClient {
1919

2020
// This is a temporary solution for scanning. The long-term solution involves not passing
2121
// the wallet to the client at all.
22-
pub fn scan(
22+
pub fn full_scan(
2323
&self,
2424
wallet: Arc<Wallet>,
2525
stop_gap: u64,

‎bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class LiveTxBuilderTest {
99
val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
1010
val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
1111
val esploraClient = EsploraClient("https://mempool.space/testnet/api")
12-
val update = esploraClient.scan(wallet, 10uL, 1uL)
12+
val update = esploraClient.fullScan(wallet, 10uL, 1uL)
1313
wallet.applyUpdate(update)
1414
println("Balance: ${wallet.getBalance().total}")
1515

@@ -32,7 +32,7 @@ class LiveTxBuilderTest {
3232
val changeDescriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)", Network.TESTNET)
3333
val wallet = Wallet.newNoPersist(externalDescriptor, changeDescriptor, Network.TESTNET)
3434
val esploraClient = EsploraClient("https://mempool.space/testnet/api")
35-
val update = esploraClient.scan(wallet, 10uL, 1uL)
35+
val update = esploraClient.fullScan(wallet, 10uL, 1uL)
3636
wallet.applyUpdate(update)
3737
println("Balance: ${wallet.getBalance().total}")
3838

‎bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveWalletTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class LiveWalletTest {
1010
val wallet: Wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
1111
val esploraClient: EsploraClient = EsploraClient("https://mempool.space/testnet/api")
1212
// val esploraClient = EsploraClient("https://blockstream.info/testnet/api")
13-
val update = esploraClient.scan(wallet, 10uL, 1uL)
13+
val update = esploraClient.fullScan(wallet, 10uL, 1uL)
1414
wallet.applyUpdate(update)
1515
println("Balance: ${wallet.getBalance().total}")
1616

@@ -31,7 +31,7 @@ class LiveWalletTest {
3131
val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
3232
val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
3333
val esploraClient = EsploraClient("https://mempool.space/testnet/api")
34-
val update = esploraClient.scan(wallet, 10uL, 1uL)
34+
val update = esploraClient.fullScan(wallet, 10uL, 1uL)
3535

3636
wallet.applyUpdate(update)
3737
println("Balance: ${wallet.getBalance().total}")

‎bdk-python/tests/test_live_tx_builder.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def test_tx_builder(self):
1414
bdk.Network.TESTNET
1515
)
1616
esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api")
17-
update = esploraClient.scan(
17+
update = esploraClient.full_scan(
1818
wallet = wallet,
1919
stop_gap = 10,
2020
parallel_requests = 1
@@ -48,7 +48,7 @@ def complex_tx_builder(self):
4848
bdk.Network.TESTNET
4949
)
5050
esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api")
51-
update = esploraClient.scan(
51+
update = esploraClient.full_scan(
5252
wallet = wallet,
5353
stop_gap = 10,
5454
parallel_requests = 1

‎bdk-python/tests/test_live_wallet.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def test_synced_balance(self):
1414
bdk.Network.TESTNET
1515
)
1616
esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api")
17-
update = esploraClient.scan(
17+
update = esploraClient.full_scan(
1818
wallet = wallet,
1919
stop_gap = 10,
2020
parallel_requests = 1
@@ -43,7 +43,7 @@ def test_broadcast_transaction(self):
4343
bdk.Network.TESTNET
4444
)
4545
esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api")
46-
update = esploraClient.scan(
46+
update = esploraClient.full_scan(
4747
wallet = wallet,
4848
stop_gap = 10,
4949
parallel_requests = 1

‎bdk-swift/Tests/BitcoinDevKitTests/LiveTxBuilderTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ final class LiveTxBuilderTests: XCTestCase {
1313
network: .testnet
1414
)
1515
let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api")
16-
let update = try esploraClient.scan(
16+
let update = try esploraClient.fullScan(
1717
wallet: wallet,
1818
stopGap: 10,
1919
parallelRequests: 1
@@ -47,7 +47,7 @@ final class LiveTxBuilderTests: XCTestCase {
4747
network: .testnet
4848
)
4949
let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api")
50-
let update = try esploraClient.scan(
50+
let update = try esploraClient.fullScan(
5151
wallet: wallet,
5252
stopGap: 10,
5353
parallelRequests: 1

0 commit comments

Comments
 (0)