status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed desktop api for using fleet 

Signed-off-by: Volodymyr Kozieiev <vkjr.sp@gmail.com>
This commit is contained in:
Volodymyr Kozieiev 2018-08-22 16:00:06 +03:00
parent aea94837e5
commit e89adfee55
No known key found for this signature in database
GPG Key ID: 1F706640AAF07516
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/react-native-status/desktop/CMakeLists.txt
View File

@ -37,7 +37,7 @@ ExternalProject_Add(StatusGo_ep
PREFIX ${StatusGo_PREFIX}
SOURCE_DIR ${StatusGo_SOURCE_DIR}
GIT_REPOSITORY https://github.com/status-im/status-go.git
GIT_TAG v0.11.0
GIT_TAG develop-g19b53030
BUILD_BYPRODUCTS ${StatusGo_STATIC_LIB}
CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${CONFIGURE_SCRIPT} ${GO_ROOT_PATH} ${StatusGo_ROOT} ${StatusGo_SOURCE_DIR}
BUILD_COMMAND ""

5
modules/react-native-status/desktop/rctstatus.cpp
View File

@ -71,7 +71,7 @@ void RCTStatus::getDeviceUUID(double callbackId) {
}
void RCTStatus::startNode(QString configString) {
void RCTStatus::startNode(QString configString, QString fleet) {
Q_D(RCTStatus);
qDebug() << "call of RCTStatus::startNode with param configString:" << configString;
@ -97,7 +97,7 @@ void RCTStatus::startNode(QString configString) {
qDebug()<<"RCTStatus::startNode networkDir: "<<networkDir;
char *configChars = GenerateConfig(networkDir.toUtf8().data(), networkId);
char *configChars = GenerateConfig(networkDir.toUtf8().data(), fleet.toUtf8().data(), networkId);
qDebug() << "RCTStatus::startNode GenerateConfig result: " << configChars;
jsonDoc = QJsonDocument::fromJson(QString(configChars).toUtf8(), &jsonError);
@ -110,6 +110,7 @@ void RCTStatus::startNode(QString configString) {
generatedConfig["KeyStoreDir"] = keyStoreDir;
generatedConfig["LogEnabled"] = true;
generatedConfig["LogFile"] = networkDir + "/geth.log";
generatedConfig["ClusterConfig.Fleet"] = fleet;
//generatedConfig["LogLevel"] = "DEBUG";
const char* result = StartNode(QString(QJsonDocument::fromVariant(generatedConfig).toJson(QJsonDocument::Compact)).toUtf8().data());

2
modules/react-native-status/desktop/rctstatus.h
View File

@ -32,7 +32,7 @@ public:
QList<ModuleMethod*> methodsToExport() override;
QVariantMap constantsToExport() override;
Q_INVOKABLE void startNode(QString configString);
Q_INVOKABLE void startNode(QString configString, QString fleet);
Q_INVOKABLE void stopNode();
Q_INVOKABLE void createAccount(QString password, double callbackId);
Q_INVOKABLE void notifyUsers(QString token, QString payloadJSON, QString tokensJSON, double callbackId);