Skip to content

Commit 29be2a9

Browse files
committed
Remove conditionals for fix1528 enabled 14Nov2017
1 parent f2152b8 commit 29be2a9

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

src/ripple/app/consensus/RCLConsensus.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ RCLConsensus::Adaptor::acquireLedger(LedgerHash const& hash)
119119
// Notify inbound transactions of the new ledger sequence number
120120
inboundTransactions_.newRound(built->info().seq);
121121

122-
// Use the ledger timing rules of the acquired ledger
123-
parms_.useRoundedCloseTime = built->rules().enabled(fix1528);
122+
parms_.useRoundedCloseTime = true;
124123

125124
return RCLCxLedger(built);
126125
}
@@ -913,8 +912,7 @@ RCLConsensus::Adaptor::preStartRound(RCLCxLedger const & prevLgr)
913912
// Notify inbound ledgers that we are starting a new round
914913
inboundTransactions_.newRound(prevLgr.seq());
915914

916-
// Use parent ledger's rules to determine whether to use rounded close time
917-
parms_.useRoundedCloseTime = prevLgr.ledger_->rules().enabled(fix1528);
915+
parms_.useRoundedCloseTime = true;
918916

919917
// propose only if we're in sync with the network (and validating)
920918
return validating_ && synced;

src/ripple/protocol/Feature.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ extern uint256 const fix1201;
381381
extern uint256 const fix1512;
382382
extern uint256 const fix1513;
383383
extern uint256 const fix1523;
384-
extern uint256 const fix1528;
384+
extern uint256 const retiredFix1528;
385385
extern uint256 const featureDepositAuth;
386386
extern uint256 const featureChecks;
387387
extern uint256 const fix1571;

src/ripple/protocol/impl/Feature.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ uint256 const fix1201 = *getRegisteredFeature("fix1201");
172172
uint256 const fix1512 = *getRegisteredFeature("fix1512");
173173
uint256 const fix1513 = *getRegisteredFeature("fix1513");
174174
uint256 const fix1523 = *getRegisteredFeature("fix1523");
175-
uint256 const fix1528 = *getRegisteredFeature("fix1528");
175+
uint256 const retiredFix1528 = *getRegisteredFeature("fix1528");
176176
uint256 const featureDepositAuth = *getRegisteredFeature("DepositAuth");
177177
uint256 const featureChecks = *getRegisteredFeature("Checks");
178178
uint256 const fix1571 = *getRegisteredFeature("fix1571");

0 commit comments

Comments
 (0)