Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added `restore_deterministic_wallet` method by @cilki ([#139](https://github.com/monero-rs/monero-rpc-rs/pull/139)).
- Added `subtract_fee_from_outputs` to `transfer` options by @thesn10 ([#141](https://github.com/monero-rs/monero-rpc-rs/pull/141)).
- Added `destinations` field to `get_transfer` return value by @bytenotbark ([#128](https://github.com/monero-rs/monero-rpc-rs/pull/128)).
- Added `block_height` field to struct returned by `incoming_transfers` by @silverpill ([#151](https://github.com/monero-rs/monero-rpc-rs/pull/151)).

### Changed

Expand Down
1 change: 1 addition & 0 deletions src/models.rs
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ pub struct IncomingTransfer {
pub subaddr_index: subaddress::Index,
pub tx_hash: HashString<CryptoNoteHash>,
pub tx_size: Option<u64>,
pub block_height: Option<u64>,
}

/// Argument type of wallet `sweep_all`.
Expand Down
1 change: 1 addition & 0 deletions tests/clients_tests/all_clients_interaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,7 @@ pub async fn run() {
spent: false,
subaddr_index: Index { major: 0, minor: 0 },
tx_hash: transfer_1_data.tx_hash.clone(),
block_height: None,
}]),
};
helpers::wallet::open_wallet_with_no_or_empty_password_assert_ok(&wallet, &wallet_1_view_only)
Expand Down
5 changes: 3 additions & 2 deletions tests/clients_tests/helpers/wallet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -641,8 +641,8 @@ pub async fn incoming_transfers_assert_incoming_transfers(
.await
.unwrap();

// we will not test agains `IncomingTransfer.global_index` nor `IncomingTransfer.tx_size` nor
// `IncomingTransfer::key_image`
// we will not test against
// `global_index` nor `tx_size` nor `key_image` nor `block_height`
if let Some(ref transfers) = incoming_transfers.transfers {
expected_incoming_transfers
.transfers
Expand All @@ -654,6 +654,7 @@ pub async fn incoming_transfers_assert_incoming_transfers(
t.global_index = transfers[i].global_index;
t.tx_size = transfers[i].tx_size;
t.key_image = transfers[i].key_image.clone();
t.block_height = transfers[i].block_height.clone();
});
}

Expand Down