Fixes rebase problem

brave · Feb 21, 2019 · 5ff0738 · 5ff0738
1 parent bfb2488
commit 5ff0738
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/vendor/bat-native-ledger/src/bat_helper.cc b/vendor/bat-native-ledger/src/bat_helper.cc
@@ -1117,14 +1117,15 @@ bool GRANT_RESPONSE::loadFromJson(const std::string & json) {
 
   // On successful grant
   error = !(
-      d.HasMember("altcurrency") && d["altcurrency"].IsString() &&
-      d.HasMember("expiryTime") && d["expiryTime"].IsNumber() &&
-      d.HasMember("probi") && d["probi"].IsString());
+      d.HasMember("protocolVersion") && d["protocolVersion"].IsNumber() &&
+      d.HasMember("minimumReconcileTimestamp") &&
+      d["minimumReconcileTimestamp"].IsNumber() &&
+      d.HasMember("type") && d["type"].IsString());
 
   if (error == false) {
-    altcurrency = d["altcurrency"].GetString();
-    expiryTime = d["expiryTime"].GetUint64();
-    probi = d["probi"].GetString();
+    minimumReconcileTimestamp = d["minimumReconcileTimestamp"].GetUint64();
+    protocolVersion = d["protocolVersion"].GetUint64();
+    type = d["type"].GetString();
   }
 
   return !error;