Improved token service interface with more obvious request calls (grpIds and msgIds list being empty is not implicit of retrieving all ids)

Updated GXS tests and applied fixes
started transfering flags to gxs flags header file

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5513 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2012-09-04 22:32:52 +00:00
parent 84074fdca1
commit 08904bf82f
15 changed files with 387 additions and 114 deletions

View file

@ -175,7 +175,7 @@ bool GenExchangeTester::testGrpSubmissionRetrieval()
opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
std::list<RsGxsGroupId> grpIds;
mTokenService->requestGroupInfo(token, 0, opts, grpIds);
mTokenService->requestGroupInfo(token, 0, opts);
pollForToken(token, opts);
@ -272,7 +272,7 @@ bool GenExchangeTester::testGrpMetaRetrieval()
opts.mReqType = GXS_REQUEST_TYPE_GROUP_META;
std::list<RsGxsGroupId> grpIds;
mTokenService->requestGroupInfo(token, 0, opts, grpIds);
mTokenService->requestGroupInfo(token, 0, opts);
pollForToken(token, opts);
@ -319,7 +319,7 @@ bool GenExchangeTester::testGrpIdRetrieval()
opts.mReqType = GXS_REQUEST_TYPE_GROUP_IDS;
uint32_t token;
std::list<RsGxsGroupId> grpIds;
mTokenService->requestGroupInfo(token, 0, opts, grpIds);
mTokenService->requestGroupInfo(token, 0, opts);
pollForToken(token, opts);
@ -676,13 +676,13 @@ bool GenExchangeTester::testMsgIdRetrieval()
// now do ask of all msg ids
GxsMsgReq req;
std::list<RsGxsGroupId> req;
opts.mReqType = GXS_REQUEST_TYPE_MSG_IDS;
// use empty grp ids request types, non specific msgs ids
for(int i=0; i < mRandGrpIds.size(); i++)
{
req[mRandGrpIds[i]] = std::vector<RsGxsMessageId>();
req.push_back(mRandGrpIds[i]);
}
mTokenService->requestMsgInfo(token, 0, opts, req);