refactor: Use more scoped enums (#7086)

This commit is contained in:
Alex Kremer
2026-05-11 16:39:48 +01:00
committed by GitHub
parent 779b49cd93
commit cdee9a675c
379 changed files with 2771 additions and 2864 deletions

View File

@@ -70,9 +70,12 @@ bridgeCreate(
jv[jss::Account] = acc.human();
jv[sfXChainBridge.getJsonName()] = bridge;
jv[sfSignatureReward.getJsonName()] = reward.getJson(JsonOptions::KNone);
jv[sfSignatureReward.getJsonName()] = reward.getJson(JsonOptions::Values::None);
if (minAccountCreate)
jv[sfMinAccountCreateAmount.getJsonName()] = minAccountCreate->getJson(JsonOptions::KNone);
{
jv[sfMinAccountCreateAmount.getJsonName()] =
minAccountCreate->getJson(JsonOptions::Values::None);
}
jv[jss::TransactionType] = jss::XChainCreateBridge;
return jv;
@@ -90,9 +93,12 @@ bridgeModify(
jv[jss::Account] = acc.human();
jv[sfXChainBridge.getJsonName()] = bridge;
if (reward)
jv[sfSignatureReward.getJsonName()] = reward->getJson(JsonOptions::KNone);
jv[sfSignatureReward.getJsonName()] = reward->getJson(JsonOptions::Values::None);
if (minAccountCreate)
jv[sfMinAccountCreateAmount.getJsonName()] = minAccountCreate->getJson(JsonOptions::KNone);
{
jv[sfMinAccountCreateAmount.getJsonName()] =
minAccountCreate->getJson(JsonOptions::Values::None);
}
jv[jss::TransactionType] = jss::XChainModifyBridge;
return jv;
@@ -109,7 +115,7 @@ xchainCreateClaimId(
jv[jss::Account] = acc.human();
jv[sfXChainBridge.getJsonName()] = bridge;
jv[sfSignatureReward.getJsonName()] = reward.getJson(JsonOptions::KNone);
jv[sfSignatureReward.getJsonName()] = reward.getJson(JsonOptions::Values::None);
jv[sfOtherChainSource.getJsonName()] = otherChainSource.human();
jv[jss::TransactionType] = jss::XChainCreateClaimID;
@@ -129,7 +135,7 @@ xchainCommit(
jv[jss::Account] = acc.human();
jv[sfXChainBridge.getJsonName()] = bridge;
jv[sfXChainClaimID.getJsonName()] = claimID;
jv[jss::Amount] = amt.value.getJson(JsonOptions::KNone);
jv[jss::Amount] = amt.value.getJson(JsonOptions::Values::None);
if (dst)
jv[sfOtherChainDestination.getJsonName()] = dst->human();
@@ -151,7 +157,7 @@ xchainClaim(
jv[sfXChainBridge.getJsonName()] = bridge;
jv[sfXChainClaimID.getJsonName()] = claimID;
jv[sfDestination.getJsonName()] = dst.human();
jv[sfAmount.getJsonName()] = amt.value.getJson(JsonOptions::KNone);
jv[sfAmount.getJsonName()] = amt.value.getJson(JsonOptions::Values::None);
jv[jss::TransactionType] = jss::XChainClaim;
return jv;
@@ -170,8 +176,8 @@ sidechainXchainAccountCreate(
jv[sfAccount.getJsonName()] = acc.human();
jv[sfXChainBridge.getJsonName()] = bridge;
jv[sfDestination.getJsonName()] = dst.human();
jv[sfAmount.getJsonName()] = amt.value.getJson(JsonOptions::KNone);
jv[sfSignatureReward.getJsonName()] = reward.value.getJson(JsonOptions::KNone);
jv[sfAmount.getJsonName()] = amt.value.getJson(JsonOptions::Values::None);
jv[sfSignatureReward.getJsonName()] = reward.value.getJson(JsonOptions::Values::None);
jv[jss::TransactionType] = jss::XChainAccountCreateCommit;
return jv;
@@ -213,11 +219,11 @@ claimAttestation(
result[sfPublicKey.getJsonName()] = strHex(pk.slice());
result[sfSignature.getJsonName()] = strHex(sig);
result[sfOtherChainSource.getJsonName()] = toBase58(sendingAccount);
result[sfAmount.getJsonName()] = sendingAmount.value.getJson(JsonOptions::KNone);
result[sfAmount.getJsonName()] = sendingAmount.value.getJson(JsonOptions::Values::None);
result[sfAttestationRewardAccount.getJsonName()] = toBase58(rewardAccount);
result[sfWasLockingChainSend.getJsonName()] = wasLockingChainSend ? 1 : 0;
result[sfXChainClaimID.getJsonName()] = STUInt64{claimID}.getJson(JsonOptions::KNone);
result[sfXChainClaimID.getJsonName()] = STUInt64{claimID}.getJson(JsonOptions::Values::None);
if (dst)
result[sfDestination.getJsonName()] = toBase58(*dst);
@@ -264,14 +270,14 @@ createAccountAttestation(
result[sfPublicKey.getJsonName()] = strHex(pk.slice());
result[sfSignature.getJsonName()] = strHex(sig);
result[sfOtherChainSource.getJsonName()] = toBase58(sendingAccount);
result[sfAmount.getJsonName()] = sendingAmount.value.getJson(JsonOptions::KNone);
result[sfAmount.getJsonName()] = sendingAmount.value.getJson(JsonOptions::Values::None);
result[sfAttestationRewardAccount.getJsonName()] = toBase58(rewardAccount);
result[sfWasLockingChainSend.getJsonName()] = wasLockingChainSend ? 1 : 0;
result[sfXChainAccountCreateCount.getJsonName()] =
STUInt64{createCount}.getJson(JsonOptions::KNone);
STUInt64{createCount}.getJson(JsonOptions::Values::None);
result[sfDestination.getJsonName()] = toBase58(dst);
result[sfSignatureReward.getJsonName()] = rewardAmount.value.getJson(JsonOptions::KNone);
result[sfSignatureReward.getJsonName()] = rewardAmount.value.getJson(JsonOptions::Values::None);
result[jss::TransactionType] = jss::XChainAddAccountCreateAttestation;