Skip to content

Commit 56f90dd

Browse files
ximinezximinez
committed
erge remote-tracking branch 'upstream/develop' into env-failures
* upstream/develop: Install more public headers (4940)
2 parents e2fb4b0 + af9cabe commit 56f90dd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+122
-136
lines changed

‎Builds/CMake/RippledCore.cmake

+67-81
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ target_sources (xrpl_core PRIVATE
8888
src/ripple/protocol/impl/PublicKey.cpp
8989
src/ripple/protocol/impl/Quality.cpp
9090
src/ripple/protocol/impl/QualityFunction.cpp
91+
src/ripple/protocol/impl/RPCErr.cpp
9192
src/ripple/protocol/impl/Rate2.cpp
9293
src/ripple/protocol/impl/Rules.cpp
9394
src/ripple/protocol/impl/SField.cpp
@@ -159,54 +160,54 @@ target_link_libraries (xrpl_core
159160
#]=================================]
160161
install (
161162
FILES
162-
src/ripple/basics/algorithm.h
163163
src/ripple/basics/Archive.h
164-
src/ripple/basics/base64.h
165-
src/ripple/basics/base_uint.h
166164
src/ripple/basics/BasicConfig.h
167165
src/ripple/basics/Blob.h
168166
src/ripple/basics/Buffer.h
169167
src/ripple/basics/ByteUtilities.h
170-
src/ripple/basics/chrono.h
171-
src/ripple/basics/comparators.h
172168
src/ripple/basics/CompressionAlgorithms.h
173-
src/ripple/basics/contract.h
174169
src/ripple/basics/CountedObject.h
175170
src/ripple/basics/DecayingSample.h
176171
src/ripple/basics/Expected.h
177172
src/ripple/basics/FeeUnits.h
178173
src/ripple/basics/FileUtilities.h
179-
src/ripple/basics/hardened_hash.h
180174
src/ripple/basics/IOUAmount.h
181-
src/ripple/basics/join.h
182175
src/ripple/basics/KeyCache.h
183176
src/ripple/basics/LocalValue.h
184177
src/ripple/basics/Log.h
185-
src/ripple/basics/make_SSLContext.h
186178
src/ripple/basics/MathUtilities.h
187-
src/ripple/basics/mulDiv.h
188179
src/ripple/basics/Number.h
189-
src/ripple/basics/partitioned_unordered_map.h
190180
src/ripple/basics/PerfLog.h
191-
src/ripple/basics/random.h
192-
src/ripple/basics/RangeSet.h
193181
src/ripple/basics/README.md
194-
src/ripple/basics/ResolverAsio.h
182+
src/ripple/basics/RangeSet.h
195183
src/ripple/basics/Resolver.h
196-
src/ripple/basics/safe_cast.h
197-
src/ripple/basics/scope.h
184+
src/ripple/basics/ResolverAsio.h
198185
src/ripple/basics/SHAMapHash.h
199186
src/ripple/basics/Slice.h
200-
src/ripple/basics/spinlock.h
201-
src/ripple/basics/strHex.h
202187
src/ripple/basics/StringUtilities.h
203188
src/ripple/basics/TaggedCache.h
204-
src/ripple/basics/tagged_integer.h
205189
src/ripple/basics/ThreadSafetyAnalysis.h
206190
src/ripple/basics/ToString.h
207191
src/ripple/basics/UnorderedContainers.h
208192
src/ripple/basics/UptimeClock.h
209193
src/ripple/basics/XRPAmount.h
194+
src/ripple/basics/algorithm.h
195+
src/ripple/basics/base64.h
196+
src/ripple/basics/base_uint.h
197+
src/ripple/basics/chrono.h
198+
src/ripple/basics/comparators.h
199+
src/ripple/basics/contract.h
200+
src/ripple/basics/hardened_hash.h
201+
src/ripple/basics/join.h
202+
src/ripple/basics/make_SSLContext.h
203+
src/ripple/basics/mulDiv.h
204+
src/ripple/basics/partitioned_unordered_map.h
205+
src/ripple/basics/random.h
206+
src/ripple/basics/safe_cast.h
207+
src/ripple/basics/scope.h
208+
src/ripple/basics/spinlock.h
209+
src/ripple/basics/strHex.h
210+
src/ripple/basics/tagged_integer.h
210211
DESTINATION include/ripple/basics)
211212
install (
212213
FILES
@@ -231,11 +232,6 @@ install (
231232
FILES
232233
src/ripple/json/impl/json_assert.h
233234
DESTINATION include/ripple/json/impl)
234-
235-
install (
236-
FILES
237-
src/ripple/net/RPCErr.h
238-
DESTINATION include/ripple/net)
239235
install (
240236
FILES
241237
src/ripple/protocol/AccountID.h
@@ -251,94 +247,110 @@ install (
251247
src/ripple/protocol/InnerObjectFormats.h
252248
src/ripple/protocol/Issue.h
253249
src/ripple/protocol/json_get_or_throw.h
254-
src/ripple/protocol/KeyType.h
255250
src/ripple/protocol/Keylet.h
251+
src/ripple/protocol/KeyType.h
256252
src/ripple/protocol/KnownFormats.h
257253
src/ripple/protocol/LedgerFormats.h
258254
src/ripple/protocol/LedgerHeader.h
259-
src/ripple/protocol/NFTSyntheticSerializer.h
260255
src/ripple/protocol/NFTokenID.h
261256
src/ripple/protocol/NFTokenOfferID.h
257+
src/ripple/protocol/NFTSyntheticSerializer.h
262258
src/ripple/protocol/Protocol.h
263259
src/ripple/protocol/PublicKey.h
264260
src/ripple/protocol/Quality.h
265261
src/ripple/protocol/QualityFunction.h
266262
src/ripple/protocol/Rate.h
263+
src/ripple/protocol/RPCErr.h
267264
src/ripple/protocol/Rules.h
265+
src/ripple/protocol/SecretKey.h
266+
src/ripple/protocol/Seed.h
267+
src/ripple/protocol/SeqProxy.h
268+
src/ripple/protocol/Serializer.h
268269
src/ripple/protocol/SField.h
270+
src/ripple/protocol/Sign.h
269271
src/ripple/protocol/SOTemplate.h
270272
src/ripple/protocol/STAccount.h
271273
src/ripple/protocol/STAmount.h
272-
src/ripple/protocol/STCurrency.h
273-
src/ripple/protocol/STIssue.h
274274
src/ripple/protocol/STArray.h
275275
src/ripple/protocol/STBase.h
276276
src/ripple/protocol/STBitString.h
277277
src/ripple/protocol/STBlob.h
278+
src/ripple/protocol/STCurrency.h
278279
src/ripple/protocol/STExchange.h
279280
src/ripple/protocol/STInteger.h
281+
src/ripple/protocol/STIssue.h
280282
src/ripple/protocol/STLedgerEntry.h
281283
src/ripple/protocol/STObject.h
282284
src/ripple/protocol/STParsedJSON.h
283285
src/ripple/protocol/STPathSet.h
284286
src/ripple/protocol/STTx.h
285-
src/ripple/protocol/XChainAttestations.h
286-
src/ripple/protocol/STXChainBridge.h
287287
src/ripple/protocol/STValidation.h
288288
src/ripple/protocol/STVector256.h
289-
src/ripple/protocol/SecretKey.h
290-
src/ripple/protocol/Seed.h
291-
src/ripple/protocol/SeqProxy.h
292-
src/ripple/protocol/Serializer.h
293-
src/ripple/protocol/Sign.h
289+
src/ripple/protocol/STXChainBridge.h
294290
src/ripple/protocol/SystemParameters.h
295291
src/ripple/protocol/TER.h
296292
src/ripple/protocol/TxFlags.h
297293
src/ripple/protocol/TxFormats.h
298294
src/ripple/protocol/TxMeta.h
299295
src/ripple/protocol/UintTypes.h
296+
src/ripple/protocol/XChainAttestations.h
300297
src/ripple/protocol/digest.h
301298
src/ripple/protocol/jss.h
302-
src/ripple/protocol/serialize.h
303299
src/ripple/protocol/nft.h
304300
src/ripple/protocol/nftPageMask.h
301+
src/ripple/protocol/serialize.h
305302
src/ripple/protocol/tokens.h
306303
DESTINATION include/ripple/protocol)
307304
install (
308305
FILES
306+
src/ripple/protocol/impl/STVar.h
309307
src/ripple/protocol/impl/b58_utils.h
310-
src/ripple/protocol/impl/STVar.h
311308
src/ripple/protocol/impl/secp256k1.h
312309
src/ripple/protocol/impl/token_errors.h
313310
DESTINATION include/ripple/protocol/impl)
314311
install (
315-
FILES
316-
src/ripple/resource/Fees.h
317-
src/ripple/resource/Charge.h
318-
DESTINATION include/ripple/resource)
312+
FILES
313+
src/ripple/resource/Charge.h
314+
src/ripple/resource/Consumer.h
315+
src/ripple/resource/Disposition.h
316+
src/ripple/resource/Fees.h
317+
src/ripple/resource/Gossip.h
318+
src/ripple/resource/ResourceManager.h
319+
src/ripple/resource/Types.h
320+
DESTINATION include/ripple/resource)
319321
install (
320322
FILES
323+
src/ripple/resource/impl/Entry.h
324+
src/ripple/resource/impl/Import.h
325+
src/ripple/resource/impl/Key.h
326+
src/ripple/resource/impl/Kind.h
327+
src/ripple/resource/impl/Logic.h
328+
src/ripple/resource/impl/Tuning.h
329+
DESTINATION include/ripple/resource/impl)
330+
install (
331+
FILES
332+
src/ripple/server/Handoff.h
321333
src/ripple/server/Port.h
322334
src/ripple/server/Server.h
323335
src/ripple/server/Session.h
324336
src/ripple/server/SimpleWriter.h
325337
src/ripple/server/Writer.h
326338
src/ripple/server/WSSession.h
327-
src/ripple/server/Handoff.h
328339
DESTINATION include/ripple/server)
329340
install (
330341
FILES
331-
src/ripple/server/impl/ServerImpl.h
332-
src/ripple/server/impl/io_list.h
333-
src/ripple/server/impl/Door.h
334-
src/ripple/server/impl/PlainHTTPPeer.h
335-
src/ripple/server/impl/PlainWSPeer.h
336342
src/ripple/server/impl/BaseHTTPPeer.h
337-
src/ripple/server/impl/BaseWSPeer.h
338343
src/ripple/server/impl/BasePeer.h
344+
src/ripple/server/impl/BaseWSPeer.h
345+
src/ripple/server/impl/Door.h
346+
src/ripple/server/impl/JSONRPCUtil.h
339347
src/ripple/server/impl/LowestLayer.h
348+
src/ripple/server/impl/PlainHTTPPeer.h
349+
src/ripple/server/impl/PlainWSPeer.h
350+
src/ripple/server/impl/ServerImpl.h
340351
src/ripple/server/impl/SSLHTTPPeer.h
341352
src/ripple/server/impl/SSLWSPeer.h
353+
src/ripple/server/impl/io_list.h
342354
DESTINATION include/ripple/server/impl)
343355
#[===================================[
344356
beast/legacy headers installation
@@ -364,11 +376,11 @@ install (
364376
DESTINATION include/ripple/beast/hash)
365377
install (
366378
FILES
367-
src/ripple/beast/net/IPAddress.h
368-
src/ripple/beast/net/IPAddressConversion.h
369-
src/ripple/beast/net/IPAddressV4.h
370-
src/ripple/beast/net/IPAddressV6.h
371-
src/ripple/beast/net/IPEndpoint.h
379+
src/ripple/beast/net/IPAddress.h
380+
src/ripple/beast/net/IPAddressConversion.h
381+
src/ripple/beast/net/IPAddressV4.h
382+
src/ripple/beast/net/IPAddressV6.h
383+
src/ripple/beast/net/IPEndpoint.h
372384
DESTINATION include/ripple/beast/net)
373385
install (
374386
FILES
@@ -382,15 +394,14 @@ install (
382394
src/ripple/beast/unit_test/amount.hpp
383395
src/ripple/beast/unit_test/dstream.hpp
384396
src/ripple/beast/unit_test/global_suites.hpp
385-
src/ripple/beast/unit_test/main.cpp
386397
src/ripple/beast/unit_test/match.hpp
387398
src/ripple/beast/unit_test/recorder.hpp
388399
src/ripple/beast/unit_test/reporter.hpp
389400
src/ripple/beast/unit_test/results.hpp
390401
src/ripple/beast/unit_test/runner.hpp
391-
src/ripple/beast/unit_test/suite.hpp
392402
src/ripple/beast/unit_test/suite_info.hpp
393403
src/ripple/beast/unit_test/suite_list.hpp
404+
src/ripple/beast/unit_test/suite.hpp
394405
src/ripple/beast/unit_test/thread.hpp
395406
DESTINATION include/ripple/beast/unit_test)
396407
install (
@@ -401,34 +412,10 @@ install (
401412
FILES
402413
src/ripple/beast/utility/Journal.h
403414
src/ripple/beast/utility/PropertyStream.h
415+
src/ripple/beast/utility/WrappedSink.h
404416
src/ripple/beast/utility/Zero.h
405417
src/ripple/beast/utility/rngfill.h
406-
src/ripple/beast/utility/WrappedSink.h
407418
DESTINATION include/ripple/beast/utility)
408-
# WARNING!! -- horrible levelization ahead
409-
# (these files should be isolated or moved...but
410-
# unfortunately unit_test.h above creates this dependency)
411-
if (tests)
412-
install (
413-
FILES
414-
src/ripple/beast/unit_test/amount.hpp
415-
src/ripple/beast/unit_test/dstream.hpp
416-
src/ripple/beast/unit_test/global_suites.hpp
417-
src/ripple/beast/unit_test/match.hpp
418-
src/ripple/beast/unit_test/recorder.hpp
419-
src/ripple/beast/unit_test/reporter.hpp
420-
src/ripple/beast/unit_test/results.hpp
421-
src/ripple/beast/unit_test/runner.hpp
422-
src/ripple/beast/unit_test/suite.hpp
423-
src/ripple/beast/unit_test/suite_info.hpp
424-
src/ripple/beast/unit_test/suite_list.hpp
425-
src/ripple/beast/unit_test/thread.hpp
426-
DESTINATION include/ripple/beast/extras/unit_test)
427-
install (
428-
FILES
429-
src/ripple/beast/unit_test/detail/const_container.hpp
430-
DESTINATION include/ripple/beast/unit_test/detail)
431-
endif () #tests
432419
#[===================================================================[
433420
rippled executable
434421
#]===================================================================]
@@ -641,7 +628,6 @@ target_sources (rippled PRIVATE
641628
src/ripple/net/impl/HTTPStream.cpp
642629
src/ripple/net/impl/InfoSub.cpp
643630
src/ripple/net/impl/RPCCall.cpp
644-
src/ripple/net/impl/RPCErr.cpp
645631
src/ripple/net/impl/RPCSub.cpp
646632
src/ripple/net/impl/RegisterSSLCerts.cpp
647633
#[===============================[

‎src/ripple/app/misc/NetworkOPs.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@
5454
#include <ripple/crypto/csprng.h>
5555
#include <ripple/json/MultivarJson.h>
5656
#include <ripple/json/to_string.h>
57-
#include <ripple/net/RPCErr.h>
5857
#include <ripple/nodestore/DatabaseShard.h>
5958
#include <ripple/overlay/Cluster.h>
6059
#include <ripple/overlay/Overlay.h>
6160
#include <ripple/overlay/predicates.h>
6261
#include <ripple/protocol/BuildInfo.h>
6362
#include <ripple/protocol/Feature.h>
63+
#include <ripple/protocol/RPCErr.h>
6464
#include <ripple/protocol/STParsedJSON.h>
6565
#include <ripple/protocol/jss.h>
6666
#include <ripple/resource/Fees.h>

‎src/ripple/app/paths/PathRequest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#include <ripple/basics/Log.h>
2929
#include <ripple/beast/core/LexicalCast.h>
3030
#include <ripple/core/Config.h>
31-
#include <ripple/net/RPCErr.h>
3231
#include <ripple/protocol/ErrorCodes.h>
32+
#include <ripple/protocol/RPCErr.h>
3333
#include <ripple/protocol/UintTypes.h>
3434

3535
#include <ripple/rpc/impl/Tuning.h>

‎src/ripple/app/paths/PathRequests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include <ripple/app/paths/PathRequests.h>
2323
#include <ripple/basics/Log.h>
2424
#include <ripple/core/JobQueue.h>
25-
#include <ripple/net/RPCErr.h>
2625
#include <ripple/protocol/ErrorCodes.h>
26+
#include <ripple/protocol/RPCErr.h>
2727
#include <ripple/protocol/jss.h>
2828
#include <ripple/resource/Fees.h>
2929
#include <algorithm>

‎src/ripple/net/impl/RPCCall.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include <ripple/json/to_string.h>
3131
#include <ripple/net/HTTPClient.h>
3232
#include <ripple/net/RPCCall.h>
33-
#include <ripple/net/RPCErr.h>
3433
#include <ripple/protocol/ErrorCodes.h>
3534
#include <ripple/protocol/Feature.h>
35+
#include <ripple/protocol/RPCErr.h>
3636
#include <ripple/protocol/SystemParameters.h>
3737
#include <ripple/protocol/UintTypes.h>
3838
#include <ripple/protocol/jss.h>

‎src/ripple/net/RPCErr.h ‎src/ripple/protocol/RPCErr.h

File renamed without changes.

‎src/ripple/net/impl/RPCErr.cpp ‎src/ripple/protocol/impl/RPCErr.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818
//==============================================================================
1919

20-
#include <ripple/net/RPCErr.h>
2120
#include <ripple/protocol/ErrorCodes.h>
21+
#include <ripple/protocol/RPCErr.h>
2222

2323
namespace ripple {
2424

‎src/ripple/rpc/handlers/AMMInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include <ripple/app/misc/AMMUtils.h>
2121
#include <ripple/json/json_value.h>
2222
#include <ripple/ledger/ReadView.h>
23-
#include <ripple/net/RPCErr.h>
2423
#include <ripple/protocol/AMMCore.h>
2524
#include <ripple/protocol/Issue.h>
25+
#include <ripple/protocol/RPCErr.h>
2626
#include <ripple/rpc/Context.h>
2727
#include <ripple/rpc/impl/RPCHelpers.h>
2828
#include <grpcpp/support/status.h>

‎src/ripple/rpc/handlers/AccountChannels.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include <ripple/app/main/Application.h>
2121
#include <ripple/ledger/ReadView.h>
2222
#include <ripple/ledger/View.h>
23-
#include <ripple/net/RPCErr.h>
2423
#include <ripple/protocol/ErrorCodes.h>
2524
#include <ripple/protocol/PublicKey.h>
25+
#include <ripple/protocol/RPCErr.h>
2626
#include <ripple/protocol/STAccount.h>
2727
#include <ripple/protocol/jss.h>
2828
#include <ripple/resource/Fees.h>

‎src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include <ripple/app/main/Application.h>
2121
#include <ripple/app/paths/TrustLine.h>
2222
#include <ripple/ledger/ReadView.h>
23-
#include <ripple/net/RPCErr.h>
2423
#include <ripple/protocol/ErrorCodes.h>
24+
#include <ripple/protocol/RPCErr.h>
2525
#include <ripple/protocol/jss.h>
2626
#include <ripple/rpc/Context.h>
2727
#include <ripple/rpc/impl/RPCHelpers.h>

0 commit comments

Comments
 (0)