DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge UI elements for migration

Browse Source
This commit is contained in:
Aditya Kulkarni
2018-10-26 11:58:51 -07:00
parent 7f6c0db7d7
commit 8094a4dcc8
8 changed files with 157 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/turnstile.cpp
View File

@@ -37,6 +37,10 @@ QString Turnstile::writeableFile() {
}
}
void Turnstile::removeFile() {
QFile(writeableFile()).remove();
}
// Data stream write/read methods for migration items
QDataStream &operator<<(QDataStream& ds, const TurnstileMigrationItem& item) {
return ds << QString("v1") << item.fromAddr << item.intTAddr
@@ -210,7 +214,7 @@ Turnstile::getNextStep(QList<TurnstileMigrationItem>& plan) {
return nextStep;
}
bool Turnstile::isMigrationActive() {
bool Turnstile::isMigrationPresent() {
auto plan = readMigrationPlan();
if (plan.isEmpty()) return false;
@@ -222,7 +226,11 @@ ProgressReport Turnstile::getPlanProgress() {
auto nextStep = getNextStep(plan);
auto step = std::distance(plan.begin(), nextStep);
auto step = std::distance(plan.begin(), nextStep) * 2; // 2 steps per item
if (nextStep != plan.end() &&
nextStep->status == TurnstileMigrationItemStatus::SentToT)
step++;
auto total = plan.size();
auto nextBlock = nextStep == plan.end() ? 0 : nextStep->blockNumber;
@@ -232,7 +240,7 @@ ProgressReport Turnstile::getPlanProgress() {
i.status == TurnstileMigrationItemStatus::UnknownError;
}) != plan.end();
return ProgressReport{(int)step*2, total*2, nextBlock, hasErrors};
return ProgressReport{(int)step, total*2, nextBlock, hasErrors};
}
void Turnstile::executeMigrationStep() {