Skip to content

chore(RPC): use consistent param name for QTUM delegation #2419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shamardy merged 2 commits into from
Apr 22, 2025
Merged

chore(RPC): use consistent param name for QTUM delegation #2419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5875ac6
use consistent param name for QTUM delegation
onur-ozkan Apr 21, 2025
88ca891
use validator_address everywhere for qtum delegation request
shamardy Apr 21, 2025
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
2 changes: 1 addition & 1 deletion mm2src/coins/utxo/qtum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ impl QtumBasedCoin for QtumCoin {}

#[derive(Clone, Debug, Deserialize)]
pub struct QtumDelegationRequest {
pub address: String,
pub validator_address: String,
pub fee: Option<u64>,
}

Expand Down
5 changes: 3 additions & 2 deletions mm2src/coins/utxo/qtum_delegation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,9 @@ impl QtumCoin {
if let Some(staking_addr) = self.am_i_currently_staking().await? {
return MmError::err(DelegationError::AlreadyDelegating(staking_addr));
}
let to_addr = Address::from_legacyaddress(request.address.as_str(), &self.as_ref().conf.address_prefixes)
.map_to_mm(DelegationError::AddressError)?;
let to_addr =
Address::from_legacyaddress(request.validator_address.as_str(), &self.as_ref().conf.address_prefixes)
.map_to_mm(DelegationError::AddressError)?;
let fee = request.fee.unwrap_or(QTUM_DELEGATION_STANDARD_FEE);
let _utxo_lock = UTXO_LOCK.lock();
let staker_address_hex = qtum::contract_addr_from_utxo_addr(to_addr.clone())?;
Expand Down
6 changes: 3 additions & 3 deletions mm2src/coins/utxo/utxo_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,7 +1711,7 @@ fn test_qtum_add_delegation() {
)
.unwrap();
let request = QtumDelegationRequest {
address: address.to_string(),
validator_address: address.to_string(),
fee: Some(10),
};
let res = block_on_f01(coin.add_delegation(request)).unwrap();
Expand All @@ -1721,7 +1721,7 @@ fn test_qtum_add_delegation() {
assert!(res.spent_by_me > res.received_by_me);

let request = QtumDelegationRequest {
address: "fake_address".to_string(),
validator_address: "fake_address".to_string(),
fee: Some(10),
};
let res = block_on_f01(coin.add_delegation(request));
Expand Down Expand Up @@ -1754,7 +1754,7 @@ fn test_qtum_add_delegation_on_already_delegating() {
)
.unwrap();
let request = QtumDelegationRequest {
address: address.to_string(),
validator_address: address.to_string(),
fee: Some(10),
};
let res = block_on_f01(coin.add_delegation(request));
Expand Down
4 changes: 2 additions & 2 deletions mm2src/mm2_main/tests/mm2_tests/mm2_tests_inner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2801,7 +2801,7 @@ fn test_add_delegation_qtum() {
"coin": "tQTUM",
"staking_details": {
"type": "Qtum",
"address": "qcyBHeSct7Wr4mAw18iuQ1zW5mMFYmtmBE"
"validator_address": "qcyBHeSct7Wr4mAw18iuQ1zW5mMFYmtmBE"
}
},
"id": 0
Expand All @@ -2821,7 +2821,7 @@ fn test_add_delegation_qtum() {
"coin": "tQTUM",
"staking_details": {
"type": "Qtum",
"address": "fake_address"
"validator_address": "fake_address"
}
},
"id": 0
Expand Down
Loading