ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-09 03:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: post-merge

Browse Source
This commit is contained in:
Vito
2026-06-08 13:58:18 +02:00
parent 3c41d29904
commit b921570a0f
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
View File

@@ -1,13 +1,17 @@
#include <xrpl/tx/transactors/lending/LoanBrokerSet.h>
#include <xrpl/basics/Expected.h>
#include <xrpl/basics/Log.h>
#include <xrpl/basics/Number.h>
#include <xrpl/basics/base_uint.h>
#include <xrpl/beast/utility/Zero.h>
#include <xrpl/beast/utility/instrumentation.h>
#include <xrpl/core/ServiceRegistry.h>
#include <xrpl/ledger/View.h>
#include <xrpl/ledger/helpers/AccountRootHelpers.h>
#include <xrpl/ledger/helpers/LendingHelpers.h>
#include <xrpl/ledger/helpers/TokenHelpers.h>
#include <xrpl/protocol/AccountID.h>
#include <xrpl/protocol/Asset.h>
#include <xrpl/protocol/Feature.h>
#include <xrpl/protocol/Indexes.h>

37
src/test/app/LoanBroker_test.cpp
View File

@@ -2232,7 +2232,7 @@ class LoanBroker_test : public beast::unit_test::Suite
// Helper to set up a vault and broker for testing
auto const setup = [&](Env& env) {
Vault vault{env};
Vault const vault{env};
env.fund(XRP(100'000), issuer, alice, evan);
env.close();
@@ -2258,7 +2258,7 @@ class LoanBroker_test : public beast::unit_test::Suite
uint256 vaultID;
Keylet brokerKeylet;
};
return Result{vaultKeylet.key, brokerKeylet};
return Result{.vaultID = vaultKeylet.key, .brokerKeylet = brokerKeylet};
};
// Post-amendment: VaultID must not be present on update
@@ -2269,10 +2269,10 @@ class LoanBroker_test : public beast::unit_test::Suite
auto const [vaultID, brokerKL] = setup(env);
// Update with VaultID → temINVALID
env(set(alice, vaultID), loanBrokerID(brokerKL.key), ter(temINVALID));
env(set(alice, vaultID), kLoanBrokerId(brokerKL.key), Ter(temINVALID));
// Update without VaultID succeeds
env(set(alice), loanBrokerID(brokerKL.key), data("post-amendment update"));
env(set(alice), kLoanBrokerId(brokerKL.key), kData("post-amendment update"));
env.close();
auto const broker = env.le(brokerKL);
@@ -2290,10 +2290,10 @@ class LoanBroker_test : public beast::unit_test::Suite
env.close();
// Create without VaultID → temINVALID
env(set(alice), ter(temINVALID));
env(set(alice), Ter(temINVALID));
// Create with zero VaultID → temINVALID
env(set(alice, uint256{}), ter(temINVALID));
env(set(alice, uint256{}), Ter(temINVALID));
}
// Post-amendment: Update by wrong owner → tecNO_PERMISSION
@@ -2302,7 +2302,7 @@ class LoanBroker_test : public beast::unit_test::Suite
Env env(*this);
auto const [vaultID, brokerKL] = setup(env);
env(set(evan), loanBrokerID(brokerKL.key), ter(tecNO_PERMISSION));
env(set(evan), kLoanBrokerId(brokerKL.key), Ter(tecNO_PERMISSION));
}
// Post-amendment: Update non-existent broker → tecNO_ENTRY
@@ -2312,7 +2312,7 @@ class LoanBroker_test : public beast::unit_test::Suite
env.fund(XRP(100'000), alice);
env.close();
env(set(alice), loanBrokerID(uint256{1}), ter(tecNO_ENTRY));
env(set(alice), kLoanBrokerId(uint256{1}), Ter(tecNO_ENTRY));
}
// Pre-amendment: VaultID required on both create and update
@@ -2324,10 +2324,10 @@ class LoanBroker_test : public beast::unit_test::Suite
auto const [vaultID, brokerKL] = setup(env);
// Update without VaultID → temINVALID (pre-amendment requires it)
env(set(alice), loanBrokerID(brokerKL.key), ter(temINVALID));
env(set(alice), kLoanBrokerId(brokerKL.key), Ter(temINVALID));
// Update with matching VaultID succeeds (old behavior)
env(set(alice, vaultID), loanBrokerID(brokerKL.key), data("pre-amendment update"));
env(set(alice, vaultID), kLoanBrokerId(brokerKL.key), kData("pre-amendment update"));
env.close();
auto const broker = env.le(brokerKL);
@@ -2342,7 +2342,7 @@ class LoanBroker_test : public beast::unit_test::Suite
Env env(*this);
env.disableFeature(featureLendingProtocolV1_1);
Vault vault{env};
Vault const vault{env};
env.fund(XRP(100'000), issuer, alice);
env.close();
env(trust(alice, issuer["IOU"](1'000'000)));
@@ -2367,7 +2367,7 @@ class LoanBroker_test : public beast::unit_test::Suite
env.close();
// Update with different vault → tecNO_PERMISSION
env(set(alice, vaultKL2.key), loanBrokerID(brokerKL.key), ter(tecNO_PERMISSION));
env(set(alice, vaultKL2.key), kLoanBrokerId(brokerKL.key), Ter(tecNO_PERMISSION));
}
// Pre-amendment: non-existent vault on update → tecNO_ENTRY
@@ -2378,7 +2378,7 @@ class LoanBroker_test : public beast::unit_test::Suite
auto const [vaultID, brokerKL] = setup(env);
// Update with a VaultID that doesn't exist
env(set(alice, uint256{1}), loanBrokerID(brokerKL.key), ter(tecNO_ENTRY));
env(set(alice, uint256{1}), kLoanBrokerId(brokerKL.key), Ter(tecNO_ENTRY));
}
// Pre-amendment: Create without VaultID → temINVALID
@@ -2389,7 +2389,7 @@ class LoanBroker_test : public beast::unit_test::Suite
env.fund(XRP(100'000), issuer, alice);
env.close();
env(set(alice), ter(temINVALID));
env(set(alice), Ter(temINVALID));
}
// Pre-amendment: immutable fields still rejected on update
@@ -2400,9 +2400,9 @@ class LoanBroker_test : public beast::unit_test::Suite
auto const [vaultID, brokerKL] = setup(env);
env(set(alice, vaultID),
loanBrokerID(brokerKL.key),
managementFeeRate(TenthBips16(1)),
ter(temINVALID));
kLoanBrokerId(brokerKL.key),
kManagementFeeRate(TenthBips16(1)),
Ter(temINVALID));
}
// Pre-amendment: zero VaultID on update → temINVALID
@@ -2412,7 +2412,7 @@ class LoanBroker_test : public beast::unit_test::Suite
env.disableFeature(featureLendingProtocolV1_1);
auto const [vaultID, brokerKL] = setup(env);
env(set(alice, uint256{}), loanBrokerID(brokerKL.key), ter(temINVALID));
env(set(alice, uint256{}), kLoanBrokerId(brokerKL.key), Ter(temINVALID));
}
}
@@ -2421,7 +2421,6 @@ public:
run() override
{
testLoanBrokerSetVaultIDAmendment();
testFeatureLendingProtocolV1_1enabled();
testCoverPrecisionGuard();
testLoanBrokerSetDebtMaximum();