Skip to content

Commit

Permalink
fix after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
pwang200 committed Jun 25, 2020
1 parent 0dd633b commit 0f576c3
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/test/consensus/NegativeUNL_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ class NegativeUNL_test : public beast::unit_test::suite
create_genesis,
env.app().config(),
std::vector<uint256>{},
env.app().family());
env.app().getNodeFamily());
BEAST_EXPECT(l->rules().enabled(featureNegativeUNL));

// Record the public keys and ledger sequences of expected negative UNL
Expand Down Expand Up @@ -533,7 +533,7 @@ class NegativeUNLNoAmendment_test : public beast::unit_test::suite
create_genesis,
env.app().config(),
std::vector<uint256>{},
env.app().family());
env.app().getNodeFamily());
BEAST_EXPECT(!l->rules().enabled(featureNegativeUNL));

// generate more ledgers
Expand Down Expand Up @@ -617,7 +617,7 @@ struct NetworkHistory
create_genesis,
env.app().config(),
std::vector<uint256>{fake_amemdment++},
env.app().family());
env.app().getNodeFamily());
history.push_back(l);

// When putting validators into the negative UNL, we start with
Expand Down Expand Up @@ -756,7 +756,7 @@ voteAndCheck(
NegativeUNLVote vote(myId, history.env.journal);
pre(vote);
auto txSet = std::make_shared<SHAMap>(
SHAMapType::TRANSACTION, history.env.app().family());
SHAMapType::TRANSACTION, history.env.app().getNodeFamily());
vote.doVoting(
history.lastLedger(), history.UNLKeySet, history.validations, txSet);
return countTx(txSet) == expect;
Expand All @@ -778,7 +778,7 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::suite

// one add, one remove
auto txSet = std::make_shared<SHAMap>(
SHAMapType::TRANSACTION, env.app().family());
SHAMapType::TRANSACTION, env.app().getNodeFamily());
PublicKey toDisableKey;
PublicKey toReEnableKey;
LedgerIndex seq(1234);
Expand Down Expand Up @@ -1821,7 +1821,7 @@ class NegativeUNLVoteFilterValidations_test : public beast::unit_test::suite
create_genesis,
env.app().config(),
std::vector<uint256>{},
env.app().family());
env.app().getNodeFamily());

auto createSTVal = [&](std::pair<PublicKey, SecretKey> const& keys) {
return std::make_shared<STValidation>(
Expand Down

0 comments on commit 0f576c3

Please sign in to comment.