Skip to content

Commit f934066

Browse files
cjen1-msftcjen1-msft
authored
Cleanup: terminate DECLARE_JSON_X macros with semicolons (#7593)
1 parent f8cf8ba commit f934066

24 files changed

Lines changed: 152 additions & 150 deletions

‎include/ccf/endpoint_metrics.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ namespace ccf
3131
std::vector<EndpointMetricsEntry> metrics;
3232
};
3333

34-
DECLARE_JSON_TYPE(EndpointMetricsEntry)
34+
DECLARE_JSON_TYPE(EndpointMetricsEntry);
3535
DECLARE_JSON_REQUIRED_FIELDS(
36-
EndpointMetricsEntry, path, method, calls, errors, failures, retries)
37-
DECLARE_JSON_TYPE(EndpointMetrics)
38-
DECLARE_JSON_REQUIRED_FIELDS(EndpointMetrics, metrics)
36+
EndpointMetricsEntry, path, method, calls, errors, failures, retries);
37+
DECLARE_JSON_TYPE(EndpointMetrics);
38+
DECLARE_JSON_REQUIRED_FIELDS(EndpointMetrics, metrics);
3939
}

‎include/ccf/js/audit_format.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ namespace ccf
2727
std::string action_name;
2828
};
2929

30-
DECLARE_JSON_TYPE(AuditInfo)
31-
DECLARE_JSON_REQUIRED_FIELDS(AuditInfo, format, user_id, action_name)
30+
DECLARE_JSON_TYPE(AuditInfo);
31+
DECLARE_JSON_REQUIRED_FIELDS(AuditInfo, format, user_id, action_name);
3232
}

‎include/ccf/node_startup_state.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace ccf
2525
{ccf::NodeStartupState::partOfPublicNetwork, "PartOfPublicNetwork"},
2626
{ccf::NodeStartupState::partOfNetwork, "PartOfNetwork"},
2727
{ccf::NodeStartupState::readingPublicLedger, "ReadingPublicLedger"},
28-
{ccf::NodeStartupState::readingPrivateLedger, "ReadingPrivateLedger"}})
28+
{ccf::NodeStartupState::readingPrivateLedger, "ReadingPrivateLedger"}});
2929
}
3030

3131
// Used by fmtlib to render ccf::State

‎include/ccf/service/consensus_type.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ namespace ccf
1313
};
1414

1515
DECLARE_JSON_ENUM(
16-
ConsensusType, {{ConsensusType::CFT, "CFT"}, {ConsensusType::BFT, "BFT"}})
16+
ConsensusType, {{ConsensusType::CFT, "CFT"}, {ConsensusType::BFT, "BFT"}});
1717
}

‎include/ccf/service/reconfiguration_type.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ namespace ccf
1515
DECLARE_JSON_ENUM(
1616
ReconfigurationType,
1717
{{ReconfigurationType::ONE_TRANSACTION, "OneTransaction"},
18-
{ReconfigurationType::TWO_TRANSACTION, "TwoTransaction"}})
18+
{ReconfigurationType::TWO_TRANSACTION, "TwoTransaction"}});
1919
}

‎include/ccf/service/signed_req.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ namespace ccf
3737
return !(*this == other);
3838
}
3939
};
40-
DECLARE_JSON_TYPE(SignedReq)
41-
DECLARE_JSON_REQUIRED_FIELDS(SignedReq, sig, req, request_body, md, key_id)
40+
DECLARE_JSON_TYPE(SignedReq);
41+
DECLARE_JSON_REQUIRED_FIELDS(SignedReq, sig, req, request_body, md, key_id);
4242
}

‎include/ccf/service/tables/jwt.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@ namespace ccf
8282
return keys != rhs.keys;
8383
}
8484
};
85-
DECLARE_JSON_TYPE(JsonWebKeySet)
86-
DECLARE_JSON_REQUIRED_FIELDS(JsonWebKeySet, keys)
85+
DECLARE_JSON_TYPE(JsonWebKeySet);
86+
DECLARE_JSON_REQUIRED_FIELDS(JsonWebKeySet, keys);
8787
}

