mirror of
				https://github.com/XRPLF/rippled.git
				synced 2025-11-04 11:15:56 +00:00 
			
		
		
		
	refactor: Sorts retired amendments to reduce conflicts (#5966)
We are on an amendment retiring spree, but each change results in conflicts in `features.macro` because currently they all add the retired amendment to the end of the list. By sorting the list the number of conflicts should be reduced, making it easier to merge them.
This commit is contained in:
		@@ -131,26 +131,26 @@ XRPL_FEATURE(CryptoConditionsSuite, Supported::yes, VoteBehavior::Obsolete)
 | 
			
		||||
// pre-amendment code has been removed and the identifiers are deprecated.
 | 
			
		||||
// All known amendments and amendments that may appear in a validated
 | 
			
		||||
// ledger must be registered either here or above with the "active" amendments
 | 
			
		||||
XRPL_RETIRE(MultiSign)
 | 
			
		||||
XRPL_RETIRE(TrustSetAuth)
 | 
			
		||||
XRPL_RETIRE(FeeEscalation)
 | 
			
		||||
XRPL_RETIRE(PayChan)
 | 
			
		||||
XRPL_RETIRE(CryptoConditions)
 | 
			
		||||
XRPL_RETIRE(TickSize)
 | 
			
		||||
XRPL_RETIRE(fix1368)
 | 
			
		||||
XRPL_RETIRE(Escrow)
 | 
			
		||||
XRPL_RETIRE(fix1373)
 | 
			
		||||
XRPL_RETIRE(EnforceInvariants)
 | 
			
		||||
XRPL_RETIRE(SortedDirectories)
 | 
			
		||||
XRPL_RETIRE(fix1201)
 | 
			
		||||
XRPL_RETIRE(fix1368)
 | 
			
		||||
XRPL_RETIRE(fix1373)
 | 
			
		||||
XRPL_RETIRE(fix1512)
 | 
			
		||||
XRPL_RETIRE(fix1523)
 | 
			
		||||
XRPL_RETIRE(fix1528)
 | 
			
		||||
XRPL_RETIRE(FlowCross)
 | 
			
		||||
XRPL_RETIRE(fix1513)
 | 
			
		||||
XRPL_RETIRE(fix1515)
 | 
			
		||||
XRPL_RETIRE(fix1523)
 | 
			
		||||
XRPL_RETIRE(fix1528)
 | 
			
		||||
XRPL_RETIRE(fix1543)
 | 
			
		||||
XRPL_RETIRE(fix1781)
 | 
			
		||||
XRPL_RETIRE(fix1571)
 | 
			
		||||
XRPL_RETIRE(fix1578)
 | 
			
		||||
XRPL_RETIRE(fix1781)
 | 
			
		||||
XRPL_RETIRE(fixCheckThreading)
 | 
			
		||||
XRPL_RETIRE(CryptoConditions)
 | 
			
		||||
XRPL_RETIRE(Escrow)
 | 
			
		||||
XRPL_RETIRE(EnforceInvariants)
 | 
			
		||||
XRPL_RETIRE(FeeEscalation)
 | 
			
		||||
XRPL_RETIRE(FlowCross)
 | 
			
		||||
XRPL_RETIRE(MultiSign)
 | 
			
		||||
XRPL_RETIRE(PayChan)
 | 
			
		||||
XRPL_RETIRE(SortedDirectories)
 | 
			
		||||
XRPL_RETIRE(TickSize)
 | 
			
		||||
XRPL_RETIRE(TrustSetAuth)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user