Skip to content
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

Jump to bottom

Fix spelling of the .transparent alternative of Entity.TransactionEntity.ZcashTransaction.Output.Pool #1505

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix spelling of the .transparent alternative of Entity.TransactionEntity.ZcashTransaction.Output.Pool #1505

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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ and this library adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- `DerivationTool.deriveArbitraryAccountKey`

## Changed
- `zcashlc_propose_transfer`, `zcashlc_propose_transfer_from_uri` and `zcashlc_propose_shielding` no longer accpt a `use_zip317_fees` parameter; ZIP 317 standard fees are now always used and are not configurable.
- `zcashlc_propose_transfer`, `zcashlc_propose_transfer_from_uri` and `zcashlc_propose_shielding` no longer accept a `use_zip317_fees` parameter; ZIP 317 standard fees are now always used and are not configurable.
- The spelling of the `.transparent` alternative of `Entity.TransactionEntity.ZcashTransaction.Output.Pool` has been corrected from `.transaparent`.

## Checkpoints

Expand Down
4 changes: 2 additions & 2 deletions Sources/ZcashLightClientKit/Entity/TransactionEntity.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@

public struct Output {
public enum Pool {
case transaparent
case transparent
case sapling
case orchard
case other(Int)
init(rawValue: Int) {
switch rawValue {
case 0:
self = .transaparent
self = .transparent
case 2:
self = .sapling
case 3:
Expand Down Expand Up @@ -125,7 +125,7 @@
if
let outputRecipient = try row.get(Column.toAddress),
let metadata = DerivationTool.getAddressMetadata(outputRecipient)
{

Check warning on line 128 in Sources/ZcashLightClientKit/Entity/TransactionEntity.swift

View workflow job for this annotation

GitHub Actions / SwiftLint 

Opening Brace Spacing Violation: Opening braces should be preceded by a single space and on the same line as the declaration (opening_brace)
recipient = TransactionRecipient.address(try Recipient(outputRecipient, network: metadata.networkType))
} else if let toAccount = try row.get(Column.toAccount) {
recipient = .internalAccount(UInt32(toAccount))
Expand Down
4 changes: 2 additions & 2 deletions Tests/DarksideTests/ShieldFundsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class ShieldFundsTests: ZcashTestCase {
/// the transparent funds should be 10000 zatoshis both total and verified
/// 9. shield the funds
/// when funds are shielded the UTXOs should be marked as spend and not shown on the balance.
/// now balance should be zero shielded, zero transaparent.
/// now balance should be zero shielded, zero transparent.
/// 10. clear the UTXO from darksidewalletd's cache
/// 11. stage the pending shielding transaction in darksidewalletd ad `utxoHeight + 12`
/// 12. advance the chain tip to sync the now mined shielding transaction
Expand Down Expand Up @@ -237,7 +237,7 @@ class ShieldFundsTests: ZcashTestCase {

let postShieldingBalance = try await coordinator.synchronizer.getAccountBalance(accountIndex: 0)?.unshielded ?? .zero
// when funds are shielded the UTXOs should be marked as spend and not shown on the balance.
// now balance should be zero shielded, zero transaparent.
// now balance should be zero shielded, zero transparent.
// verify that the balance has been marked as spent regardless of confirmation
// FIXME: [#720] this should be zero, https://github.com/zcash/ZcashLightClientKit/issues/720
XCTAssertEqual(postShieldingBalance, Zatoshi(10000))
Expand Down
Loading