Skip to content
Snippets Groups Projects
Commit fc093ee4 authored by andrey.daragan's avatar andrey.daragan
Browse files

Merge branch 'bugs-2575' into 'master' 

Bugs 2575

See merge request !22
parents 63450f56 e9448fa9
No related branches found
No related tags found
1 merge request!22Bugs 2575
Pipeline #945 failed with stage
Stage: build
    in 1 minute and 55 seconds
    Hide whitespace changes
    Inline Side-by-side
    CellFrameDashboardGUI/DapCommandController.cpp
    + 27
    − 23
    View file @ fc093ee4
    #include "DapCommandController.h" #include "DapCommandController.h"
    #include <DapNodeType.h>
    #include <QDataStream>
    /// Overloaded constructor. /// Overloaded constructor.
    /// @param apIODevice Data transfer device. /// @param apIODevice Data transfer device.
    /// @param apParent Parent. /// @param apParent Parent.
    ...@@ -36,7 +39,7 @@ void DapCommandController::processCommandResult() ...@@ -36,7 +39,7 @@ void DapCommandController::processCommandResult()
    qWarning() << "Invalid response received"; qWarning() << "Invalid response received";
    return; return;
    } }
    emit sigCommandResult(reply->response().result()); emit sigCommandResult(reply->response().toJsonValue());
    } }
    /// Get node logs. /// Get node logs.
    ...@@ -51,6 +54,7 @@ void DapCommandController::getHistory() ...@@ -51,6 +54,7 @@ void DapCommandController::getHistory()
    { {
    DapRpcServiceReply *reply = m_DAPRpcSocket->invokeRemoteMethod("RPCServer.getHistory"); DapRpcServiceReply *reply = m_DAPRpcSocket->invokeRemoteMethod("RPCServer.getHistory");
    connect(reply, SIGNAL(finished()), this, SLOT(processGetHistory())); connect(reply, SIGNAL(finished()), this, SLOT(processGetHistory()));
    } }
    void DapCommandController::setNewHistory(const QVariant& aData) void DapCommandController::setNewHistory(const QVariant& aData)
    ...@@ -92,8 +96,8 @@ void DapCommandController::processGetNodeLogs() ...@@ -92,8 +96,8 @@ void DapCommandController::processGetNodeLogs()
    qWarning() << "Invalid response received"; qWarning() << "Invalid response received";
    return; return;
    } }
    emit sigCommandResult(reply->response().result()); emit sigCommandResult(reply->response().toJsonValue());
    emit sigNodeLogsReceived(reply->response().result().toVariant().toStringList()); emit sigNodeLogsReceived(reply->response().toJsonValue().toVariant().toStringList());
    } }
    /// ///
    ...@@ -105,9 +109,9 @@ void DapCommandController::processAddWallet() ...@@ -105,9 +109,9 @@ void DapCommandController::processAddWallet()
    qWarning() << "Invalid response received"; qWarning() << "Invalid response received";
    return; return;
    } }
    emit sigCommandResult(reply->response().result()); emit sigCommandResult(reply->response().toJsonValue());
    auto name = reply->response().result().toVariant().toStringList().at(0); auto name = reply->response().toJsonValue().toVariant().toStringList().at(0);
    auto address = reply->response().result().toVariant().toStringList().at(1); auto address = reply->response().toJsonValue().toVariant().toStringList().at(1);
    emit sigWalletAdded(name, address); emit sigWalletAdded(name, address);
    } }
    ...@@ -120,8 +124,8 @@ void DapCommandController::processSendToken() ...@@ -120,8 +124,8 @@ void DapCommandController::processSendToken()
    return; return;
    } }
    qInfo() << reply->response(); qInfo() << reply->response();
    emit sigCommandResult(reply->response().result()); emit sigCommandResult(reply->response().toJsonValue());
    auto answer = reply->response().result().toVariant().toString(); auto answer = reply->response().toJsonValue().toVariant().toString();
    emit onTokenSended(answer); emit onTokenSended(answer);
    } }
    ...@@ -133,22 +137,22 @@ void DapCommandController::processGetWallets() ...@@ -133,22 +137,22 @@ void DapCommandController::processGetWallets()
    qWarning() << "Invalid response received"; qWarning() << "Invalid response received";
    return; return;
    } }
    emit sigCommandResult(reply->response().result()); emit sigCommandResult(reply->response().toJsonValue());
    emit sigWalletsReceived(reply->response().result().toVariant().toMap()); emit sigWalletsReceived(reply->response().toJsonValue().toVariant().toMap());
    } }
    void DapCommandController::processGetWalletInfo() void DapCommandController::processGetWalletInfo()
    { {
    qInfo() << "processGetWalletInfo()"; qInfo() << "processGetWalletInfo()";
    DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender()); DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender());
    if (!reply || reply->response().result().toVariant().toStringList().count() <= 0) { if (!reply || reply->response().toJsonValue().toVariant().toStringList().count() <= 0) {
    qWarning() << "Invalid response received"; qWarning() << "Invalid response received";
    return; return;
    } }
    emit sigCommandResult(reply->response().result()); emit sigCommandResult(reply->response().toJsonValue());
    QString name = reply->response().result().toVariant().toStringList().at(0); QString name = reply->response().toJsonValue().toVariant().toStringList().at(0);
    QString address = reply->response().result().toVariant().toStringList().at(1); QString address = reply->response().toJsonValue().toVariant().toStringList().at(1);
    QStringList temp = reply->response().result().toVariant().toStringList(); QStringList temp = reply->response().toJsonValue().toVariant().toStringList();
    QStringList tokens; QStringList tokens;
    QStringList balance; QStringList balance;
    for(int x{2}; x < temp.count(); x++) for(int x{2}; x < temp.count(); x++)
    ...@@ -171,49 +175,49 @@ void DapCommandController::processGetWalletInfo() ...@@ -171,49 +175,49 @@ void DapCommandController::processGetWalletInfo()
    void DapCommandController::processGetNodeNetwork() void DapCommandController::processGetNodeNetwork()
    { {
    DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender()); DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender());
    emit sendNodeNetwork(reply->response().result().toVariant()); emit sendNodeNetwork(reply->response().toJsonValue().toVariant());
    } }
    void DapCommandController::processGetNodeStatus() void DapCommandController::processGetNodeStatus()
    { {
    DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender()); DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender());
    emit sendNodeStatus(reply->response().result().toVariant()); emit sendNodeStatus(reply->response().toJsonValue().toVariant());
    } }
    void DapCommandController::processExecuteCommand() void DapCommandController::processExecuteCommand()
    { {
    qInfo() << "processGetWalletInfo()"; qInfo() << "processGetWalletInfo()";
    DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender()); DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender());
    if (!reply || reply->response().result().toVariant().toStringList().isEmpty()) { if (!reply || reply->response().toJsonValue().toVariant().toStringList().isEmpty()) {
    QString result = "Invalid response received"; QString result = "Invalid response received";
    qWarning() << result; qWarning() << result;
    emit executeCommandChanged(result); emit executeCommandChanged(result);
    return; return;
    } }
    emit sigCommandResult(reply->response().result()); emit sigCommandResult(reply->response().toJsonValue());
    QString result = reply->response().result().toVariant().toStringList().at(0); QString result = reply->response().toJsonValue().toVariant().toStringList().at(0);
    emit executeCommandChanged(result); emit executeCommandChanged(result);
    } }
    void DapCommandController::processGetHistory() void DapCommandController::processGetHistory()
    { {
    DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender()); DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender());
    QVariant result = reply->response().result().toArray().toVariantList(); QVariant result = reply->response().toJsonValue().toArray().toVariantList();
    emit sendHistory(result); emit sendHistory(result);
    } }
    void DapCommandController::processResponseConsole() void DapCommandController::processResponseConsole()
    { {
    DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender()); DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender());
    QString result = reply->response().result().toVariant().toString(); QString result = reply->response().toJsonValue().toVariant().toString();
    emit responseConsole(result); emit responseConsole(result);
    } }
    void DapCommandController::processGetCmdHistory() void DapCommandController::processGetCmdHistory()
    { {
    DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender()); DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender());
    QString result = reply->response().result().toVariant().toString(); QString result = reply->response().toJsonValue().toVariant().toString();
    emit sigCmdHistory(result); emit sigCmdHistory(result);
    } }
    ......
    DapRPCProtocol/DapRpcLocalServer.cpp
    + 1
    − 1
    View file @ fc093ee4
    ...@@ -21,7 +21,7 @@ DapRpcLocalServer::~DapRpcLocalServer() ...@@ -21,7 +21,7 @@ DapRpcLocalServer::~DapRpcLocalServer()
    bool DapRpcLocalServer::listen(const QString &asAddress, quint16 aPort) bool DapRpcLocalServer::listen(const QString &asAddress, quint16 aPort)
    { {
    Q_UNUSED(aPort); Q_UNUSED(aPort)
    return QLocalServer::listen(asAddress); return QLocalServer::listen(asAddress);
    } }
    ......
    DapRPCProtocol/DapRpcMessage.cpp
    + 20
    − 2
    View file @ fc093ee4
    ...@@ -204,6 +204,12 @@ DapRpcMessage DapRpcMessage::createRequest(const QString &asMethod, ...@@ -204,6 +204,12 @@ DapRpcMessage DapRpcMessage::createRequest(const QString &asMethod,
    return request; return request;
    } }
    DapRpcMessage DapRpcMessage::createRequest(const QString& asMethod, const QByteArray& aStream)
    {
    DapRpcMessage request = createRequest(asMethod, QJsonValue::fromVariant(aStream));
    return request;
    }
    DapRpcMessage DapRpcMessage::createNotification(const QString &asMethod, const QJsonArray &aParams) DapRpcMessage DapRpcMessage::createNotification(const QString &asMethod, const QJsonArray &aParams)
    { {
    DapRpcMessage notification = DapRpcMessagePrivate::createBasicRequest(asMethod, aParams); DapRpcMessage notification = DapRpcMessagePrivate::createBasicRequest(asMethod, aParams);
    ...@@ -227,6 +233,12 @@ DapRpcMessage DapRpcMessage::createNotification(const QString &asMethod, ...@@ -227,6 +233,12 @@ DapRpcMessage DapRpcMessage::createNotification(const QString &asMethod,
    return notification; return notification;
    } }
    DapRpcMessage DapRpcMessage::createNotification(const QString& asMethod, const QByteArray& aStream)
    {
    DapRpcMessage notification = createNotification(asMethod, QJsonValue::fromVariant(aStream));
    return notification;
    }
    DapRpcMessage DapRpcMessage::createResponse(const QJsonValue &aResult) const DapRpcMessage DapRpcMessage::createResponse(const QJsonValue &aResult) const
    { {
    DapRpcMessage response; DapRpcMessage response;
    ...@@ -293,7 +305,7 @@ QJsonValue DapRpcMessage::params() const ...@@ -293,7 +305,7 @@ QJsonValue DapRpcMessage::params() const
    return d->m_pObject->value(QLatin1String("params")); return d->m_pObject->value(QLatin1String("params"));
    } }
    QJsonValue DapRpcMessage::result() const QJsonValue DapRpcMessage::toJsonValue() const
    { {
    if (d->m_type != DapRpcMessage::Response || !d->m_pObject) if (d->m_type != DapRpcMessage::Response || !d->m_pObject)
    return QJsonValue(QJsonValue::Undefined); return QJsonValue(QJsonValue::Undefined);
    ...@@ -301,6 +313,12 @@ QJsonValue DapRpcMessage::result() const ...@@ -301,6 +313,12 @@ QJsonValue DapRpcMessage::result() const
    return d->m_pObject->value(QLatin1String("result")); return d->m_pObject->value(QLatin1String("result"));
    } }
    QByteArray DapRpcMessage::toByteArray() const
    {
    QJsonValue value = toJsonValue();
    return QByteArray::fromHex(value.toVariant().toByteArray());
    }
    int DapRpcMessage::errorCode() const int DapRpcMessage::errorCode() const
    { {
    if (d->m_type != DapRpcMessage::Error || !d->m_pObject) if (d->m_type != DapRpcMessage::Error || !d->m_pObject)
    ...@@ -362,7 +380,7 @@ QDebug operator<<(QDebug dbg, const DapRpcMessage &msg) ...@@ -362,7 +380,7 @@ QDebug operator<<(QDebug dbg, const DapRpcMessage &msg)
    dbg.nospace() << ", method=" << msg.method() dbg.nospace() << ", method=" << msg.method()
    << ", params=" << msg.params(); << ", params=" << msg.params();
    } else if (msg.type() == DapRpcMessage::Response) { } else if (msg.type() == DapRpcMessage::Response) {
    dbg.nospace() << ", result=" << msg.result(); dbg.nospace() << ", result=" << msg.toJsonValue();
    } else if (msg.type() == DapRpcMessage::Error) { } else if (msg.type() == DapRpcMessage::Error) {
    dbg.nospace() << ", code=" << msg.errorCode() dbg.nospace() << ", code=" << msg.errorCode()
    << ", message=" << msg.errorMessage() << ", message=" << msg.errorMessage()
    ......
    DapRPCProtocol/DapRpcMessage.h
    + 7
    − 7
    View file @ fc093ee4
    ...@@ -47,16 +47,15 @@ public: ...@@ -47,16 +47,15 @@ public:
    Error Error
    }; };
    static DapRpcMessage createRequest(const QString &asMethod, static DapRpcMessage createRequest(const QString &asMethod, const QJsonArray &aParams = QJsonArray());
    const QJsonArray &aParams = QJsonArray());
    static DapRpcMessage createRequest(const QString &asMethod, const QJsonValue &aParam); static DapRpcMessage createRequest(const QString &asMethod, const QJsonValue &aParam);
    static DapRpcMessage createRequest(const QString &asMethod, const QJsonObject &aNamedParameters); static DapRpcMessage createRequest(const QString &asMethod, const QJsonObject &aNamedParameters);
    static DapRpcMessage createRequest(const QString &asMethod, const QByteArray& aStream);
    static DapRpcMessage createNotification(const QString &asMethod, static DapRpcMessage createNotification(const QString &asMethod, const QJsonArray &aParams = QJsonArray());
    const QJsonArray &aParams = QJsonArray());
    static DapRpcMessage createNotification(const QString &asMethod, const QJsonValue &aParam); static DapRpcMessage createNotification(const QString &asMethod, const QJsonValue &aParam);
    static DapRpcMessage createNotification(const QString &asMethod, static DapRpcMessage createNotification(const QString &asMethod, const QJsonObject &aNamedParameters);
    const QJsonObject &aNamedParameters); static DapRpcMessage createNotification(const QString &asMethod, const QByteArray& aStream);
    DapRpcMessage createResponse(const QJsonValue &aResult) const; DapRpcMessage createResponse(const QJsonValue &aResult) const;
    DapRpcMessage createErrorResponse(DapErrorCode aCode, DapRpcMessage createErrorResponse(DapErrorCode aCode,
    ...@@ -72,7 +71,8 @@ public: ...@@ -72,7 +71,8 @@ public:
    QJsonValue params() const; QJsonValue params() const;
    // response // response
    QJsonValue result() const; QJsonValue toJsonValue() const;
    QByteArray toByteArray() const;
    // error // error
    int errorCode() const; int errorCode() const;
    ......
    DapRPCProtocol/DapRpcService.cpp
    + 5
    − 3
    View file @ fc093ee4
    ...@@ -100,12 +100,12 @@ int DapRpcService::convertVariantTypeToJSType(int aType) ...@@ -100,12 +100,12 @@ int DapRpcService::convertVariantTypeToJSType(int aType)
    return QJsonValue::Array; return QJsonValue::Array;
    case QMetaType::QVariantMap: case QMetaType::QVariantMap:
    return QJsonValue::Object; return QJsonValue::Object;
    case QMetaType::QByteArray:
    case QMetaType::QString: case QMetaType::QString:
    return QJsonValue::String; return QJsonValue::String;
    case QMetaType::Bool: case QMetaType::Bool:
    return QJsonValue::Bool; return QJsonValue::Bool;
    default: default: break;
    break;
    } }
    return QJsonValue::Undefined; return QJsonValue::Undefined;
    ...@@ -217,7 +217,7 @@ QJsonValue DapRpcService::convertReturnValue(QVariant &aReturnValue) ...@@ -217,7 +217,7 @@ QJsonValue DapRpcService::convertReturnValue(QVariant &aReturnValue)
    else if (static_cast<int>(aReturnValue.type()) == qMetaTypeId<QJsonArray>()) else if (static_cast<int>(aReturnValue.type()) == qMetaTypeId<QJsonArray>())
    return QJsonValue(aReturnValue.toJsonArray()); return QJsonValue(aReturnValue.toJsonArray());
    switch (aReturnValue.type()) { switch (static_cast<QMetaType::Type>(aReturnValue.type())) {
    case QMetaType::Bool: case QMetaType::Bool:
    case QMetaType::Int: case QMetaType::Int:
    case QMetaType::Double: case QMetaType::Double:
    ...@@ -229,6 +229,8 @@ QJsonValue DapRpcService::convertReturnValue(QVariant &aReturnValue) ...@@ -229,6 +229,8 @@ QJsonValue DapRpcService::convertReturnValue(QVariant &aReturnValue)
    case QMetaType::QVariantList: case QMetaType::QVariantList:
    case QMetaType::QVariantMap: case QMetaType::QVariantMap:
    return QJsonValue::fromVariant(aReturnValue); return QJsonValue::fromVariant(aReturnValue);
    case QMetaType::QByteArray:
    return QJsonValue::fromVariant(aReturnValue.toByteArray().toHex());
    default: default:
    // if a conversion operator was registered it will be used // if a conversion operator was registered it will be used
    if (aReturnValue.convert(QMetaType::QJsonValue)) if (aReturnValue.convert(QMetaType::QJsonValue))
    ......
    DapRPCProtocol/DapRpcServiceProvider.cpp
    + 1
    − 1
    View file @ fc093ee4
    ...@@ -89,5 +89,5 @@ void DapRpcServiceProvider::processMessage(DapRpcSocket *apSocket, const DapRpcM ...@@ -89,5 +89,5 @@ void DapRpcServiceProvider::processMessage(DapRpcSocket *apSocket, const DapRpcM
    apSocket->notify(error); apSocket->notify(error);
    break; break;
    } }
    }; }
    } }
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment