Fix semantic merge conflicts
- We added `OrchardRawAddress` to the `Receiver` variant, which prevents it from having a default constructor. - We added `ReceiverType::Orchard`, which Clang warns is unused when we use `ReceiverType` in a `switch` statement.
This commit is contained in:
parent
bb4e792c84
commit
85a8784b38
|
@ -367,6 +367,10 @@ class CSerializeRecipientAddress {
|
|||
recipient = saplingAddr;
|
||||
break;
|
||||
}
|
||||
case libzcash::ReceiverType::Orchard: {
|
||||
// TODO ORCHARD: Handle when we add Orchard to RecipientAddress
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -31,14 +31,11 @@ bool libzcash::HasTransparent(const std::set<ReceiverType>& receiverTypes) {
|
|||
}
|
||||
|
||||
Receiver libzcash::RecipientAddressToReceiver(const RecipientAddress& recipient) {
|
||||
Receiver recipientReceiver;
|
||||
std::visit(match {
|
||||
[&](const CKeyID& key) { recipientReceiver = key; },
|
||||
[&](const CScriptID& scriptId) { recipientReceiver = scriptId; },
|
||||
[&](const libzcash::SaplingPaymentAddress& addr) { recipientReceiver = addr; }
|
||||
return std::visit(match {
|
||||
[](const CKeyID& key) { return Receiver(key); },
|
||||
[](const CScriptID& scriptId) { return Receiver(scriptId); },
|
||||
[](const libzcash::SaplingPaymentAddress& addr) { return Receiver(addr); }
|
||||
}, recipient);
|
||||
|
||||
return recipientReceiver;
|
||||
}
|
||||
|
||||
std::optional<ZcashdUnifiedSpendingKey> ZcashdUnifiedSpendingKey::ForAccount(
|
||||
|
|
Loading…
Reference in New Issue