Intermittent crash in Confirmations due to invalid wallet

brave · Apr 24, 2020 · a858e94 · a858e94
1 parent f8305a2
commit a858e94
Show file tree

Hide file tree

Showing 16 changed files with 596 additions and 483 deletions.
diff --git a/test/BUILD.gn b/test/BUILD.gn
@@ -372,11 +372,11 @@ test("brave_unit_tests") {
       "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/payments_unittest.cc",
       "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_create_confirmation_request_unittest.cc",
       "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_fetch_payment_token_request_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_get_signed_tokens_request_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/get_signed_tokens_request_unittest.cc",
       "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_redeem_payment_tokens_request_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_request_signed_tokens_request_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_security_helper_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_string_helper_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/request_signed_tokens_request_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/security_helper_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/string_helper_unittest.cc",
       "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_unblinded_tokens_unittest.cc",
       "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.cc",
       "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h",

diff --git a/vendor/bat-native-confirmations/src/bat/confirmations/internal/ads_rewards.cc b/vendor/bat-native-confirmations/src/bat/confirmations/internal/ads_rewards.cc
@@ -35,11 +35,6 @@ AdsRewards::~AdsRewards() = default;
 void AdsRewards::Update(
     const WalletInfo& wallet_info,
     const bool should_refresh) {
-  DCHECK(!wallet_info.payment_id.empty());
-  DCHECK(!wallet_info.private_key.empty());
-
-  wallet_info_ = WalletInfo(wallet_info);
-
   Update();
 
   if (!should_refresh) {
@@ -50,6 +45,12 @@ void AdsRewards::Update(
     return;
   }
 
+  wallet_info_ = wallet_info;
+  if (!wallet_info_.IsValid()) {
+    BLOG(ERROR) << "Failed to fetch ads rewards due to invalid wallet";
+    return;
+  }
+
   BLOG(INFO) << "Fetch ads rewards";
   GetPaymentBalance();
 }

diff --git a/...ns/src/bat/confirmations/internal/confirmations_request_signed_tokens_request_unittest.cc b/...ns/src/bat/confirmations/internal/confirmations_request_signed_tokens_request_unittest.cc