ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ws2 as default in unit tests

Browse Source
This commit is contained in:
Miguel Portilla
2016-10-24 12:32:31 -04:00
committed by Brad Chase
parent d53d5cfc42
commit bf642404c7
3 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ripple/test/WSClient.h
View File

@@ -47,10 +47,7 @@ public:
/** Returns a client operating through WebSockets/S. */ /** Returns a client operating through WebSockets/S. */
std::unique_ptr<WSClient> std::unique_ptr<WSClient>
makeWSClient(Config const& cfg); makeWSClient(Config const& cfg, bool v2 = true);
std::unique_ptr<WSClient>
makeWS2Client(Config const& cfg);
} // test } // test
} // ripple } // ripple

10
src/ripple/test/impl/WSClient.cpp
View File

@@ -254,15 +254,9 @@ private:
}; };
std::unique_ptr<WSClient> std::unique_ptr<WSClient>
makeWSClient(Config const& cfg) makeWSClient(Config const& cfg, bool v2)
{ {
return std::make_unique<WSClientImpl>(cfg, false); return std::make_unique<WSClientImpl>(cfg, v2);
}
std::unique_ptr<WSClient>
makeWS2Client(Config const& cfg)
{
return std::make_unique<WSClientImpl>(cfg, true);
} }
} // test } // test

42
src/test/rpc/RobustTransaction_test.cpp
View File

@@ -108,6 +108,15 @@ public:
ff["Balance"] == "10002000000"; ff["Balance"] == "10002000000";
})); }));
} }
{
// RPC unsubscribe to transactions stream
Json::Value jv;
jv[jss::streams] = Json::arrayValue;
jv[jss::streams].append("transactions");
jv = wsc->invoke("unsubscribe", jv);
BEAST_EXPECT(jv[jss::status] == "success");
}
} }
/* /*
@@ -192,6 +201,7 @@ public:
env.app().getJobQueue().rendezvous(); env.app().getJobQueue().rendezvous();
} }
{
{ {
// RPC subscribe to ledger stream // RPC subscribe to ledger stream
Json::Value jv; Json::Value jv;
@@ -199,6 +209,7 @@ public:
jv[jss::streams].append("ledger"); jv[jss::streams].append("ledger");
jv = wsc->invoke("subscribe", jv); jv = wsc->invoke("subscribe", jv);
BEAST_EXPECT(jv[jss::status] == "success"); BEAST_EXPECT(jv[jss::status] == "success");
}
// Close ledgers // Close ledgers
for(auto i = 0; i < 8; ++i) for(auto i = 0; i < 8; ++i)
@@ -215,18 +226,28 @@ public:
return jv[jss::type] == "ledgerClosed"; return jv[jss::type] == "ledgerClosed";
})); }));
} }
{
// RPC unsubscribe to ledger stream
Json::Value jv;
jv[jss::streams] = Json::arrayValue;
jv[jss::streams].append("ledger");
jv = wsc->invoke("unsubscribe", jv);
BEAST_EXPECT(jv[jss::status] == "success");
}
} }
{ {
// Disconnect, reconnect // Disconnect, reconnect
wsc = makeWSClient(env.app().config()); wsc = makeWSClient(env.app().config());
{
// RPC subscribe to ledger stream // RPC subscribe to ledger stream
Json::Value jv; Json::Value jv;
jv[jss::streams] = Json::arrayValue; jv[jss::streams] = Json::arrayValue;
jv[jss::streams].append("ledger"); jv[jss::streams].append("ledger");
jv = wsc->invoke("subscribe", jv); jv = wsc->invoke("subscribe", jv);
BEAST_EXPECT(jv[jss::status] == "success"); BEAST_EXPECT(jv[jss::status] == "success");
}
// Close ledgers // Close ledgers
for (auto i = 0; i < 2; ++i) for (auto i = 0; i < 2; ++i)
@@ -243,6 +264,15 @@ public:
return jv[jss::type] == "ledgerClosed"; return jv[jss::type] == "ledgerClosed";
})); }));
} }
{
// RPC unsubscribe to ledger stream
Json::Value jv;
jv[jss::streams] = Json::arrayValue;
jv[jss::streams].append("ledger");
jv = wsc->invoke("unsubscribe", jv);
BEAST_EXPECT(jv[jss::status] == "success");
}
} }
{ {
@@ -303,6 +333,16 @@ public:
"AccountSet"; "AccountSet";
})); }));
} }
{
// RPC unsubscribe to accounts_proposed stream
Json::Value jv;
jv[jss::accounts_proposed] = Json::arrayValue;
jv[jss::accounts_proposed].append(
Account("alice").human());
jv = wsc->invoke("unsubscribe", jv);
BEAST_EXPECT(jv[jss::status] == "success");
}
} }
void void