Skip to content

[Trivial][RPC] Drop 'ed' suffix from vShielded* in TxSaplingToJSON #2093

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
random-zebra merged 1 commit into from
Dec 22, 2020
Merged

[Trivial][RPC] Drop 'ed' suffix from vShielded* in TxSaplingToJSON #2093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/sapling/sapling_core_write.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ void TxSaplingToJSON(const CTransaction& tx, UniValue& entry) {
entry.pushKV("valueBalance", FormatMoney(tx.sapData->valueBalance));
entry.pushKV("valueBalanceSat", tx.sapData->valueBalance);
UniValue vspenddesc = TxShieldedSpendsToJSON(tx);
entry.pushKV("vShieldedSpend", vspenddesc);
entry.pushKV("vShieldSpend", vspenddesc);
UniValue voutputdesc = TxShieldedOutputsToJSON(tx);
entry.pushKV("vShieldedOutput", voutputdesc);
entry.pushKV("vShieldOutput", voutputdesc);
if (tx.sapData->hasBindingSig()) {
entry.pushKV("bindingSig", HexStr(tx.sapData->bindingSig.begin(), tx.sapData->bindingSig.end()));
}
Expand Down
2 changes: 1 addition & 1 deletion test/functional/sapling_mempool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def run_test(self):
# Now disconnect the block with the note's anchor,
# and check that the tx is removed from the mempool
self.log.info("Disconnect the last block to change the sapling anchor")
anchor = txC_json['vShieldedSpend'][0]['anchor']
anchor = txC_json['vShieldSpend'][0]['anchor']
assert_equal(anchor, miner.getbestsaplinganchor())
miner.invalidateblock(miner.getbestblockhash())
assert (anchor != miner.getbestsaplinganchor())
Expand Down
8 changes: 4 additions & 4 deletions test/functional/sapling_wallet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,17 +238,17 @@ def run_test(self):
# Verify existence of Sapling related JSON fields
resp = self.nodes[0].getrawtransaction(mytxid7, 1)
assert_equal(Decimal(resp['valueBalance']), Decimal('11.00')) # 20 shield input - 8 shield spend - 1 change
assert_equal(len(resp['vShieldedSpend']), 3)
assert_equal(len(resp['vShieldedOutput']), 2)
assert_equal(len(resp['vShieldSpend']), 3)
assert_equal(len(resp['vShieldOutput']), 2)
assert('bindingSig' in resp)
shieldedSpend = resp['vShieldedSpend'][0]
shieldedSpend = resp['vShieldSpend'][0]
assert('cv' in shieldedSpend)
assert('anchor' in shieldedSpend)
assert('nullifier' in shieldedSpend)
assert('rk' in shieldedSpend)
assert('proof' in shieldedSpend)
assert('spendAuthSig' in shieldedSpend)
shieldedOutput = resp['vShieldedOutput'][0]
shieldedOutput = resp['vShieldOutput'][0]
assert('cv' in shieldedOutput)
assert('cmu' in shieldedOutput)
assert('ephemeralKey' in shieldedOutput)
Expand Down
2 changes: 1 addition & 1 deletion test/functional/sapling_wallet_listreceived.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def run_test(self):

# Verify the spent nullifier
tx_json = self.nodes[1].getrawtransaction(txid, True)
assert_equal(nullifier, tx_json["vShieldedSpend"][0]["nullifier"])
assert_equal(nullifier, tx_json["vShieldSpend"][0]["nullifier"])

# Decrypted transaction details should be correct
pt = self.nodes[1].viewshieldtransaction(txid)
Expand Down