Skip to content

Commit

Permalink
Minor loadgen cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@SirTyson
SirTyson committed Jan 20, 2024
1 parent 3138474 commit a2c2382
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/simulation/LoadGenerator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1736,7 +1736,8 @@ std::vector<LedgerKey>
LoadGenerator::checkSorobanStateSynced(Application& app,
GeneratedLoadConfig const& cfg)
{
if (!cfg.isSoroban())
// We don't care if TXs succeed for SOROBAN_UPLOAD
if (!cfg.isSoroban() || cfg.mode == LoadGenMode::SOROBAN_UPLOAD)
{
return {};
}
Expand Down Expand Up @@ -2012,7 +2013,7 @@ LoadGenerator::execute(TransactionFramePtr& txf, LoadGenMode mode,
auto status = mApp.getHerder().recvTransaction(txf, true);
if (status != TransactionQueue::AddResult::ADD_STATUS_PENDING)
{
CLOG_INFO(LoadGen, "tx rejected '{}': ===> {}",
CLOG_INFO(LoadGen, "tx rejected '{}': ===> {}, {}",
TX_STATUS_STRING[static_cast<int>(status)],
txf->isSoroban() ? "soroban"
: xdr_to_string(txf->getEnvelope(),
Expand Down

5 comments on commit a2c2382

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from marta-lokhova
at SirTyson@a2c2382

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging SirTyson/stellar-core/loadgen-fixes = a2c2382 into auto

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SirTyson/stellar-core/loadgen-fixes = a2c2382 merged ok, testing candidate = 84ea49d

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20739234229
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20738504330
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20738504080
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20738503597
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20738503307
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20738502937
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20738502626
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20738502343
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20738502138
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20738501821
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20738501599
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20738501268
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20738500881
success: https://github.com/stellar/stellar-core/actions/runs/7614994086/job/20738500471

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 84ea49d

Please sign in to comment.