Skip to content

Commit

Permalink
PCZT API updated
Browse files Browse the repository at this point in the history 
- ufvk removed from the parameters
  • Loading branch information
@LukasKorba
LukasKorba committed Dec 10, 2024
1 parent 5943d63 commit 30af9c6
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 50 deletions.
3 changes: 1 addition & 2 deletions Sources/ZcashLightClientKit/Rust/ZcashRustBackend.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@ struct ZcashRustBackend: ZcashRustBackendWelding {

@DBActor
func createPCZTFromProposal(
ufvk: UnifiedFullViewingKey,
accountUUID: AccountUUID,
proposal: FfiProposal
) async throws -> Data {
Expand All @@ -307,7 +306,7 @@ struct ZcashRustBackend: ZcashRustBackendWelding {
networkType.networkId,
proposalPtr.baseAddress,
UInt(proposalBytes.count),
[CChar](ufvk.encoding.utf8CString)
accountUUID.id
)
}

Expand Down
1 change: 0 additions & 1 deletion Sources/ZcashLightClientKit/Rust/ZcashRustBackendWelding.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@ protocol ZcashRustBackendWelding {

/// PCZT logic
func createPCZTFromProposal(
ufvk: UnifiedFullViewingKey,
accountUUID: AccountUUID,
proposal: FfiProposal
) async throws -> Data
Expand Down
1 change: 0 additions & 1 deletion Sources/ZcashLightClientKit/Synchronizer.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ public protocol Synchronizer: AnyObject {
) async throws -> Proposal

func createPCZTFromProposal(
ufvk: UnifiedFullViewingKey,
accountUUID: AccountUUID,
proposal: Proposal
) async throws -> Data
Expand Down
2 changes: 0 additions & 2 deletions Sources/ZcashLightClientKit/Synchronizer/SDKSynchronizer.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,12 +402,10 @@ public class SDKSynchronizer: Synchronizer {
}

public func createPCZTFromProposal(
ufvk: UnifiedFullViewingKey,
accountUUID: AccountUUID,
proposal: Proposal
) async throws -> Data {
try await initializer.rustBackend.createPCZTFromProposal(
ufvk: ufvk,
accountUUID: accountUUID,
proposal: proposal.inner
)
Expand Down
88 changes: 44 additions & 44 deletions Tests/TestUtils/Sourcery/GeneratedMocks/AutoMockable.generated.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1574,25 +1574,25 @@ class SynchronizerMock: Synchronizer {

// MARK: - createPCZTFromProposal

var createPCZTFromProposalUfvkAccountUUIDProposalThrowableError: Error?
var createPCZTFromProposalUfvkAccountUUIDProposalCallsCount = 0
var createPCZTFromProposalUfvkAccountUUIDProposalCalled: Bool {
return createPCZTFromProposalUfvkAccountUUIDProposalCallsCount > 0
var createPCZTFromProposalAccountUUIDProposalThrowableError: Error?
var createPCZTFromProposalAccountUUIDProposalCallsCount = 0
var createPCZTFromProposalAccountUUIDProposalCalled: Bool {
return createPCZTFromProposalAccountUUIDProposalCallsCount > 0
}
var createPCZTFromProposalUfvkAccountUUIDProposalReceivedArguments: (ufvk: UnifiedFullViewingKey, accountUUID: AccountUUID, proposal: Proposal)?
var createPCZTFromProposalUfvkAccountUUIDProposalReturnValue: Data!
var createPCZTFromProposalUfvkAccountUUIDProposalClosure: ((UnifiedFullViewingKey, AccountUUID, Proposal) async throws -> Data)?
var createPCZTFromProposalAccountUUIDProposalReceivedArguments: (accountUUID: AccountUUID, proposal: Proposal)?
var createPCZTFromProposalAccountUUIDProposalReturnValue: Data!
var createPCZTFromProposalAccountUUIDProposalClosure: ((AccountUUID, Proposal) async throws -> Data)?

func createPCZTFromProposal(ufvk: UnifiedFullViewingKey, accountUUID: AccountUUID, proposal: Proposal) async throws -> Data {
if let error = createPCZTFromProposalUfvkAccountUUIDProposalThrowableError {
func createPCZTFromProposal(accountUUID: AccountUUID, proposal: Proposal) async throws -> Data {
if let error = createPCZTFromProposalAccountUUIDProposalThrowableError {
throw error
}
createPCZTFromProposalUfvkAccountUUIDProposalCallsCount += 1
createPCZTFromProposalUfvkAccountUUIDProposalReceivedArguments = (ufvk: ufvk, accountUUID: accountUUID, proposal: proposal)
if let closure = createPCZTFromProposalUfvkAccountUUIDProposalClosure {
return try await closure(ufvk, accountUUID, proposal)
createPCZTFromProposalAccountUUIDProposalCallsCount += 1
createPCZTFromProposalAccountUUIDProposalReceivedArguments = (accountUUID: accountUUID, proposal: proposal)
if let closure = createPCZTFromProposalAccountUUIDProposalClosure {
return try await closure(accountUUID, proposal)
} else {
return createPCZTFromProposalUfvkAccountUUIDProposalReturnValue
return createPCZTFromProposalAccountUUIDProposalReturnValue
}
}

Expand All @@ -1603,11 +1603,11 @@ class SynchronizerMock: Synchronizer {
var addProofsToPCZTPcztCalled: Bool {
return addProofsToPCZTPcztCallsCount > 0
}
var addProofsToPCZTPcztReceivedPczt: Proposal?
var addProofsToPCZTPcztReturnValue: Proposal!
var addProofsToPCZTPcztClosure: ((Proposal) async throws -> Proposal)?
var addProofsToPCZTPcztReceivedPczt: Data?
var addProofsToPCZTPcztReturnValue: Data!
var addProofsToPCZTPcztClosure: ((Data) async throws -> Data)?

func addProofsToPCZT(pczt: Proposal) async throws -> Proposal {
func addProofsToPCZT(pczt: Data) async throws -> Data {
if let error = addProofsToPCZTPcztThrowableError {
throw error
}
Expand All @@ -1627,11 +1627,11 @@ class SynchronizerMock: Synchronizer {
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsCalled: Bool {
return extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsCallsCount > 0
}
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsReceivedArguments: (pcztWithProofs: Proposal, pcztWithSigs: Proposal)?
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsReturnValue: Proposal!
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsClosure: ((Proposal, Proposal) async throws -> Proposal)?
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsReceivedArguments: (pcztWithProofs: Data, pcztWithSigs: Data)?
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsReturnValue: Data!
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsClosure: ((Data, Data) async throws -> Data)?

func extractAndStoreTxFromPCZT(pcztWithProofs: Proposal, pcztWithSigs: Proposal) async throws -> Proposal {
func extractAndStoreTxFromPCZT(pcztWithProofs: Data, pcztWithSigs: Data) async throws -> Data {
if let error = extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsThrowableError {
throw error
}
Expand Down Expand Up @@ -3096,25 +3096,25 @@ class ZcashRustBackendWeldingMock: ZcashRustBackendWelding {

// MARK: - createPCZTFromProposal

var createPCZTFromProposalUfvkAccountUUIDProposalThrowableError: Error?
var createPCZTFromProposalUfvkAccountUUIDProposalCallsCount = 0
var createPCZTFromProposalUfvkAccountUUIDProposalCalled: Bool {
return createPCZTFromProposalUfvkAccountUUIDProposalCallsCount > 0
var createPCZTFromProposalAccountUUIDProposalThrowableError: Error?
var createPCZTFromProposalAccountUUIDProposalCallsCount = 0
var createPCZTFromProposalAccountUUIDProposalCalled: Bool {
return createPCZTFromProposalAccountUUIDProposalCallsCount > 0
}
var createPCZTFromProposalUfvkAccountUUIDProposalReceivedArguments: (ufvk: UnifiedFullViewingKey, accountUUID: AccountUUID, proposal: FfiProposal)?
var createPCZTFromProposalUfvkAccountUUIDProposalReturnValue: Data!
var createPCZTFromProposalUfvkAccountUUIDProposalClosure: ((UnifiedFullViewingKey, AccountUUID, FfiProposal) async throws -> Data)?
var createPCZTFromProposalAccountUUIDProposalReceivedArguments: (accountUUID: AccountUUID, proposal: FfiProposal)?
var createPCZTFromProposalAccountUUIDProposalReturnValue: Data!
var createPCZTFromProposalAccountUUIDProposalClosure: ((AccountUUID, FfiProposal) async throws -> Data)?

func createPCZTFromProposal(ufvk: UnifiedFullViewingKey, accountUUID: AccountUUID, proposal: FfiProposal) async throws -> Data {
if let error = createPCZTFromProposalUfvkAccountUUIDProposalThrowableError {
func createPCZTFromProposal(accountUUID: AccountUUID, proposal: FfiProposal) async throws -> Data {
if let error = createPCZTFromProposalAccountUUIDProposalThrowableError {
throw error
}
createPCZTFromProposalUfvkAccountUUIDProposalCallsCount += 1
createPCZTFromProposalUfvkAccountUUIDProposalReceivedArguments = (ufvk: ufvk, accountUUID: accountUUID, proposal: proposal)
if let closure = createPCZTFromProposalUfvkAccountUUIDProposalClosure {
return try await closure(ufvk, accountUUID, proposal)
createPCZTFromProposalAccountUUIDProposalCallsCount += 1
createPCZTFromProposalAccountUUIDProposalReceivedArguments = (accountUUID: accountUUID, proposal: proposal)
if let closure = createPCZTFromProposalAccountUUIDProposalClosure {
return try await closure(accountUUID, proposal)
} else {
return createPCZTFromProposalUfvkAccountUUIDProposalReturnValue
return createPCZTFromProposalAccountUUIDProposalReturnValue
}
}

Expand All @@ -3125,11 +3125,11 @@ class ZcashRustBackendWeldingMock: ZcashRustBackendWelding {
var addProofsToPCZTPcztCalled: Bool {
return addProofsToPCZTPcztCallsCount > 0
}
var addProofsToPCZTPcztReceivedPczt: FfiProposal?
var addProofsToPCZTPcztReturnValue: FfiProposal!
var addProofsToPCZTPcztClosure: ((FfiProposal) async throws -> FfiProposal)?
var addProofsToPCZTPcztReceivedPczt: Data?
var addProofsToPCZTPcztReturnValue: Data!
var addProofsToPCZTPcztClosure: ((Data) async throws -> Data)?

func addProofsToPCZT(pczt: FfiProposal) async throws -> FfiProposal {
func addProofsToPCZT(pczt: Data) async throws -> Data {
if let error = addProofsToPCZTPcztThrowableError {
throw error
}
Expand All @@ -3149,11 +3149,11 @@ class ZcashRustBackendWeldingMock: ZcashRustBackendWelding {
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsCalled: Bool {
return extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsCallsCount > 0
}
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsReceivedArguments: (pcztWithProofs: FfiProposal, pcztWithSigs: FfiProposal)?
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsReturnValue: FfiProposal!
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsClosure: ((FfiProposal, FfiProposal) async throws -> FfiProposal)?
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsReceivedArguments: (pcztWithProofs: Data, pcztWithSigs: Data)?
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsReturnValue: Data!
var extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsClosure: ((Data, Data) async throws -> Data)?

func extractAndStoreTxFromPCZT(pcztWithProofs: FfiProposal, pcztWithSigs: FfiProposal) async throws -> FfiProposal {
func extractAndStoreTxFromPCZT(pcztWithProofs: Data, pcztWithSigs: Data) async throws -> Data {
if let error = extractAndStoreTxFromPCZTPcztWithProofsPcztWithSigsThrowableError {
throw error
}
Expand Down

0 comments on commit 30af9c6

Please sign in to comment.