‎include/ccf/service/tables/members.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ namespace ccf
6767
member_data == rhs.member_data && recovery_role == rhs.recovery_role;
6868
}
6969
};
70-
DECLARE_JSON_TYPE_WITH_OPTIONAL_FIELDS(NewMember)
71-
DECLARE_JSON_REQUIRED_FIELDS(NewMember, cert)
70+
DECLARE_JSON_TYPE_WITH_OPTIONAL_FIELDS(NewMember);
71+
DECLARE_JSON_REQUIRED_FIELDS(NewMember, cert);
7272
DECLARE_JSON_OPTIONAL_FIELDS(
7373
NewMember, encryption_pub_key, member_data, recovery_role);
7474

@@ -89,9 +89,9 @@ namespace ccf
8989
recovery_role == rhs.recovery_role;
9090
}
9191
};
92-
DECLARE_JSON_TYPE_WITH_OPTIONAL_FIELDS(MemberDetails)
93-
DECLARE_JSON_REQUIRED_FIELDS(MemberDetails, status)
94-
DECLARE_JSON_OPTIONAL_FIELDS(MemberDetails, member_data, recovery_role)
92+
DECLARE_JSON_TYPE_WITH_OPTIONAL_FIELDS(MemberDetails);
93+
DECLARE_JSON_REQUIRED_FIELDS(MemberDetails, status);
94+
DECLARE_JSON_OPTIONAL_FIELDS(MemberDetails, member_data, recovery_role);
9595

9696
using MemberInfo = ServiceMap<MemberId, MemberDetails>;
9797

@@ -121,8 +121,8 @@ namespace ccf
121121
state_digest(root.hex_str())
122122
{}
123123
};
124-
DECLARE_JSON_TYPE(StateDigest)
125-
DECLARE_JSON_REQUIRED_FIELDS(StateDigest, state_digest)
124+
DECLARE_JSON_TYPE(StateDigest);
125+
DECLARE_JSON_REQUIRED_FIELDS(StateDigest, state_digest);
126126

127127
struct MemberAck : public StateDigest
128128
{
@@ -149,13 +149,13 @@ namespace ccf
149149
cose_sign1_req(cose_sign1_req_)
150150
{}
151151
};
152-
DECLARE_JSON_TYPE_WITH_BASE_AND_OPTIONAL_FIELDS(MemberAck, StateDigest)
152+
DECLARE_JSON_TYPE_WITH_BASE_AND_OPTIONAL_FIELDS(MemberAck, StateDigest);
153153
#pragma clang diagnostic push
154154
#pragma clang diagnostic ignored "-Wunused-parameter"
155155
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
156-
DECLARE_JSON_REQUIRED_FIELDS(MemberAck)
156+
DECLARE_JSON_REQUIRED_FIELDS(MemberAck);
157157
#pragma clang diagnostic pop
158-
DECLARE_JSON_OPTIONAL_FIELDS(MemberAck, signed_req, cose_sign1_req)
158+
DECLARE_JSON_OPTIONAL_FIELDS(MemberAck, signed_req, cose_sign1_req);
159159
using MemberAcks = ServiceMap<MemberId, MemberAck>;
160160
namespace Tables
161161
{

‎include/ccf/service/tables/users.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ namespace ccf
1515
ccf::crypto::Pem cert;
1616
nlohmann::json user_data = nullptr;
1717
};
18-
DECLARE_JSON_TYPE_WITH_OPTIONAL_FIELDS(NewUser)
19-
DECLARE_JSON_REQUIRED_FIELDS(NewUser, cert)
20-
DECLARE_JSON_OPTIONAL_FIELDS(NewUser, user_data)
18+
DECLARE_JSON_TYPE_WITH_OPTIONAL_FIELDS(NewUser);
19+
DECLARE_JSON_REQUIRED_FIELDS(NewUser, cert);
20+
DECLARE_JSON_OPTIONAL_FIELDS(NewUser, user_data);
2121

