Skip to content

Commit 6fe8902

Browse files
tchardingtcharding
committed
Merge #337: Test rescanblockchain
c4b963b Test rescanblockchain (Jamil Lambert, PhD) Pull request description: `rescanblockchain` is implemented but untested. Add a test for it and update the types table. ACKs for top commit: tcharding: ACK c4b963b Tree-SHA512: 12c43fa00761dea97ba667dcd5b20308a07165bb24a0a2035c9f24ef7334c2325b65635a0d51521f6078103de5d4e46184258f3c35ad971b379df9c116b510ad
2 parents 6eaf4c4 + c4b963b commit 6fe8902

File tree

14 files changed

+27
-13
lines changed

14 files changed

+27
-13
lines changed

‎integration_test/tests/wallet.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,20 @@ fn wallet__remove_pruned_funds() {
809809
let _: () = node.client.remove_pruned_funds(txid).expect("removeprunedfunds");
810810
}
811811

812+
#[test]
813+
fn wallet__rescan_blockchain__modelled() {
814+
let node = Node::with_wallet(Wallet::Default, &[]);
815+
816+
let mining_addr = node.client.new_address().expect("newaddress");
817+
let _ = node.client.generate_to_address(3, &mining_addr).expect("generatetoaddress");
818+
819+
let json: RescanBlockchain = node.client.rescan_blockchain().expect("rescanblockchain");
820+
let model: Result<mtype::RescanBlockchain, _> = json.into_model();
821+
let rescan = model.unwrap();
822+
823+
assert!(rescan.stop_height >= rescan.start_height);
824+
}
825+
812826
// This is tested in `backup_and_restore_wallet()`, called by wallet__backup_wallet()
813827
#[cfg(not(feature = "v22_and_below"))]
814828
#[test]

‎types/src/v17/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
//! | lockunspent | version | |
194194
//! | move | returns boolean | |
195195
//! | removeprunedfunds | returns nothing | |
196-
//! | rescanblockchain | version + model | UNTESTED |
196+
//! | rescanblockchain | version + model | |
197197
//! | sendfrom | returns nothing | |
198198
//! | sendmany | version + model | UNTESTED |
199199
//! | sendtoaddress | version + model | |

‎types/src/v18/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
//! | loadwallet | version + model | |
197197
//! | lockunspent | version | |
198198
//! | removeprunedfunds | returns nothing | |
199-
//! | rescanblockchain | version + model | UNTESTED |
199+
//! | rescanblockchain | version + model | |
200200
//! | sendmany | version + model | UNTESTED |
201201
//! | sendtoaddress | version + model | |
202202
//! | sethdseed | returns nothing | |

‎types/src/v19/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
//! | loadwallet | version + model | |
198198
//! | lockunspent | version | |
199199
//! | removeprunedfunds | returns nothing | |
200-
//! | rescanblockchain | version + model | UNTESTED |
200+
//! | rescanblockchain | version + model | |
201201
//! | sendmany | version + model | UNTESTED |
202202
//! | sendtoaddress | version + model | |
203203
//! | sethdseed | returns nothing | |

‎types/src/v20/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
//! | loadwallet | version + model | |
199199
//! | lockunspent | version | |
200200
//! | removeprunedfunds | returns nothing | |
201-
//! | rescanblockchain | version + model | UNTESTED |
201+
//! | rescanblockchain | version + model | |
202202
//! | sendmany | version + model | UNTESTED |
203203
//! | sendtoaddress | version + model | |
204204
//! | sethdseed | returns nothing | |

‎types/src/v21/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
//! | loadwallet | version + model | |
203203
//! | lockunspent | version | |
204204
//! | removeprunedfunds | returns nothing | |
205-
//! | rescanblockchain | version + model | UNTESTED |
205+
//! | rescanblockchain | version + model | |
206206
//! | send | version + model | |
207207
//! | sendmany | version + model | UNTESTED |
208208
//! | sendtoaddress | version + model | |

‎types/src/v22/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
//! | loadwallet | version + model | |
213213
//! | lockunspent | version | |
214214
//! | removeprunedfunds | returns nothing | |
215-
//! | rescanblockchain | version + model | UNTESTED |
215+
//! | rescanblockchain | version + model | |
216216
//! | send | version + model | |
217217
//! | sendmany | version + model | UNTESTED |
218218
//! | sendtoaddress | version + model | |

‎types/src/v23/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
//! | loadwallet | version + model | |
205205
//! | lockunspent | version | |
206206
//! | removeprunedfunds | returns nothing | |
207-
//! | rescanblockchain | version + model | UNTESTED |
207+
//! | rescanblockchain | version + model | |
208208
//! | restorewallet | version | |
209209
//! | send | version + model | |
210210
//! | sendmany | version + model | UNTESTED |

‎types/src/v24/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
//! | loadwallet | version + model | |
207207
//! | lockunspent | version | |
208208
//! | removeprunedfunds | returns nothing | |
209-
//! | rescanblockchain | version + model | UNTESTED |
209+
//! | rescanblockchain | version + model | |
210210
//! | restorewallet | version | |
211211
//! | send | version + model | |
212212
//! | sendall | version + model | |

‎types/src/v25/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
//! | loadwallet | version + model | |
208208
//! | lockunspent | version | |
209209
//! | removeprunedfunds | returns nothing | |
210-
//! | rescanblockchain | version + model | UNTESTED |
210+
//! | rescanblockchain | version + model | |
211211
//! | restorewallet | version | |
212212
//! | send | version + model | |
213213
//! | sendall | version + model | |

0 commit comments

Comments
 (0)