Skip to content

Commit 7cbb26b

Browse files
committed
style: clang suggestion for bls rpcs
1 parent 394d649 commit 7cbb26b

File tree

1 file changed

+46
-49
lines changed

1 file changed

+46
-49
lines changed

src/rpc/evo.cpp

Lines changed: 46 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,71 +1702,68 @@ static RPCHelpMan protx_help()
17021702

17031703
static RPCHelpMan bls_generate()
17041704
{
1705-
return RPCHelpMan{"bls generate",
1705+
return RPCHelpMan{
1706+
"bls generate",
17061707
"\nReturns a BLS secret/public key pair.\n",
17071708
{
17081709
{"legacy", RPCArg::Type::BOOL, RPCArg::Default{false}, "Set it true if need in legacy BLS scheme"},
1709-
},
1710-
RPCResult{
1711-
RPCResult::Type::OBJ, "", "",
1712-
{
1713-
{RPCResult::Type::STR_HEX, "secret", "BLS secret key"},
1714-
{RPCResult::Type::STR_HEX, "public", "BLS public key"},
1715-
{RPCResult::Type::STR_HEX, "scheme", "BLS scheme (valid schemes: legacy, basic)"}
1716-
}},
1717-
RPCExamples{
1718-
HelpExampleCli("bls generate", "")
17191710
},
1720-
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
1721-
{
1722-
CBLSSecretKey sk;
1723-
sk.MakeNewKey();
1724-
bool bls_legacy_scheme{false};
1725-
if (!request.params[0].isNull()) {
1726-
bls_legacy_scheme = ParseBoolV(request.params[0], "bls_legacy_scheme");
1727-
}
1728-
UniValue ret(UniValue::VOBJ);
1729-
ret.pushKV("secret", sk.ToString());
1730-
ret.pushKV("public", sk.GetPublicKey().ToString(bls_legacy_scheme));
1731-
std::string bls_scheme_str = bls_legacy_scheme ? "legacy" : "basic";
1732-
ret.pushKV("scheme", bls_scheme_str);
1733-
return ret;
1734-
},
1711+
RPCResult{RPCResult::Type::OBJ,
1712+
"",
1713+
"",
1714+
{{RPCResult::Type::STR_HEX, "secret", "BLS secret key"},
1715+
{RPCResult::Type::STR_HEX, "public", "BLS public key"},
1716+
{RPCResult::Type::STR_HEX, "scheme", "BLS scheme (valid schemes: legacy, basic)"}}},
1717+
RPCExamples{HelpExampleCli("bls generate", "")},
1718+
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
1719+
CBLSSecretKey sk;
1720+
sk.MakeNewKey();
1721+
bool bls_legacy_scheme{false};
1722+
if (!request.params[0].isNull()) {
1723+
bls_legacy_scheme = ParseBoolV(request.params[0], "bls_legacy_scheme");
1724+
}
1725+
UniValue ret(UniValue::VOBJ);
1726+
ret.pushKV("secret", sk.ToString());
1727+
ret.pushKV("public", sk.GetPublicKey().ToString(bls_legacy_scheme));
1728+
std::string bls_scheme_str = bls_legacy_scheme ? "legacy" : "basic";
1729+
ret.pushKV("scheme", bls_scheme_str);
1730+
return ret;
1731+
},
17351732
};
17361733
}
17371734

17381735
static RPCHelpMan bls_fromsecret()
17391736
{
1740-
return RPCHelpMan{"bls fromsecret",
1737+
return RPCHelpMan{
1738+
"bls fromsecret",
17411739
"\nParses a BLS secret key and returns the secret/public key pair.\n",
17421740
{
17431741
{"secret", RPCArg::Type::STR, RPCArg::Optional::NO, "The BLS secret key"},
17441742
{"legacy", RPCArg::Type::BOOL, RPCArg::Default{false}, "Pass true if you need in legacy scheme"},
17451743
},
1746-
RPCResult{
1747-
RPCResult::Type::OBJ, "", "",
1748-
{
1749-
{RPCResult::Type::STR_HEX, "secret", "BLS secret key"},
1750-
{RPCResult::Type::STR_HEX, "public", "BLS public key"},
1751-
{RPCResult::Type::STR_HEX, "scheme", "BLS scheme (valid schemes: legacy, basic)"},
1752-
}},
1744+
RPCResult{RPCResult::Type::OBJ,
1745+
"",
1746+
"",
1747+
{
1748+
{RPCResult::Type::STR_HEX, "secret", "BLS secret key"},
1749+
{RPCResult::Type::STR_HEX, "public", "BLS public key"},
1750+
{RPCResult::Type::STR_HEX, "scheme", "BLS scheme (valid schemes: legacy, basic)"},
1751+
}},
17531752
RPCExamples{
1754-
HelpExampleCli("bls fromsecret", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f")
1753+
HelpExampleCli("bls fromsecret", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f")},
1754+
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
1755+
bool bls_legacy_scheme{false};
1756+
if (!request.params[1].isNull()) {
1757+
bls_legacy_scheme = ParseBoolV(request.params[1], "bls_legacy_scheme");
1758+
}
1759+
CBLSSecretKey sk = ParseBLSSecretKey(request.params[0].get_str(), "secretKey");
1760+
UniValue ret(UniValue::VOBJ);
1761+
ret.pushKV("secret", sk.ToString());
1762+
ret.pushKV("public", sk.GetPublicKey().ToString(bls_legacy_scheme));
1763+
std::string bls_scheme_str = bls_legacy_scheme ? "legacy" : "basic";
1764+
ret.pushKV("scheme", bls_scheme_str);
1765+
return ret;
17551766
},
1756-
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
1757-
{
1758-
bool bls_legacy_scheme{false};
1759-
if (!request.params[1].isNull()) {
1760-
bls_legacy_scheme = ParseBoolV(request.params[1], "bls_legacy_scheme");
1761-
}
1762-
CBLSSecretKey sk = ParseBLSSecretKey(request.params[0].get_str(), "secretKey");
1763-
UniValue ret(UniValue::VOBJ);
1764-
ret.pushKV("secret", sk.ToString());
1765-
ret.pushKV("public", sk.GetPublicKey().ToString(bls_legacy_scheme));
1766-
std::string bls_scheme_str = bls_legacy_scheme ? "legacy" : "basic";
1767-
ret.pushKV("scheme", bls_scheme_str);
1768-
return ret;
1769-
},
17701767
};
17711768
}
17721769

0 commit comments

Comments
 (0)