Skip to content

Commit c7ca552

Browse files
committed
Merge rust-bitcoin#56: Clean up tests
13c8e9f integration_test: Improve get_balance test (Tobin C. Harding) 52cf6d3 integration_test: Use fund_wallet (Tobin C. Harding) Pull request description: Do some trivial integration test clean ups. ACKs for top commit: apoelstra: utACK 13c8e9f Tree-SHA512: 1c19a4aebaad444c8e2bdf0698d3d1ea99e7d4256082425175bb11792b02af37997f45411e9fe12a70dd9d93c67f97f18e81febc0683aef1b5769a7c87790734
2 parents 8f86bc1 + 13c8e9f commit c7ca552

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

integration_test/tests/wallet.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,18 @@ pub fn get_address_info() {
8787
fn get_balance() {
8888
let node = Node::new_with_default_wallet();
8989
let json = node.client.get_balance().expect("getbalance");
90-
assert!(json.into_model().is_ok())
90+
assert!(json.into_model().is_ok());
91+
92+
node.fund_wallet();
93+
let json = node.client.get_balance().expect("getbalance");
94+
assert!(json.into_model().is_ok());
9195
}
9296

9397
#[test]
9498
#[cfg(feature = "v19")]
9599
fn get_balances() {
96100
let node = Node::new_with_default_wallet();
97-
let address = node.client.new_address().expect("failed to get new address");
98-
let _ = node.client.generate_to_address(101, &address).expect("generatetoaddress");
101+
node.fund_wallet();
99102
let json = node.client.get_balances().expect("getbalances");
100103
let model = json.into_model().expect("into_model");
101104
// TODO: Do more fine grained testing.
@@ -104,8 +107,6 @@ fn get_balances() {
104107

105108
#[test]
106109
fn get_new_address() {
107-
108-
109110
let node = Node::new_with_default_wallet();
110111

111112
let _ = node.client.new_address().expect("getnewaddress");
@@ -159,8 +160,8 @@ fn get_received_by_address() {
159160
#[test]
160161
fn get_transaction() {
161162
let node = Node::new_with_default_wallet();
163+
node.fund_wallet();
162164
let address = node.client.new_address().expect("failed to create new address");
163-
let _ = node.client.generate_to_address(101, &address).expect("generatetoaddress");
164165

165166
let txid = node
166167
.client
@@ -193,8 +194,8 @@ fn unload_wallet() {
193194
#[test]
194195
fn send_to_address() {
195196
let node = Node::new_with_default_wallet();
197+
node.fund_wallet();
196198
let address = node.client.new_address().expect("failed to create new address");
197-
let _ = node.client.generate_to_address(101, &address).expect("generatetoaddress");
198199

199200
let json = node
200201
.client

0 commit comments

Comments
 (0)