Skip to content

Commit 6eaf4c4

Browse files
tchardingtcharding
committed
Merge #336: Test listwallets
1a71c44 Test listwallets (Jamil Lambert, PhD) a9ce14c Update getunconfirmedbalance types table (Jamil Lambert, PhD) Pull request description: `listwallets` is implemented but untested. Also the `getunconfirmedbalance` test was added in a previous PR but the types table was not updated. - Remove `getunconfirmedbalance` `UNTESTED` from the types table. - Add a test for `listwallet` and update the types table. ACKs for top commit: tcharding: ACK 1a71c44 Tree-SHA512: d607a6bdb7a0637f0db20a0388a0665cce662bd2e14362e9068f5d2b9a3d7901ad70e939b4f26447dfe1c6e5ae9b43353574b1a8ea0c32412838f157a2108c5b
2 parents 2bebba0 + 1a71c44 commit 6eaf4c4

File tree

14 files changed

+41
-26
lines changed

14 files changed

+41
-26
lines changed

‎integration_test/tests/wallet.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,21 @@ fn wallet__list_wallet_dir() {
717717
assert!(wallet_names.iter().any(|w| *w == wallet_name));
718718
}
719719

720+
#[test]
721+
fn wallet__list_wallets__modelled() {
722+
let node = Node::with_wallet(Wallet::None, &[]);
723+
724+
let wallet_1 = "test_wallet_1";
725+
let wallet_2 = "test_wallet_2";
726+
node.client.create_wallet(wallet_1).expect("createwallet w1");
727+
node.client.create_wallet(wallet_2).expect("createwallet w2");
728+
729+
let json: ListWallets = node.client.list_wallets().expect("listwallets");
730+
731+
assert!(json.0.iter().any(|w| w == wallet_1));
732+
assert!(json.0.iter().any(|w| w == wallet_2));
733+
}
734+
720735
#[test]
721736
fn wallet__load_wallet__modelled() {
722737
create_load_unload_wallet();

‎types/src/v17/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
//! | getreceivedbyaccount | returns nothing | |
171171
//! | getreceivedbyaddress | version + model | |
172172
//! | gettransaction | version + model | |
173-
//! | getunconfirmedbalance | version + model | UNTESTED |
173+
//! | getunconfirmedbalance | version + model | |
174174
//! | getwalletinfo | version + model | UNTESTED |
175175
//! | importaddress | returns nothing | |
176176
//! | importmulti | version | |
@@ -188,7 +188,7 @@
188188
//! | listsinceblock | version + model | UNTESTED |
189189
//! | listtransactions | version + model | UNTESTED |
190190
//! | listunspent | version + model | |
191-
//! | listwallets | version + model | UNTESTED |
191+
//! | listwallets | version + model | |
192192
//! | loadwallet | version + model | |
193193
//! | lockunspent | version | |
194194
//! | move | returns boolean | |

‎types/src/v18/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
//! | getreceivedbyaddress | version + model | |
175175
//! | getreceivedbylabel | version + model | |
176176
//! | gettransaction | version + model | |
177-
//! | getunconfirmedbalance | version + model | UNTESTED |
177+
//! | getunconfirmedbalance | version + model | |
178178
//! | getwalletinfo | version + model | UNTESTED |
179179
//! | importaddress | returns nothing | |
180180
//! | importmulti | version | |
@@ -192,7 +192,7 @@
192192
//! | listtransactions | version + model | UNTESTED |
193193
//! | listunspent | version + model | |
194194
//! | listwalletdir | version | |
195-
//! | listwallets | version + model | UNTESTED |
195+
//! | listwallets | version + model | |
196196
//! | loadwallet | version + model | |
197197
//! | lockunspent | version | |
198198
//! | removeprunedfunds | returns nothing | |

‎types/src/v19/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
//! | getreceivedbyaddress | version + model | |
176176
//! | getreceivedbylabel | version + model | |
177177
//! | gettransaction | version + model | |
178-
//! | getunconfirmedbalance | version + model | UNTESTED |
178+
//! | getunconfirmedbalance | version + model | |
179179
//! | getwalletinfo | version + model | UNTESTED |
180180
//! | importaddress | returns nothing | |
181181
//! | importmulti | version | |
@@ -193,7 +193,7 @@
193193
//! | listtransactions | version + model | UNTESTED |
194194
//! | listunspent | version + model | |
195195
//! | listwalletdir | version | |
196-
//! | listwallets | version + model | UNTESTED |
196+
//! | listwallets | version + model | |
197197
//! | loadwallet | version + model | |
198198
//! | lockunspent | version | |
199199
//! | removeprunedfunds | returns nothing | |

‎types/src/v20/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
//! | getreceivedbyaddress | version + model | |
177177
//! | getreceivedbylabel | version + model | |
178178
//! | gettransaction | version + model | |
179-
//! | getunconfirmedbalance | version + model | UNTESTED |
179+
//! | getunconfirmedbalance | version + model | |
180180
//! | getwalletinfo | version + model | UNTESTED |
181181
//! | importaddress | returns nothing | |
182182
//! | importmulti | version | |
@@ -194,7 +194,7 @@
194194
//! | listtransactions | version + model | UNTESTED |
195195
//! | listunspent | version + model | |
196196
//! | listwalletdir | version | |
197-
//! | listwallets | version + model | UNTESTED |
197+
//! | listwallets | version + model | |
198198
//! | loadwallet | version + model | |
199199
//! | lockunspent | version | |
200200
//! | removeprunedfunds | returns nothing | |

‎types/src/v21/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
//! | getreceivedbyaddress | version + model | |
179179
//! | getreceivedbylabel | version + model | |
180180
//! | gettransaction | version + model | |
181-
//! | getunconfirmedbalance | version + model | UNTESTED |
181+
//! | getunconfirmedbalance | version + model | |
182182
//! | getwalletinfo | version + model | UNTESTED |
183183
//! | importaddress | returns nothing | |
184184
//! | importdescriptors | version | |
@@ -198,7 +198,7 @@
198198
//! | listtransactions | version + model | UNTESTED |
199199
//! | listunspent | version + model | |
200200
//! | listwalletdir | version | |
201-
//! | listwallets | version + model | UNTESTED |
201+
//! | listwallets | version + model | |
202202
//! | loadwallet | version + model | |
203203
//! | lockunspent | version | |
204204
//! | removeprunedfunds | returns nothing | |

‎types/src/v22/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
//! | getreceivedbyaddress | version + model | |
188188
//! | getreceivedbylabel | version + model | |
189189
//! | gettransaction | version + model | |
190-
//! | getunconfirmedbalance | version + model | UNTESTED |
190+
//! | getunconfirmedbalance | version + model | |
191191
//! | getwalletinfo | version + model | UNTESTED |
192192
//! | importaddress | returns nothing | |
193193
//! | importdescriptors | version | |
@@ -208,7 +208,7 @@
208208
//! | listtransactions | version + model | UNTESTED |
209209
//! | listunspent | version + model | |
210210
//! | listwalletdir | version | |
211-
//! | listwallets | version + model | UNTESTED |
211+
//! | listwallets | version + model | |
212212
//! | loadwallet | version + model | |
213213
//! | lockunspent | version | |
214214
//! | removeprunedfunds | returns nothing | |

‎types/src/v23/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
//! | getreceivedbyaddress | version + model | |
179179
//! | getreceivedbylabel | version + model | |
180180
//! | gettransaction | version + model | |
181-
//! | getunconfirmedbalance | version + model | UNTESTED |
181+
//! | getunconfirmedbalance | version + model | |
182182
//! | getwalletinfo | version + model | UNTESTED |
183183
//! | importaddress | returns nothing | |
184184
//! | importdescriptors | version | |
@@ -200,7 +200,7 @@
200200
//! | listtransactions | version + model | UNTESTED |
201201
//! | listunspent | version + model | |
202202
//! | listwalletdir | version | |
203-
//! | listwallets | version + model | UNTESTED |
203+
//! | listwallets | version + model | |
204204
//! | loadwallet | version + model | |
205205
//! | lockunspent | version | |
206206
//! | removeprunedfunds | returns nothing | |

‎types/src/v24/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
//! | getreceivedbyaddress | version + model | |
180180
//! | getreceivedbylabel | version + model | |
181181
//! | gettransaction | version + model | |
182-
//! | getunconfirmedbalance | version + model | UNTESTED |
182+
//! | getunconfirmedbalance | version + model | |
183183
//! | getwalletinfo | version + model | UNTESTED |
184184
//! | importaddress | returns nothing | |
185185
//! | importdescriptors | version | |
@@ -202,7 +202,7 @@
202202
//! | listtransactions | version + model | UNTESTED |
203203
//! | listunspent | version + model | |
204204
//! | listwalletdir | version | |
205-
//! | listwallets | version + model | UNTESTED |
205+
//! | listwallets | version + model | |
206206
//! | loadwallet | version + model | |
207207
//! | lockunspent | version | |
208208
//! | removeprunedfunds | returns nothing | |

‎types/src/v25/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
//! | getreceivedbyaddress | version + model | |
181181
//! | getreceivedbylabel | version + model | |
182182
//! | gettransaction | version + model | |
183-
//! | getunconfirmedbalance | version + model | UNTESTED |
183+
//! | getunconfirmedbalance | version + model | |
184184
//! | getwalletinfo | version + model | UNTESTED |
185185
//! | importaddress | returns nothing | |
186186
//! | importdescriptors | version | |
@@ -203,7 +203,7 @@
203203
//! | listtransactions | version + model | UNTESTED |
204204
//! | listunspent | version + model | |
205205
//! | listwalletdir | version | |
206-
//! | listwallets | version + model | UNTESTED |
206+
//! | listwallets | version + model | |
207207
//! | loadwallet | version + model | |
208208
//! | lockunspent | version | |
209209
//! | removeprunedfunds | returns nothing | |

0 commit comments

Comments
 (0)