ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

STObject::applyTemplate() throws with description of error:

Browse Source 
The `STObject` member function `setType()` has been renamed to
applyTemplate() and modified to throw if there is a template
mismatch.

The error description in the exception is, in certain cases,
used, to better indicate why a particular transaction was
considered ill formed.

Fixes #2585.
This commit is contained in:
Scott Schurr
2018-11-02 17:50:27 -07:00
committed by Nik Bougalis
parent c354809e1c
commit ad5c5f1969
12 changed files with 221 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/test/protocol/STTx_test.cpp
View File

@@ -17,9 +17,11 @@
*/
//==============================================================================
#include <ripple/protocol/STAmount.h>
#include <ripple/protocol/Sign.h>
#include <ripple/protocol/STTx.h>
#include <ripple/protocol/STParsedJSON.h>
#include <ripple/protocol/TxFormats.h>
#include <ripple/protocol/UintTypes.h>
#include <ripple/json/to_string.h>
#include <ripple/beast/unit_test.h>
@@ -41,6 +43,9 @@ public:
testcase ("ed25519 signatures");
testSTTx (KeyType::ed25519);
testcase ("STObject constructor errors");
testObjectCtorErrors();
}
void testDeepNesting()
@@ -1229,7 +1234,7 @@ public:
try
{
ripple::SerialIter sit (Slice{payload2, sizeof(payload2)});
ripple::SerialIter sit {payload2};
auto stx = std::make_shared<ripple::STTx const>(sit);
fail("An exception should have been thrown");
}
@@ -1287,6 +1292,95 @@ public:
pass ();
}
}
void testObjectCtorErrors ()
{
auto const kp1 = randomKeyPair (KeyType::secp256k1);
auto const id1 = calcAccountID(kp1.first);
auto const kp2 = randomKeyPair (KeyType::secp256k1);
auto const id2 = calcAccountID(kp2.first);
// Lambda that returns a Payment STObject.
auto getPayment = [kp1, id1, id2] ()
{
// Account id1 pays account id2 10,000 XRP.
STObject payment (sfGeneric);
payment.setFieldU16 (sfTransactionType, ttPAYMENT);
payment.setAccountID (sfAccount, id1);
payment.setAccountID (sfDestination, id2);
payment.setFieldAmount (sfAmount, STAmount (10000000000ull));
payment.setFieldAmount (sfFee, STAmount (10ull));
payment.setFieldU32 (sfSequence, 1);
payment.setFieldVL (
sfSigningPubKey, Slice (kp1.first.data(), kp1.first.size()));
return payment;
};
{
// Verify that getPayment() returns a viable Payment.
std::string got;
try
{
STTx {getPayment()};
}
catch (STTx::FieldErr const& err)
{
got = err.what();
}
BEAST_EXPECT (got.empty());
}
{
// Make a payment with a defaulted PathSet field, which is invalid.
STObject defaultPath {getPayment()};
defaultPath.setFieldPathSet (sfPaths, STPathSet{});
std::string got;
try
{
STTx {std::move (defaultPath)};
}
catch (STTx::FieldErr const& err)
{
got = err.what();
}
BEAST_EXPECT (
got == "Field 'Paths' may not be explicitly set to default.");
}
{
// Make a Payment with an extra "SignerWeight" field.
STObject extraField {getPayment()};
extraField.setFieldU16 (sfSignerWeight, 7);
std::string got;
try
{
STTx {std::move (extraField)};
}
catch (STTx::FieldErr const& err)
{
got = err.what();
}
BEAST_EXPECT (
got == "Field 'SignerWeight' found in disallowed location.");
}
{
// Make a Payment that is missing the required Fee field.
STObject extraField {getPayment()};
extraField.delField (sfFee);
std::string got;
try
{
STTx {std::move (extraField)};
}
catch (STTx::FieldErr const& err)
{
got = err.what();
}
BEAST_EXPECT (
got == "Field 'Fee' is required but missing.");
}
}
};
class InnerObjectFormatsSerializer_test : public beast::unit_test::suite