mirror of
https://github.com/Xahau/xahaud.git
synced 2025-11-05 03:05:49 +00:00
bad merge: RPCCall_test, Transaction_test
This commit is contained in:
@@ -1965,7 +1965,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
|
|||||||
"method" : "channel_authorize",
|
"method" : "channel_authorize",
|
||||||
"params" : [
|
"params" : [
|
||||||
{
|
{
|
||||||
"api_version" : %MAX_API_VER%,
|
"api_version" : %API_VER%,
|
||||||
"amount" : {
|
"amount" : {
|
||||||
"currency" : "USD",
|
"currency" : "USD",
|
||||||
"issuer" : "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
|
"issuer" : "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
|
||||||
@@ -2151,7 +2151,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
|
|||||||
"method" : "channel_verify",
|
"method" : "channel_verify",
|
||||||
"params" : [
|
"params" : [
|
||||||
{
|
{
|
||||||
"api_version" : %MAX_API_VER%,
|
"api_version" : %API_VER%,
|
||||||
"amount" : {
|
"amount" : {
|
||||||
"currency" : "USD",
|
"currency" : "USD",
|
||||||
"issuer" : "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
|
"issuer" : "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
|
||||||
@@ -6257,6 +6257,8 @@ public:
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
printf("got: %s\n", got.toStyledString().c_str());
|
||||||
|
printf("exp: %s\n", exp.toStyledString().c_str());
|
||||||
fail(rpcCallTest.description, __FILE__, rpcCallTest.line);
|
fail(rpcCallTest.description, __FILE__, rpcCallTest.line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -821,7 +821,7 @@ class Transaction_test : public beast::unit_test::suite
|
|||||||
std::shared_ptr<STTx const> const txn = env.tx();
|
std::shared_ptr<STTx const> const txn = env.tx();
|
||||||
BEAST_EXPECT(
|
BEAST_EXPECT(
|
||||||
to_string(txn->getTransactionID()) ==
|
to_string(txn->getTransactionID()) ==
|
||||||
"3F8BDE5A5F82C4F4708E5E9255B713E303E6E1A371FD5C7A704AFD1387C23981");
|
"93334A06F509A0E04E908F2E9BA3BD1A00C7B11A91D5EAF20BEF25CE36FCC358");
|
||||||
env.close();
|
env.close();
|
||||||
std::shared_ptr<STObject const> meta =
|
std::shared_ptr<STObject const> meta =
|
||||||
env.closed()->txRead(txn->getTransactionID()).second;
|
env.closed()->txRead(txn->getTransactionID()).second;
|
||||||
@@ -855,8 +855,8 @@ class Transaction_test : public beast::unit_test::suite
|
|||||||
result[jss::result][jss::meta_blob] == expected_meta_blob);
|
result[jss::result][jss::meta_blob] == expected_meta_blob);
|
||||||
BEAST_EXPECT(
|
BEAST_EXPECT(
|
||||||
result[jss::result][jss::ledger_hash] ==
|
result[jss::result][jss::ledger_hash] ==
|
||||||
"2D5150E5A5AA436736A732291E437ABF01BC9E206C2DF3C77C4F856915"
|
"BC720494ECE70EF8EF078043E71845D9BAC4D1C079181127AF309CC72B"
|
||||||
"7905AA");
|
"ABB1EA");
|
||||||
BEAST_EXPECT(
|
BEAST_EXPECT(
|
||||||
result[jss::result][jss::close_time_iso] ==
|
result[jss::result][jss::close_time_iso] ==
|
||||||
"2000-01-01T00:00:10Z");
|
"2000-01-01T00:00:10Z");
|
||||||
|
|||||||
Reference in New Issue
Block a user