mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-23 15:20:54 +00:00
Merge remote-tracking branch 'upstream/release/3.3.x' into mathbunnyru/merge-3.3.0-to-develop
* upstream/release/3.3.x: (41 commits) chore: Bump version to 3.3.0 chore: Bump version to 3.3.0-rc7 fix: Increase manifest protocol message size cap and fix manifests relay fix: Cap untrusted manifests per message and drop oversized ones chore: Bump version to 3.2.1 chore: Bump version to 3.2.1-rc1 fix: Cap untrusted manifests per message and drop oversized ones fix: Reject oversized validator manifest before decoding fix: Reduce untrusted manifest cache cap to 100 fix: Bound untrusted manifest cache chore: Bump version to 3.3.0-rc6 feat: Package validator-keys inside rippled chore: Bump version to 3.3.0-rc5 fix: Switch SponsorshipSet to use a delta for sfFeeAmount fix: Re-revert "fix: Set request size limits and differential pricing for get-object-by-hash calls" chore: Bump version to 3.3.0-rc4 fix: Revert "fix: Set request size limits and differential pricing for get-object-by-hash calls" chore: Bump version to 3.3.0-rc3 fix: Reduce untrusted manifest cache cap to 100 fix: Revert "fix: Reject oversized SHAMap nodes in gotStaleData and fetch-pack path" ...
This commit is contained in:
@@ -236,7 +236,7 @@ class Delegate_test : public beast::unit_test::Suite
|
||||
env(delegate::set(gw, Account("unknown"), {"Payment"}), Ter(tecNO_TARGET));
|
||||
}
|
||||
|
||||
// Delegating to a pseudo-account is not allowed, should return tecNO_PERMISSION
|
||||
// Delegating to a pseudo-account is not allowed, should return tecPSEUDO_ACCOUNT
|
||||
{
|
||||
Vault const vault{env};
|
||||
auto [tx, keylet] = vault.create({.owner = gw, .asset = xrpIssue()});
|
||||
@@ -246,7 +246,7 @@ class Delegate_test : public beast::unit_test::Suite
|
||||
auto const sleVault = env.le(keylet);
|
||||
BEAST_EXPECT(sleVault);
|
||||
Account const vaultPseudo{"vault", sleVault->at(sfAccount)};
|
||||
env(delegate::set(gw, vaultPseudo, {"Payment"}), Ter(tecNO_PERMISSION));
|
||||
env(delegate::set(gw, vaultPseudo, {"Payment"}), Ter(tecPSEUDO_ACCOUNT));
|
||||
}
|
||||
|
||||
// non-delegable transaction
|
||||
@@ -2167,11 +2167,12 @@ class Delegate_test : public beast::unit_test::Suite
|
||||
env(delegate::set(alice, bob, {"MPTokenIssuanceLock"}));
|
||||
env.close();
|
||||
|
||||
// Field is not permitted, permitted fields for delegation is defined in
|
||||
// permissions.macro.
|
||||
// tfMPTSetCanLock is a valid MPTokenIssuanceSet flag but is not
|
||||
// covered by the MPTokenIssuanceLock granular permission, so a
|
||||
// delegate holding only that permission cannot set it.
|
||||
mpt.set(
|
||||
{.account = alice,
|
||||
.mutableFlags = 2,
|
||||
.flags = tfMPTSetCanLock,
|
||||
.delegate = bob,
|
||||
.err = terNO_DELEGATE_PERMISSION});
|
||||
|
||||
@@ -2749,7 +2750,7 @@ class Delegate_test : public beast::unit_test::Suite
|
||||
// DO NOT modify expectedDelegableCount unless all scenarios, including
|
||||
// edge cases, have been fully tested and verified.
|
||||
// ====================================================================
|
||||
std::size_t const expectedDelegableCount = 57;
|
||||
std::size_t const expectedDelegableCount = 56;
|
||||
|
||||
BEAST_EXPECTS(
|
||||
delegableCount == expectedDelegableCount,
|
||||
|
||||
Reference in New Issue
Block a user