Skip to content

Commit 6e3dbde

Browse files
dexX7dexX7
committed
Format interpretPacket
1 parent a5974d6 commit 6e3dbde

File tree

1 file changed

+107
-141
lines changed

1 file changed

+107
-141
lines changed

‎src/omnicore/omnicore.cpp‎

Lines changed: 107 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -3623,172 +3623,138 @@ const CBitcoinAddress ExodusAddress()
36233623
// optional: provide the pointer to the CMPOffer object, it will get filled in
36243624
// verify that it does via if (MSC_TYPE_TRADE_OFFER == mp_obj.getType())
36253625
//
3626-
int CMPTransaction::interpretPacket(CMPOffer *obj_o, CMPMetaDEx *mdex_o)
3627-
{
3628-
int rc = PKT_ERROR;
3629-
3630-
if (!interpret_TransactionType()) return -98765;
3631-
3632-
if ((obj_o) && (MSC_TYPE_TRADE_OFFER != type)) return -777; // can't fill in the Offer object !
3633-
if ((mdex_o) && (MSC_TYPE_METADEX != type)) return -778; // can't fill in the MetaDEx object !
3634-
3635-
// further processing for complex types
3636-
// TODO: version may play a role here !
3637-
switch(type)
3638-
{
3639-
case MSC_TYPE_SIMPLE_SEND:
3640-
{
3641-
if (!interpret_SimpleSend()) {
3642-
return PKT_ERROR;
3643-
}
3644-
3645-
rc = logicMath_SimpleSend();
3646-
break;
3647-
}
3648-
3649-
case MSC_TYPE_SEND_TO_OWNERS:
3650-
{
3651-
if (!interpret_SendToOwners()) {
3652-
return PKT_ERROR;
3653-
}
36543626

3655-
boost::filesystem::path pathOwners = GetDataDir() / OWNERS_FILENAME;
3656-
FILE *fp = fopen(pathOwners.string().c_str(), "a");
3657-
if (fp) {
3658-
printInfo(fp);
3659-
} else {
3660-
PrintToLog("\nPROBLEM writing %s, errno= %d\n", OWNERS_FILENAME, errno);
3661-
}
3662-
3663-
rc = logicMath_SendToOwners(fp);
3627+
int CMPTransaction::interpretPacket(CMPOffer* obj_o, CMPMetaDEx* mdex_o)
3628+
{
3629+
int rc = PKT_ERROR;
36643630

3665-
if (fp) fclose(fp);
3666-
break;
3631+
if (!interpret_TransactionType()) {
3632+
return -98765;
36673633
}
36683634

3669-
case MSC_TYPE_TRADE_OFFER:
3670-
{
3671-
if (!interpret_TradeOffer()) {
3672-
return PKT_ERROR;
3673-
}
3674-
3675-
rc = logicMath_TradeOffer(obj_o);
3676-
break;
3635+
if (obj_o && MSC_TYPE_TRADE_OFFER != type) {
3636+
return -777; // can't fill in the Offer object !
36773637
}
36783638

3679-
case MSC_TYPE_METADEX:
3680-
{
3681-
if (!interpret_MetaDEx()) {
3682-
return PKT_ERROR;
3683-
}
3684-
3685-
rc = logicMath_MetaDEx(mdex_o);
3686-
break;
3639+
if (mdex_o && MSC_TYPE_METADEX != type) {
3640+
return -778; // can't fill in the MetaDEx object !
36873641
}
36883642

3689-
case MSC_TYPE_ACCEPT_OFFER_BTC:
3690-
{
3691-
if (!interpret_AcceptOfferBTC()) {
3692-
return PKT_ERROR;
3693-
}
3694-
3695-
rc = logicMath_AcceptOffer_BTC();
3696-
break;
3697-
}
3698-
3699-
case MSC_TYPE_CREATE_PROPERTY_FIXED:
3700-
{
3701-
if (!interpret_CreatePropertyFixed()) {
3702-
return PKT_ERROR;
3703-
}
3643+
switch (type) {
3644+
case MSC_TYPE_SIMPLE_SEND:
3645+
if (!interpret_SimpleSend()) {
3646+
return PKT_ERROR;
3647+
}
3648+
rc = logicMath_SimpleSend();
3649+
break;
37043650

3705-
rc = logicMath_CreatePropertyFixed();
3706-
break;
3707-
}
3651+
case MSC_TYPE_SEND_TO_OWNERS:
3652+
if (!interpret_SendToOwners()) {
3653+
return PKT_ERROR;
3654+
}
3655+
{ // TODO: remove file stuff
3656+
boost::filesystem::path pathOwners = GetDataDir() / OWNERS_FILENAME;
3657+
FILE *fp = fopen(pathOwners.string().c_str(), "a");
3658+
if (fp) {
3659+
printInfo(fp);
3660+
} else {
3661+
PrintToLog("\nPROBLEM writing %s, errno= %d\n", OWNERS_FILENAME, errno);
3662+
}
3663+
rc = logicMath_SendToOwners(fp);
3664+
if (fp) fclose(fp);
3665+
}
3666+
break;
37083667

3709-
case MSC_TYPE_CREATE_PROPERTY_VARIABLE:
3710-
{
3711-
if (!interpret_CreatePropertyVariable()) {
3712-
return PKT_ERROR;
3713-
}
3668+
case MSC_TYPE_TRADE_OFFER:
3669+
if (!interpret_TradeOffer()) {
3670+
return PKT_ERROR;
3671+
}
3672+
rc = logicMath_TradeOffer(obj_o);
3673+
break;
37143674

3715-
rc = logicMath_CreatePropertyVariable();
3716-
break;
3717-
}
3675+
case MSC_TYPE_METADEX:
3676+
if (!interpret_MetaDEx()) {
3677+
return PKT_ERROR;
3678+
}
3679+
rc = logicMath_MetaDEx(mdex_o);
3680+
break;
37183681

3719-
case MSC_TYPE_CLOSE_CROWDSALE:
3720-
{
3721-
if (!interpret_CloseCrowdsale()) {
3722-
return PKT_ERROR;
3723-
}
3682+
case MSC_TYPE_ACCEPT_OFFER_BTC:
3683+
if (!interpret_AcceptOfferBTC()) {
3684+
return PKT_ERROR;
3685+
}
3686+
rc = logicMath_AcceptOffer_BTC();
3687+
break;
37243688

3725-
rc = logicMath_CloseCrowdsale();
3726-
break;
3727-
}
3689+
case MSC_TYPE_CREATE_PROPERTY_FIXED:
3690+
if (!interpret_CreatePropertyFixed()) {
3691+
return PKT_ERROR;
3692+
}
3693+
rc = logicMath_CreatePropertyFixed();
3694+
break;
37283695

3729-
case MSC_TYPE_CREATE_PROPERTY_MANUAL:
3730-
{
3731-
if (!interpret_CreatePropertyMananged()) {
3732-
return PKT_ERROR;
3733-
}
3696+
case MSC_TYPE_CREATE_PROPERTY_VARIABLE:
3697+
if (!interpret_CreatePropertyVariable()) {
3698+
return PKT_ERROR;
3699+
}
3700+
rc = logicMath_CreatePropertyVariable();
3701+
break;
37343702

3735-
rc = logicMath_CreatePropertyMananged();
3736-
break;
3737-
}
3703+
case MSC_TYPE_CLOSE_CROWDSALE:
3704+
if (!interpret_CloseCrowdsale()) {
3705+
return PKT_ERROR;
3706+
}
3707+
rc = logicMath_CloseCrowdsale();
3708+
break;
37383709

3739-
case MSC_TYPE_GRANT_PROPERTY_TOKENS:
3740-
{
3741-
if (!interpret_GrantTokens()) {
3742-
return PKT_ERROR;
3743-
}
3710+
case MSC_TYPE_CREATE_PROPERTY_MANUAL:
3711+
if (!interpret_CreatePropertyMananged()) {
3712+
return PKT_ERROR;
3713+
}
3714+
rc = logicMath_CreatePropertyMananged();
3715+
break;
37443716

3745-
rc = logicMath_GrantTokens();
3746-
break;
3747-
}
3717+
case MSC_TYPE_GRANT_PROPERTY_TOKENS:
3718+
if (!interpret_GrantTokens()) {
3719+
return PKT_ERROR;
3720+
}
3721+
rc = logicMath_GrantTokens();
3722+
break;
37483723

3749-
case MSC_TYPE_REVOKE_PROPERTY_TOKENS:
3750-
{
3751-
if (!interpret_RevokeTokens()) {
3752-
return PKT_ERROR;
3753-
}
3724+
case MSC_TYPE_REVOKE_PROPERTY_TOKENS:
3725+
if (!interpret_RevokeTokens()) {
3726+
return PKT_ERROR;
3727+
}
3728+
rc = logicMath_RevokeTokens();
3729+
break;
37543730

3755-
rc = logicMath_RevokeTokens();
3756-
break;
3757-
}
3731+
case MSC_TYPE_CHANGE_ISSUER_ADDRESS:
3732+
if (!interpret_ChangeIssuer()) {
3733+
return PKT_ERROR;
3734+
}
3735+
rc = logicMath_ChangeIssuer();
3736+
break;
37583737

3759-
case MSC_TYPE_CHANGE_ISSUER_ADDRESS:
3760-
{
3761-
if (!interpret_ChangeIssuer()) {
3762-
return PKT_ERROR;
3763-
}
3738+
case OMNICORE_MESSAGE_TYPE_ALERT:
3739+
if (!interpret_Alert()) {
3740+
return PKT_ERROR;
3741+
}
3742+
rc = logicMath_Alert();
3743+
break;
37643744

3765-
rc = logicMath_ChangeIssuer();
3766-
break;
3767-
}
3745+
case MSC_TYPE_SAVINGS_MARK:
3746+
rc = logicMath_SavingsMark();
3747+
break;
37683748

3769-
case OMNICORE_MESSAGE_TYPE_ALERT:
3770-
{
3771-
if (!interpret_Alert()) {
3772-
return PKT_ERROR;
3773-
}
3749+
case MSC_TYPE_SAVINGS_COMPROMISED:
3750+
rc = logicMath_SavingsCompromised();
3751+
break;
37743752

3775-
rc = logicMath_Alert();
3776-
break;
3753+
default:
3754+
rc = (PKT_ERROR -100);
37773755
}
37783756

3779-
case MSC_TYPE_SAVINGS_MARK:
3780-
rc = logicMath_SavingsMark();
3781-
break;
3782-
3783-
case MSC_TYPE_SAVINGS_COMPROMISED:
3784-
rc = logicMath_SavingsCompromised();
3785-
break;
3786-
3787-
default:
3788-
return (PKT_ERROR -100);
3789-
}
3790-
3791-
return rc;
3757+
return rc;
37923758
}
37933759

37943760
int CMPTransaction::logicMath_SimpleSend()

0 commit comments

Comments
 (0)