2222
struct UserDetails
2323
{
2424
/** Free-form user data, useful to store role information about users for
2525
example. */
2626
nlohmann::json user_data = nullptr;
2727
};
28-
DECLARE_JSON_TYPE(UserDetails)
29-
DECLARE_JSON_REQUIRED_FIELDS(UserDetails, user_data)
28+
DECLARE_JSON_TYPE(UserDetails);
29+
DECLARE_JSON_REQUIRED_FIELDS(UserDetails, user_data);
3030

3131
using UserCerts = ccf::kv::RawCopySerialisedMap<UserId, ccf::crypto::Pem>;
3232
using UserInfo = ServiceMap<UserId, UserDetails>;

‎samples/apps/nobuiltins/nobuiltins.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ namespace nobuiltins
1818
std::vector<uint8_t> endorsements;
1919
};
2020

21-
DECLARE_JSON_TYPE(NodeQuote)
22-
DECLARE_JSON_REQUIRED_FIELDS(NodeQuote, quote_format, quote, endorsements)
21+
DECLARE_JSON_TYPE(NodeQuote);
22+
DECLARE_JSON_REQUIRED_FIELDS(NodeQuote, quote_format, quote, endorsements);
2323

2424
struct NodeSummary : public NodeQuote
2525
{
@@ -29,40 +29,40 @@ namespace nobuiltins
2929
ccf::NodeId node_id;
3030
};
3131

32-
DECLARE_JSON_TYPE_WITH_BASE(NodeSummary, NodeQuote)
32+
DECLARE_JSON_TYPE_WITH_BASE(NodeSummary, NodeQuote);
3333
DECLARE_JSON_REQUIRED_FIELDS(
34-
NodeSummary, committed_view, committed_seqno, node_id)
34+
NodeSummary, committed_view, committed_seqno, node_id);
3535

3636
struct AllNodesSummary
3737
{
3838
std::map<std::string, NodeQuote> nodes;
3939
};
4040

41-
DECLARE_JSON_TYPE(AllNodesSummary)
42-
DECLARE_JSON_REQUIRED_FIELDS(AllNodesSummary, nodes)
41+
DECLARE_JSON_TYPE(AllNodesSummary);
42+
DECLARE_JSON_REQUIRED_FIELDS(AllNodesSummary, nodes);
4343

4444
struct TransactionIDResponse
4545
{
4646
std::string transaction_id;
4747
};
4848

49-
DECLARE_JSON_TYPE(TransactionIDResponse)
50-
DECLARE_JSON_REQUIRED_FIELDS(TransactionIDResponse, transaction_id)
49+
DECLARE_JSON_TYPE(TransactionIDResponse);
50+
DECLARE_JSON_REQUIRED_FIELDS(TransactionIDResponse, transaction_id);
5151

5252
struct TimeResponse
5353
{
5454
std::string timestamp;
5555
};
5656

57-
DECLARE_JSON_TYPE(TimeResponse)
58-
DECLARE_JSON_REQUIRED_FIELDS(TimeResponse, timestamp)
57+
DECLARE_JSON_TYPE(TimeResponse);
58+
DECLARE_JSON_REQUIRED_FIELDS(TimeResponse, timestamp);
5959

6060
struct GetCommit
6161
{
6262
ccf::TxID transaction_id;
6363
};
64-
DECLARE_JSON_TYPE(GetCommit)
65-
DECLARE_JSON_REQUIRED_FIELDS(GetCommit, transaction_id)
64+
DECLARE_JSON_TYPE(GetCommit);
65+
DECLARE_JSON_REQUIRED_FIELDS(GetCommit, transaction_id);
6666

6767
// SNIPPET: registry_inheritance
6868
class NoBuiltinsRegistry : public ccf::BaseEndpointRegistry

0 commit comments

Comments
 (0)