From 2f852e3c6d082b20f9368761bf55578176f293ef Mon Sep 17 00:00:00 2001 From: zenparsing Date: Fri, 30 Jun 2023 10:28:42 -0400 Subject: [PATCH] Replace ledger terminology in Rewards code --- .github/CODEOWNERS | 2 +- PRESUBMIT.py | 2 +- .../browser/BraveRewardsNativeWorker.java | 6 +- .../browser/rewards/BraveRewardsPanel.java | 6 +- app/brave_generated_resources.grd | 4 +- .../android/brave_rewards_native_worker.h | 2 +- .../extension_rewards_service_observer.cc | 2 +- browser/extensions/api/brave_rewards_api.cc | 10 +- browser/extensions/api/brave_rewards_api.h | 2 +- browser/greaselion/greaselion_browsertest.cc | 2 +- .../ui/brave_rewards/tip_panel_coordinator.h | 2 +- browser/ui/webui/brave_rewards_page_ui.cc | 2 +- build/android/config.gni | 4 +- chromium_presubmit_config.json5 | 21 +- common/extensions/api/brave_rewards.json | 2 +- .../brave_ads/browser/ads_service_impl.cc | 2 +- .../brave_ads/browser/ads_service_impl.h | 2 +- components/brave_rewards/browser/BUILD.gn | 2 +- components/brave_rewards/browser/CHANGELOG.md | 16 +- .../brave_rewards/browser/android_util.h | 2 +- .../browser/rewards_notification_service.h | 2 +- .../rewards_notification_service_impl.cc | 7 +- .../brave_rewards/browser/rewards_service.h | 2 +- .../browser/rewards_service_impl.cc | 344 ++++++----- .../browser/rewards_service_impl.h | 53 +- .../browser/service_sandbox_type.h | 4 +- .../rewards_browsertest_contribution.cc | 8 +- .../common/rewards_browsertest_contribution.h | 4 +- .../common/rewards_browsertest_promotion.cc | 4 +- .../test/common/rewards_browsertest_util.cc | 13 +- .../test/common/rewards_browsertest_util.h | 4 +- .../browser/test/rewards_browsertest.cc | 2 +- .../test/rewards_contribution_browsertest.cc | 24 +- .../browser/test/rewards_flag_browsertest.cc | 2 +- .../test/rewards_notification_browsertest.cc | 2 +- .../browser/test/rewards_p3a_browsertest.cc | 4 +- .../test/rewards_promotion_browsertest.cc | 2 +- .../test/rewards_publisher_browsertest.cc | 2 +- .../browser/test/rewards_state_browsertest.cc | 8 +- .../brave_rewards/common/mojom/BUILD.gn | 26 +- .../mojom/{ledger.mojom => rewards.mojom} | 7 +- ..._database.mojom => rewards_database.mojom} | 0 ...ndpoints.mojom => rewards_endpoints.mojom} | 0 ...{bat_ledger.mojom => rewards_engine.mojom} | 80 +-- ...ledger_types.mojom => rewards_types.mojom} | 0 ...raits.cc => rewards_types_mojom_traits.cc} | 4 +- ..._traits.h => rewards_types_mojom_traits.h} | 10 +- .../common/mojom/tip_panel.mojom | 4 +- components/brave_rewards/common/pref_names.h | 2 +- components/brave_rewards/core/BUILD.gn | 18 +- components/brave_rewards/core/api/api.cc | 2 +- components/brave_rewards/core/api/api.h | 6 +- .../brave_rewards/core/api/api_parameters.cc | 10 +- .../brave_rewards/core/api/api_parameters.h | 8 +- .../core/attestation/attestation.cc | 4 +- .../core/attestation/attestation.h | 8 +- .../core/attestation/attestation_androidx.cc | 16 +- .../core/attestation/attestation_androidx.h | 4 +- .../core/attestation/attestation_desktop.cc | 32 +- .../core/attestation/attestation_desktop.h | 4 +- .../core/attestation/attestation_impl.cc | 11 +- .../core/attestation/attestation_impl.h | 4 +- .../core/attestation/attestation_iosx.cc | 34 +- .../core/attestation/attestation_iosx.h | 4 +- .../brave_rewards/core/bitflyer/bitflyer.cc | 42 +- .../brave_rewards/core/bitflyer/bitflyer.h | 8 +- .../core/bitflyer/bitflyer_util.cc | 2 +- .../core/bitflyer/bitflyer_util.h | 2 +- .../core/bitflyer/bitflyer_util_unittest.cc | 18 +- .../core/common/brotli_util_unittest.cc | 8 +- .../brave_rewards/core/common/random_util.cc | 2 +- .../brave_rewards/core/common/request_util.cc | 2 +- .../core/contribution/contribution.cc | 96 +-- .../core/contribution/contribution.h | 8 +- .../core/contribution/contribution_ac.cc | 24 +- .../core/contribution/contribution_ac.h | 8 +- .../contribution_external_wallet.cc | 37 +- .../contribution_external_wallet.h | 8 +- .../core/contribution/contribution_monthly.cc | 18 +- .../core/contribution/contribution_monthly.h | 8 +- .../core/contribution/contribution_sku.cc | 46 +- .../core/contribution/contribution_sku.h | 8 +- .../core/contribution/contribution_tip.cc | 12 +- .../core/contribution/contribution_tip.h | 8 +- .../contribution/contribution_unblinded.cc | 60 +- .../contribution/contribution_unblinded.h | 8 +- .../contribution_unblinded_unittest.cc | 10 +- .../core/credentials/credentials_common.cc | 21 +- .../core/credentials/credentials_common.h | 8 +- .../core/credentials/credentials_promotion.cc | 105 ++-- .../core/credentials/credentials_promotion.h | 4 +- .../core/credentials/credentials_redeem.h | 2 +- .../core/credentials/credentials_sku.cc | 62 +- .../core/credentials/credentials_sku.h | 4 +- .../core/credentials/credentials_trigger.h | 2 +- .../core/credentials/credentials_util.cc | 2 +- .../credentials/credentials_util_unittest.cc | 2 +- .../brave_rewards/core/database/database.cc | 44 +- .../brave_rewards/core/database/database.h | 8 +- .../core/database/database_activity_info.cc | 34 +- .../core/database/database_activity_info.h | 2 +- .../database_activity_info_unittest.cc | 24 +- .../core/database/database_balance_report.cc | 32 +- .../core/database/database_balance_report.h | 2 +- .../database_balance_report_info_unittest.cc | 16 +- .../database/database_contribution_info.cc | 30 +- .../database/database_contribution_info.h | 2 +- .../database_contribution_info_publishers.cc | 14 +- .../database_contribution_info_publishers.h | 2 +- .../database/database_contribution_queue.cc | 22 +- .../database/database_contribution_queue.h | 2 +- .../database_contribution_queue_publishers.cc | 12 +- .../database_contribution_queue_publishers.h | 2 +- .../core/database/database_creds_batch.cc | 28 +- .../core/database/database_creds_batch.h | 2 +- .../core/database/database_event_log.cc | 12 +- .../core/database/database_event_log.h | 2 +- .../database_external_transactions.cc | 17 +- .../database/database_external_transactions.h | 2 +- .../core/database/database_initialize.cc | 8 +- .../core/database/database_initialize.h | 8 +- .../database/database_media_publisher_info.cc | 19 +- .../database/database_media_publisher_info.h | 2 +- .../core/database/database_migration.cc | 17 +- .../core/database/database_migration.h | 8 +- .../database/database_migration_unittest.cc | 148 ++--- .../core/database/database_mock.cc | 2 +- .../core/database/database_mock.h | 4 +- .../core/database/database_multi_tables.cc | 8 +- .../core/database/database_multi_tables.h | 8 +- .../core/database/database_promotion.cc | 36 +- .../core/database/database_promotion.h | 2 +- .../core/database/database_publisher_info.cc | 34 +- .../core/database/database_publisher_info.h | 2 +- .../database_publisher_prefix_list.cc | 19 +- .../database/database_publisher_prefix_list.h | 2 +- ...database_publisher_prefix_list_unittest.cc | 10 +- .../core/database/database_recurring_tip.cc | 26 +- .../core/database/database_recurring_tip.h | 2 +- .../database_server_publisher_banner.cc | 9 +- .../database_server_publisher_banner.h | 2 +- .../database_server_publisher_info.cc | 21 +- .../database/database_server_publisher_info.h | 2 +- .../database_server_publisher_links.cc | 9 +- .../database_server_publisher_links.h | 2 +- .../core/database/database_sku_order.cc | 22 +- .../core/database/database_sku_order.h | 2 +- .../core/database/database_sku_order_items.cc | 8 +- .../core/database/database_sku_order_items.h | 2 +- .../core/database/database_sku_transaction.cc | 16 +- .../core/database/database_sku_transaction.h | 2 +- .../core/database/database_table.cc | 4 +- .../core/database/database_table.h | 8 +- .../core/database/database_unblinded_token.cc | 34 +- .../core/database/database_unblinded_token.h | 2 +- .../core/database/database_util.cc | 4 +- .../core/database/database_util.h | 2 +- .../core/endpoint/api/api_util.cc | 2 +- .../core/endpoint/api/api_util_unittest.cc | 2 +- .../core/endpoint/bitflyer/bitflyer_server.cc | 6 +- .../core/endpoint/bitflyer/bitflyer_server.h | 6 +- .../get_balance/get_balance_bitflyer.cc | 22 +- .../get_balance/get_balance_bitflyer.h | 8 +- .../get_balance_bitflyer_unittest.cc | 20 +- .../post_oauth/post_oauth_bitflyer.cc | 22 +- .../bitflyer/post_oauth/post_oauth_bitflyer.h | 8 +- .../post_oauth_bitflyer_unittest.cc | 23 +- .../core/endpoint/gemini/gemini_server.cc | 12 +- .../core/endpoint/gemini/gemini_server.h | 6 +- .../post_account/post_account_gemini.cc | 22 +- .../gemini/post_account/post_account_gemini.h | 8 +- .../post_account_gemini_unittest.cc | 24 +- .../post_balance/post_balance_gemini.cc | 18 +- .../gemini/post_balance/post_balance_gemini.h | 8 +- .../post_balance_gemini_unittest.cc | 24 +- .../gemini/post_oauth/post_oauth_gemini.cc | 14 +- .../gemini/post_oauth/post_oauth_gemini.h | 8 +- .../post_oauth/post_oauth_gemini_unittest.cc | 26 +- .../post_recipient_id_gemini.cc | 16 +- .../post_recipient_id_gemini.h | 8 +- .../post_recipient_id_gemini_unittest.cc | 27 +- .../get_credentials/get_credentials.cc | 12 +- .../payment/get_credentials/get_credentials.h | 8 +- .../get_credentials_unittest.cc | 24 +- .../core/endpoint/payment/payment_server.cc | 16 +- .../core/endpoint/payment/payment_server.h | 6 +- .../core/endpoint/payment/payment_util.cc | 2 +- .../endpoint/payment/payment_util_unittest.cc | 2 +- .../post_credentials/post_credentials.cc | 16 +- .../post_credentials/post_credentials.h | 8 +- .../post_credentials_unittest.cc | 30 +- .../endpoint/payment/post_order/post_order.cc | 22 +- .../endpoint/payment/post_order/post_order.h | 8 +- .../payment/post_order/post_order_unittest.cc | 22 +- .../post_transaction_sku_gemini.cc | 22 +- .../post_transaction_sku_gemini.h | 8 +- .../post_transaction_sku_gemini_unittest.cc | 32 +- .../post_transaction_uphold.cc | 18 +- .../post_transaction_uphold.h | 8 +- .../post_transaction_uphold_unittest.cc | 32 +- .../endpoint/payment/post_votes/post_votes.cc | 10 +- .../endpoint/payment/post_votes/post_votes.h | 8 +- .../payment/post_votes/post_votes_unittest.cc | 22 +- .../get_publisher/get_publisher.cc | 36 +- .../private_cdn/get_publisher/get_publisher.h | 8 +- .../get_publisher/get_publisher_unittest.cc | 12 +- .../private_cdn/private_cdn_server.cc | 6 +- .../endpoint/private_cdn/private_cdn_server.h | 6 +- .../endpoint/private_cdn/private_cdn_util.cc | 2 +- .../private_cdn/private_cdn_util_unittest.cc | 2 +- .../promotion/get_available/get_available.cc | 24 +- .../promotion/get_available/get_available.h | 8 +- .../get_available/get_available_unittest.cc | 30 +- .../promotion/get_captcha/get_captcha.cc | 18 +- .../promotion/get_captcha/get_captcha.h | 8 +- .../get_captcha/get_captcha_unittest.cc | 28 +- .../get_signed_creds/get_signed_creds.cc | 26 +- .../get_signed_creds/get_signed_creds.h | 8 +- .../get_signed_creds_unittest.cc | 30 +- .../promotion/get_wallet/get_wallet.cc | 24 +- .../promotion/get_wallet/get_wallet.h | 8 +- .../get_wallet/get_wallet_unittest.cc | 20 +- .../promotion/post_bat_loss/post_bat_loss.cc | 18 +- .../promotion/post_bat_loss/post_bat_loss.h | 8 +- .../post_bat_loss/post_bat_loss_unittest.cc | 24 +- .../promotion/post_captcha/post_captcha.cc | 24 +- .../promotion/post_captcha/post_captcha.h | 8 +- .../post_captcha/post_captcha_unittest.cc | 22 +- .../post_clobbered_claims.cc | 16 +- .../post_clobbered_claims.h | 8 +- .../post_clobbered_claims_unittest.cc | 26 +- .../promotion/post_creds/post_creds.cc | 32 +- .../promotion/post_creds/post_creds.h | 8 +- .../post_creds/post_creds_unittest.cc | 40 +- .../post_devicecheck/post_devicecheck.cc | 24 +- .../post_devicecheck/post_devicecheck.h | 8 +- .../post_devicecheck_unittest.cc | 28 +- .../post_safetynet/post_safetynet.cc | 24 +- .../promotion/post_safetynet/post_safetynet.h | 8 +- .../post_safetynet/post_safetynet_unittest.cc | 24 +- .../post_suggestions/post_suggestions.cc | 12 +- .../post_suggestions/post_suggestions.h | 8 +- .../post_suggestions_unittest.cc | 22 +- .../post_suggestions_claim.cc | 26 +- .../post_suggestions_claim.h | 8 +- .../post_suggestions_claim_unittest.cc | 30 +- .../endpoint/promotion/promotion_server.cc | 34 +- .../endpoint/promotion/promotion_server.h | 6 +- .../endpoint/promotion/promotions_util.cc | 2 +- .../promotion/promotions_util_unittest.cc | 2 +- .../promotion/put_captcha/put_captcha.cc | 12 +- .../promotion/put_captcha/put_captcha.h | 8 +- .../put_captcha/put_captcha_unittest.cc | 26 +- .../put_devicecheck/put_devicecheck.cc | 12 +- .../put_devicecheck/put_devicecheck.h | 8 +- .../put_devicecheck_unittest.cc | 22 +- .../promotion/put_safetynet/put_safetynet.cc | 12 +- .../promotion/put_safetynet/put_safetynet.h | 8 +- .../put_safetynet/put_safetynet_unittest.cc | 22 +- .../get_prefix_list/get_prefix_list.cc | 16 +- .../rewards/get_prefix_list/get_prefix_list.h | 8 +- .../get_prefix_list_unittest.cc | 22 +- .../core/endpoint/rewards/rewards_server.cc | 5 +- .../core/endpoint/rewards/rewards_server.h | 6 +- .../core/endpoint/rewards/rewards_util.cc | 2 +- .../endpoint/rewards/rewards_util_unittest.cc | 2 +- .../get_capabilities/get_capabilities.cc | 11 +- .../get_capabilities/get_capabilities.h | 8 +- .../get_capabilities_unittest.cc | 44 +- .../core/endpoint/uphold/get_card/get_card.cc | 18 +- .../core/endpoint/uphold/get_card/get_card.h | 8 +- .../uphold/get_card/get_card_unittest.cc | 20 +- .../endpoint/uphold/get_cards/get_cards.cc | 18 +- .../endpoint/uphold/get_cards/get_cards.h | 8 +- .../uphold/get_cards/get_cards_unittest.cc | 26 +- .../core/endpoint/uphold/get_me/get_me.cc | 16 +- .../core/endpoint/uphold/get_me/get_me.h | 8 +- .../endpoint/uphold/get_me/get_me_unittest.cc | 20 +- .../endpoint/uphold/patch_card/patch_card.cc | 10 +- .../endpoint/uphold/patch_card/patch_card.h | 8 +- .../uphold/patch_card/patch_card_unittest.cc | 20 +- .../endpoint/uphold/post_cards/post_cards.cc | 18 +- .../endpoint/uphold/post_cards/post_cards.h | 8 +- .../uphold/post_cards/post_cards_unittest.cc | 21 +- .../core/endpoint/uphold/uphold_server.cc | 16 +- .../core/endpoint/uphold/uphold_server.h | 6 +- .../post_commit_transaction_bitflyer.cc | 2 +- .../post_commit_transaction_bitflyer.h | 2 +- ...st_commit_transaction_bitflyer_unittest.cc | 10 +- .../get_recipient_id_gemini.cc | 6 +- .../get_recipient_id_gemini.h | 6 +- .../get_recipient_id_gemini_unittest.cc | 10 +- .../post_commit_transaction_gemini.cc | 2 +- .../post_commit_transaction_gemini.h | 2 +- ...post_commit_transaction_gemini_unittest.cc | 10 +- .../get_parameters/get_parameters.cc | 5 +- .../endpoints/get_parameters/get_parameters.h | 8 +- .../get_parameters/get_parameters_unittest.cc | 10 +- .../get_parameters/get_parameters_utils.cc | 2 +- .../get_parameters/get_parameters_utils.h | 2 +- .../get_transaction_status.cc | 4 +- .../get_transaction_status.h | 4 +- .../endpoints/patch_wallets/patch_wallets.cc | 10 +- .../endpoints/patch_wallets/patch_wallets.h | 6 +- .../patch_wallets/patch_wallets_unittest.cc | 12 +- .../post_commit_transaction.cc | 4 +- .../post_commit_transaction.h | 4 +- .../bitflyer/post_connect_bitflyer.cc | 4 +- .../bitflyer/post_connect_bitflyer.h | 4 +- .../gemini/post_connect_gemini.cc | 4 +- .../post_connect/gemini/post_connect_gemini.h | 4 +- .../endpoints/post_connect/post_connect.cc | 8 +- .../endpoints/post_connect/post_connect.h | 8 +- .../post_connect/post_connect_unittest.cc | 14 +- .../uphold/post_connect_uphold.cc | 9 +- .../post_connect/uphold/post_connect_uphold.h | 4 +- .../post_create_transaction.cc | 4 +- .../post_create_transaction.h | 4 +- .../endpoints/post_wallets/post_wallets.cc | 8 +- .../endpoints/post_wallets/post_wallets.h | 7 +- .../post_wallets/post_wallets_unittest.cc | 12 +- .../core/endpoints/request_builder.cc | 2 +- .../core/endpoints/request_builder.h | 6 +- .../core/endpoints/request_for.h | 12 +- .../get_transaction_status_uphold.h | 2 +- .../get_transaction_status_uphold_unittest.cc | 10 +- .../post_commit_transaction_uphold.cc | 2 +- .../post_commit_transaction_uphold.h | 2 +- ...post_commit_transaction_uphold_unittest.cc | 10 +- .../post_create_transaction_uphold.cc | 2 +- .../post_create_transaction_uphold.h | 2 +- ...post_create_transaction_uphold_unittest.cc | 10 +- .../uphold/post_oauth/post_oauth_uphold.cc | 6 +- .../uphold/post_oauth/post_oauth_uphold.h | 6 +- .../post_oauth/post_oauth_uphold_unittest.cc | 10 +- .../brave_rewards/core/gemini/gemini.cc | 42 +- components/brave_rewards/core/gemini/gemini.h | 8 +- .../brave_rewards/core/gemini/gemini_util.cc | 6 +- .../brave_rewards/core/gemini/gemini_util.h | 4 +- .../core/gemini/gemini_util_unittest.cc | 23 +- .../brave_rewards/core/ledger_impl_mock.cc | 41 -- .../brave_rewards/core/ledger_impl_mock.h | 48 -- .../brave_rewards/core/legacy/bat_helper.cc | 2 +- .../brave_rewards/core/legacy/bat_state.cc | 12 +- .../brave_rewards/core/legacy/bat_state.h | 8 +- .../brave_rewards/core/legacy/media/github.cc | 36 +- .../brave_rewards/core/legacy/media/github.h | 8 +- .../core/legacy/media/github_unittest.cc | 2 +- .../core/legacy/media/helper_unittest.cc | 2 +- .../brave_rewards/core/legacy/media/media.cc | 8 +- .../brave_rewards/core/legacy/media/media.h | 8 +- .../core/legacy/media/youtube.cc | 39 +- .../brave_rewards/core/legacy/media/youtube.h | 8 +- .../core/legacy/media/youtube_unittest.cc | 2 +- .../core/legacy/publisher_state.cc | 14 +- .../core/legacy/publisher_state.h | 8 +- .../core/logging/event_log_util.h | 2 +- .../brave_rewards/core/logging/logging.cc | 10 +- .../brave_rewards/core/logging/logging.h | 8 +- components/brave_rewards/core/mojom_structs.h | 4 +- .../brave_rewards/core/promotion/promotion.cc | 130 ++-- .../brave_rewards/core/promotion/promotion.h | 8 +- .../core/promotion/promotion_transfer.cc | 14 +- .../core/promotion/promotion_transfer.h | 8 +- .../core/promotion/promotion_unittest.cc | 22 +- .../brave_rewards/core/publisher/publisher.cc | 124 ++-- .../brave_rewards/core/publisher/publisher.h | 8 +- .../publisher_prefix_list_updater.cc | 17 +- .../publisher/publisher_prefix_list_updater.h | 8 +- .../core/publisher/publisher_status_helper.cc | 22 +- .../core/publisher/publisher_status_helper.h | 6 +- .../core/publisher/publisher_unittest.cc | 18 +- .../publisher/server_publisher_fetcher.cc | 16 +- .../core/publisher/server_publisher_fetcher.h | 8 +- .../brave_rewards/core/recovery/recovery.cc | 8 +- .../brave_rewards/core/recovery/recovery.h | 6 +- .../core/recovery/recovery_empty_balance.cc | 28 +- .../core/recovery/recovery_empty_balance.h | 6 +- .../brave_rewards/core/report/report.cc | 20 +- components/brave_rewards/core/report/report.h | 6 +- ...ledger_callbacks.h => rewards_callbacks.h} | 30 +- ...ledger_database.cc => rewards_database.cc} | 22 +- .../{ledger_database.h => rewards_database.h} | 18 +- ..._mock.cc => rewards_engine_client_mock.cc} | 26 +- ...nt_mock.h => rewards_engine_client_mock.h} | 20 +- ...{ledger_impl.cc => rewards_engine_impl.cc} | 319 +++++----- .../{ledger_impl.h => rewards_engine_impl.h} | 102 ++-- .../core/rewards_engine_impl_mock.cc | 40 ++ .../core/rewards_engine_impl_mock.h | 49 ++ components/brave_rewards/core/sku/sku.cc | 28 +- components/brave_rewards/core/sku/sku.h | 8 +- .../brave_rewards/core/sku/sku_common.cc | 20 +- .../brave_rewards/core/sku/sku_common.h | 8 +- .../brave_rewards/core/sku/sku_order.cc | 18 +- components/brave_rewards/core/sku/sku_order.h | 8 +- .../brave_rewards/core/sku/sku_transaction.cc | 40 +- .../brave_rewards/core/sku/sku_transaction.h | 8 +- components/brave_rewards/core/sku/sku_util.cc | 2 +- components/brave_rewards/core/state/state.cc | 144 ++--- components/brave_rewards/core/state/state.h | 6 +- .../core/state/state_migration.cc | 46 +- .../core/state/state_migration.h | 8 +- .../core/state/state_migration_v1.cc | 33 +- .../core/state/state_migration_v1.h | 8 +- .../core/state/state_migration_v10.cc | 33 +- .../core/state/state_migration_v10.h | 8 +- .../core/state/state_migration_v11.cc | 11 +- .../core/state/state_migration_v11.h | 8 +- .../core/state/state_migration_v12.cc | 13 +- .../core/state/state_migration_v12.h | 8 +- .../core/state/state_migration_v13.cc | 13 +- .../core/state/state_migration_v13.h | 8 +- .../core/state/state_migration_v2.cc | 41 +- .../core/state/state_migration_v2.h | 8 +- .../core/state/state_migration_v3.cc | 2 +- .../core/state/state_migration_v3.h | 2 +- .../core/state/state_migration_v4.cc | 7 +- .../core/state/state_migration_v4.h | 8 +- .../core/state/state_migration_v5.cc | 21 +- .../core/state/state_migration_v5.h | 8 +- .../core/state/state_migration_v6.cc | 19 +- .../core/state/state_migration_v6.h | 8 +- .../core/state/state_migration_v7.cc | 19 +- .../core/state/state_migration_v7.h | 8 +- .../core/state/state_migration_v8.cc | 11 +- .../core/state/state_migration_v8.h | 8 +- .../core/state/state_migration_v9.cc | 2 +- .../core/state/state_migration_v9.h | 2 +- components/brave_rewards/core/test/BUILD.gn | 18 +- .../core/test/bat_ledger_test.cc | 33 -- .../brave_rewards/core/test/bat_ledger_test.h | 56 -- .../core/test/rewards_engine_test.cc | 34 ++ .../core/test/rewards_engine_test.h | 57 ++ ...lient.cc => test_rewards_engine_client.cc} | 189 +++--- ..._client.h => test_rewards_engine_client.h} | 28 +- ...=> test_rewards_engine_client_unittest.cc} | 12 +- .../brave_rewards/core/uphold/uphold.cc | 46 +- components/brave_rewards/core/uphold/uphold.h | 8 +- .../brave_rewards/core/uphold/uphold_card.cc | 14 +- .../brave_rewards/core/uphold/uphold_card.h | 6 +- .../brave_rewards/core/uphold/uphold_util.cc | 2 +- .../brave_rewards/core/uphold/uphold_util.h | 2 +- .../core/uphold/uphold_util_unittest.cc | 18 +- .../brave_rewards/core/wallet/wallet.cc | 20 +- components/brave_rewards/core/wallet/wallet.h | 8 +- .../core/wallet/wallet_balance.cc | 20 +- .../core/wallet/wallet_balance.h | 8 +- .../core/wallet/wallet_create.cc | 26 +- .../brave_rewards/core/wallet/wallet_create.h | 8 +- .../core/wallet/wallet_unittest.cc | 34 +- .../brave_rewards/core/wallet/wallet_util.cc | 56 +- .../brave_rewards/core/wallet/wallet_util.h | 20 +- .../core/wallet/wallet_utils_unittest.cc | 18 +- .../bitflyer/bitflyer_transfer.cc | 20 +- .../bitflyer/connect_bitflyer_wallet.cc | 14 +- .../bitflyer/connect_bitflyer_wallet.h | 6 +- .../bitflyer/get_bitflyer_wallet.cc | 4 +- .../bitflyer/get_bitflyer_wallet.h | 4 +- .../connect_external_wallet.cc | 26 +- .../wallet_provider/connect_external_wallet.h | 8 +- .../connect_external_wallet_unittest.cc | 19 +- .../gemini/connect_gemini_wallet.cc | 30 +- .../gemini/connect_gemini_wallet.h | 6 +- .../wallet_provider/gemini/gemini_transfer.cc | 20 +- .../gemini/get_gemini_wallet.cc | 4 +- .../gemini/get_gemini_wallet.h | 4 +- .../wallet_provider/get_external_wallet.cc | 13 +- .../wallet_provider/get_external_wallet.h | 8 +- .../core/wallet_provider/transfer.cc | 10 +- .../core/wallet_provider/transfer.h | 8 +- .../uphold/connect_uphold_wallet.cc | 54 +- .../uphold/connect_uphold_wallet.h | 4 +- .../uphold/get_uphold_wallet.cc | 4 +- .../uphold/get_uphold_wallet.h | 4 +- .../wallet_provider/uphold/uphold_transfer.cc | 40 +- .../resources/internals/BUILD.gn | 2 +- .../brave_rewards/resources/page/BUILD.gn | 2 +- .../brave_rewards/resources/page/lib/types.ts | 9 +- .../resources/rewards_panel/BUILD.gn | 2 +- .../rewards_panel/lib/notification_adapter.ts | 4 +- .../resources/shared/lib/mojom.ts | 2 +- .../resources/tip_panel/lib/webui_model.ts | 4 +- .../common/async/brave_rewards_api_proxy.ts | 2 +- components/definitions/newTab.d.ts | 7 +- components/definitions/rewardsExtensions.d.ts | 9 +- components/definitions/rewardsInternals.d.ts | 6 +- .../services/bat_ledger/ledger_factory_impl.h | 41 -- .../{bat_ledger => bat_rewards}/BUILD.gn | 4 +- .../public/interfaces/BUILD.gn | 2 +- .../interfaces/rewards_engine_factory.mojom} | 16 +- .../rewards_engine_factory.cc} | 30 +- .../bat_rewards/rewards_engine_factory.h | 41 ++ .../reducers/new_tab_reducer_test.ts | 2 +- ios/BUILD.gn | 6 +- ios/app/BUILD.gn | 2 +- .../api/{ledger => brave_rewards}/BUILD.gn | 40 +- .../api/{ledger => brave_rewards}/DEPS | 0 .../brave_rewards_api.h} | 60 +- .../brave_rewards_api.mm} | 557 +++++++++--------- ios/browser/api/brave_rewards/headers.gni | 18 + .../promotion_solution.h | 12 +- .../promotion_solution.mm | 6 +- .../api/brave_rewards/rewards_client_bridge.h | 166 ++++++ .../rewards_client_ios.h} | 28 +- .../api/brave_rewards/rewards_client_ios.mm | 201 +++++++ .../rewards_notification.h | 12 +- .../rewards_notification.m | 4 +- .../rewards_observer.h} | 26 +- .../api/brave_rewards/rewards_observer.mm | 26 + .../api/ledger/brave_ledger_observer.mm | 26 - ios/browser/api/ledger/headers.gni | 18 - ios/browser/api/ledger/ledger_client_bridge.h | 150 ----- ios/browser/api/ledger/ledger_client_ios.mm | 201 ------- utility/brave_content_utility_client.cc | 13 +- utility/importer/sources.gni | 2 +- utility/sources.gni | 4 +- 516 files changed, 4826 insertions(+), 4755 deletions(-) rename components/brave_rewards/common/mojom/{ledger.mojom => rewards.mojom} (99%) rename components/brave_rewards/common/mojom/{ledger_database.mojom => rewards_database.mojom} (100%) rename components/brave_rewards/common/mojom/{ledger_endpoints.mojom => rewards_endpoints.mojom} (100%) rename components/brave_rewards/common/mojom/{bat_ledger.mojom => rewards_engine.mojom} (74%) rename components/brave_rewards/common/mojom/{ledger_types.mojom => rewards_types.mojom} (100%) rename components/brave_rewards/common/mojom/{ledger_types_mojom_traits.cc => rewards_types_mojom_traits.cc} (98%) rename components/brave_rewards/common/mojom/{ledger_types_mojom_traits.h => rewards_types_mojom_traits.h} (89%) delete mode 100644 components/brave_rewards/core/ledger_impl_mock.cc delete mode 100644 components/brave_rewards/core/ledger_impl_mock.h rename components/brave_rewards/core/{ledger_callbacks.h => rewards_callbacks.h} (77%) rename components/brave_rewards/core/{ledger_database.cc => rewards_database.cc} (93%) rename components/brave_rewards/core/{ledger_database.h => rewards_database.h} (76%) rename components/brave_rewards/core/{ledger_client_mock.cc => rewards_engine_client_mock.cc} (84%) rename components/brave_rewards/core/{ledger_client_mock.h => rewards_engine_client_mock.h} (87%) rename components/brave_rewards/core/{ledger_impl.cc => rewards_engine_impl.cc} (67%) rename components/brave_rewards/core/{ledger_impl.h => rewards_engine_impl.h} (83%) create mode 100644 components/brave_rewards/core/rewards_engine_impl_mock.cc create mode 100644 components/brave_rewards/core/rewards_engine_impl_mock.h delete mode 100644 components/brave_rewards/core/test/bat_ledger_test.cc delete mode 100644 components/brave_rewards/core/test/bat_ledger_test.h create mode 100644 components/brave_rewards/core/test/rewards_engine_test.cc create mode 100644 components/brave_rewards/core/test/rewards_engine_test.h rename components/brave_rewards/core/test/{test_ledger_client.cc => test_rewards_engine_client.cc} (51%) rename components/brave_rewards/core/test/{test_ledger_client.h => test_rewards_engine_client.h} (87%) rename components/brave_rewards/core/test/{test_ledger_client_unittest.cc => test_rewards_engine_client_unittest.cc} (70%) delete mode 100644 components/services/bat_ledger/ledger_factory_impl.h rename components/services/{bat_ledger => bat_rewards}/BUILD.gn (88%) rename components/services/{bat_ledger => bat_rewards}/public/interfaces/BUILD.gn (90%) rename components/services/{bat_ledger/public/interfaces/ledger_factory.mojom => bat_rewards/public/interfaces/rewards_engine_factory.mojom} (53%) rename components/services/{bat_ledger/ledger_factory_impl.cc => bat_rewards/rewards_engine_factory.cc} (52%) create mode 100644 components/services/bat_rewards/rewards_engine_factory.h rename ios/browser/api/{ledger => brave_rewards}/BUILD.gn (55%) rename ios/browser/api/{ledger => brave_rewards}/DEPS (100%) rename ios/browser/api/{ledger/brave_ledger.h => brave_rewards/brave_rewards_api.h} (79%) rename ios/browser/api/{ledger/brave_ledger.mm => brave_rewards/brave_rewards_api.mm} (71%) create mode 100644 ios/browser/api/brave_rewards/headers.gni rename ios/browser/api/{ledger => brave_rewards}/promotion_solution.h (60%) rename ios/browser/api/{ledger => brave_rewards}/promotion_solution.mm (85%) create mode 100644 ios/browser/api/brave_rewards/rewards_client_bridge.h rename ios/browser/api/{ledger/ledger_client_ios.h => brave_rewards/rewards_client_ios.h} (84%) create mode 100644 ios/browser/api/brave_rewards/rewards_client_ios.mm rename ios/browser/api/{ledger => brave_rewards}/rewards_notification.h (77%) rename ios/browser/api/{ledger => brave_rewards}/rewards_notification.m (92%) rename ios/browser/api/{ledger/brave_ledger_observer.h => brave_rewards/rewards_observer.h} (61%) create mode 100644 ios/browser/api/brave_rewards/rewards_observer.mm delete mode 100644 ios/browser/api/ledger/brave_ledger_observer.mm delete mode 100644 ios/browser/api/ledger/headers.gni delete mode 100644 ios/browser/api/ledger/ledger_client_bridge.h delete mode 100644 ios/browser/api/ledger/ledger_client_ios.mm diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 371b6d35664..aafd0dd4ec7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -25,7 +25,7 @@ browser/ui/webui/brave_rewards_page_ui.h @brave/rewards-client browser/ui/webui/brave_rewards_ui.cc @brave/rewards-client browser/ui/webui/brave_rewards_ui.h @brave/rewards-client components/brave_rewards/ @brave/rewards-client -components/services/bat_ledger/ @brave/rewards-client +components/services/bat_rewards/ @brave/rewards-client # Ads browser/brave_ads/**/*.cc @brave/ads-client diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 74ee4036e97..0952dfa91e1 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -159,7 +159,7 @@ def CheckLicense(input_api, output_api): files_to_check = input_api.DEFAULT_FILES_TO_CHECK + (r'.+\.gni?$', ) files_to_skip = input_api.DEFAULT_FILES_TO_SKIP + ( r"\.storybook/", - r"ios/browser/api/ledger/legacy_database/core_data_models/", + r"ios/browser/api/brave_rewards/legacy_database/core_data_models/", r'win_build_output/', ) diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java index 369a4577904..7816ab83a3c 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java @@ -42,10 +42,10 @@ public class BraveRewardsNativeWorker { public static final int REWARDS_NOTIFICATION_ADS_ONBOARDING = 9; public static final int REWARDS_NOTIFICATION_VERIFIED_PUBLISHER = 10; public static final int REWARDS_NOTIFICATION_PENDING_NOT_ENOUGH_FUNDS = 11; - public static final int REWARDS_NOTIFICATION_GENERAL_LEDGER = 12; + public static final int REWARDS_NOTIFICATION_GENERAL = 12; - public static final int LEDGER_OK = 0; - public static final int LEDGER_ERROR = 1; + public static final int OK = 0; + public static final int FAILED = 1; public static final int BAT_NOT_ALLOWED = 25; public static final int SAFETYNET_ATTESTATION_FAILED = 27; diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java index 0cbccc6268f..5ce3f047563 100644 --- a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java +++ b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java @@ -511,7 +511,7 @@ public class BraveRewardsPanel case BraveRewardsNativeWorker.REWARDS_NOTIFICATION_TIPS_PROCESSED: case BraveRewardsNativeWorker.REWARDS_NOTIFICATION_ADS_ONBOARDING: case BraveRewardsNativeWorker.REWARDS_NOTIFICATION_PENDING_NOT_ENOUGH_FUNDS: - case BraveRewardsNativeWorker.REWARDS_NOTIFICATION_GENERAL_LEDGER: + case BraveRewardsNativeWorker.REWARDS_NOTIFICATION_GENERAL: case REWARDS_NOTIFICATION_NO_INTERNET: case REWARDS_PROMOTION_CLAIM_ERROR: valid = true; @@ -701,7 +701,7 @@ public class BraveRewardsPanel R.string.brave_ui_verified_publisher_notification, pubName); notificationIcon = R.drawable.ic_notification_pending; break; - case BraveRewardsNativeWorker.REWARDS_NOTIFICATION_GENERAL_LEDGER: + case BraveRewardsNativeWorker.REWARDS_NOTIFICATION_GENERAL: notificationClaimImg.setVisibility(View.GONE); notificationClaimSubText.setVisibility(View.GONE); String errorType = args[0]; @@ -876,7 +876,7 @@ public class BraveRewardsPanel // Rewards data callbacks @Override public void OnClaimPromotion(int responseCode) { - if (responseCode != BraveRewardsNativeWorker.LEDGER_OK) { + if (responseCode != BraveRewardsNativeWorker.OK) { String args[] = {}; showNotification( REWARDS_PROMOTION_CLAIM_ERROR_ID, REWARDS_PROMOTION_CLAIM_ERROR, 0, args); diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd index ec3bf7a9484..675967a6bd3 100644 --- a/app/brave_generated_resources.grd +++ b/app/brave_generated_resources.grd @@ -645,8 +645,8 @@ Or change later at $2brave://settings/ext Bat Ads Service - - Bat Ledger Service + + Bat Rewards Service Close diff --git a/browser/brave_rewards/android/brave_rewards_native_worker.h b/browser/brave_rewards/android/brave_rewards_native_worker.h index 1e5fd283eeb..954fdcf5677 100644 --- a/browser/brave_rewards/android/brave_rewards_native_worker.h +++ b/browser/brave_rewards/android/brave_rewards_native_worker.h @@ -20,7 +20,7 @@ #include "brave/components/brave_ads/common/interfaces/brave_ads.mojom.h" #include "brave/components/brave_rewards/browser/rewards_notification_service_observer.h" #include "brave/components/brave_rewards/browser/rewards_service_observer.h" -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom.h" #include "brave/components/brave_rewards/core/mojom_structs.h" namespace brave_rewards { diff --git a/browser/brave_rewards/extension_rewards_service_observer.cc b/browser/brave_rewards/extension_rewards_service_observer.cc index 5516ed0f3a8..236f27a9744 100644 --- a/browser/brave_rewards/extension_rewards_service_observer.cc +++ b/browser/brave_rewards/extension_rewards_service_observer.cc @@ -113,7 +113,7 @@ void ExtensionRewardsServiceObserver::OnPromotionFinished( const brave_rewards::mojom::Result result, brave_rewards::mojom::PromotionPtr promotion) { auto* event_router = extensions::EventRouter::Get(profile_); - if (!event_router || result != brave_rewards::mojom::Result::LEDGER_OK) { + if (!event_router || result != brave_rewards::mojom::Result::OK) { return; } diff --git a/browser/extensions/api/brave_rewards_api.cc b/browser/extensions/api/brave_rewards_api.cc index 85c13a0854e..ae3b342eefa 100644 --- a/browser/extensions/api/brave_rewards_api.cc +++ b/browser/extensions/api/brave_rewards_api.cc @@ -480,7 +480,7 @@ ExtensionFunction::ResponseAction BraveRewardsTipUserFunction::Run() { } // If the user clicks the tipping button before having opted into the Rewards, - // then the Rewards service would not have started the ledger process yet. We + // then the Rewards service would not have started the engine process yet. We // need to open the Rewards panel for the user to offer opting in. if (!rewards_enabled) { // Get web contents for this tab @@ -511,13 +511,13 @@ ExtensionFunction::ResponseAction BraveRewardsTipUserFunction::Run() { void BraveRewardsTipUserFunction::OnTipUserGetPublisherInfo( const ::brave_rewards::mojom::Result result, ::brave_rewards::mojom::PublisherInfoPtr info) { - if (result != ::brave_rewards::mojom::Result::LEDGER_OK && + if (result != ::brave_rewards::mojom::Result::OK && result != ::brave_rewards::mojom::Result::NOT_FOUND) { Release(); return; } - if (result == ::brave_rewards::mojom::Result::LEDGER_OK) { + if (result == ::brave_rewards::mojom::Result::OK) { ShowTipDialog(); Release(); return; @@ -548,7 +548,7 @@ void BraveRewardsTipUserFunction::OnTipUserGetPublisherInfo( void BraveRewardsTipUserFunction::OnTipUserSavePublisherInfo( const ::brave_rewards::mojom::Result result) { - if (result != ::brave_rewards::mojom::Result::LEDGER_OK) { + if (result != ::brave_rewards::mojom::Result::OK) { Release(); return; } @@ -1040,7 +1040,7 @@ ExtensionFunction::ResponseAction BraveRewardsSaveRecurringTipFunction::Run() { void BraveRewardsSaveRecurringTipFunction::OnSaveRecurringTip( ::brave_rewards::mojom::Result result) { - Respond(result == ::brave_rewards::mojom::Result::LEDGER_OK + Respond(result == ::brave_rewards::mojom::Result::OK ? NoArguments() : Error("Failed to save")); } diff --git a/browser/extensions/api/brave_rewards_api.h b/browser/extensions/api/brave_rewards_api.h index 4b804a67bb9..6a392380a53 100644 --- a/browser/extensions/api/brave_rewards_api.h +++ b/browser/extensions/api/brave_rewards_api.h @@ -13,7 +13,7 @@ #include "base/types/expected.h" #include "brave/components/brave_ads/common/interfaces/brave_ads.mojom.h" -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom.h" #include "brave/components/brave_rewards/core/mojom_structs.h" #include "extensions/browser/extension_function.h" diff --git a/browser/greaselion/greaselion_browsertest.cc b/browser/greaselion/greaselion_browsertest.cc index 7962eaeffb1..97b9815d07e 100644 --- a/browser/greaselion/greaselion_browsertest.cc +++ b/browser/greaselion/greaselion_browsertest.cc @@ -181,7 +181,7 @@ class GreaselionServiceTest : public BaseLocalDataFilesBrowserTest { base::BindRepeating( &GreaselionServiceTest::GetTestResponse, base::Unretained(this))); - rewards_service_->SetLedgerEnvForTesting(); + rewards_service_->SetEngineEnvForTesting(); GreaselionService* greaselion_service = GreaselionServiceFactory::GetForBrowserContext(profile()); // wait for the Greaselion service to install all the extensions it creates diff --git a/browser/ui/brave_rewards/tip_panel_coordinator.h b/browser/ui/brave_rewards/tip_panel_coordinator.h index e4282bf3a2e..52f1a4a7beb 100644 --- a/browser/ui/brave_rewards/tip_panel_coordinator.h +++ b/browser/ui/brave_rewards/tip_panel_coordinator.h @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/scoped_observation.h" -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom.h" #include "chrome/browser/ui/browser_user_data.h" #include "ui/gfx/geometry/size.h" diff --git a/browser/ui/webui/brave_rewards_page_ui.cc b/browser/ui/webui/brave_rewards_page_ui.cc index d418bafac00..f4ece209f5b 100644 --- a/browser/ui/webui/brave_rewards_page_ui.cc +++ b/browser/ui/webui/brave_rewards_page_ui.cc @@ -806,7 +806,7 @@ void RewardsDOMHandler::OnPromotionFinished( brave_rewards::RewardsService* rewards_service, const brave_rewards::mojom::Result result, brave_rewards::mojom::PromotionPtr promotion) { - if (result != brave_rewards::mojom::Result::LEDGER_OK) { + if (result != brave_rewards::mojom::Result::OK) { return; } diff --git a/build/android/config.gni b/build/android/config.gni index ca2ec8d38c5..2bc34fc9833 100644 --- a/build/android/config.gni +++ b/build/android/config.gni @@ -28,8 +28,8 @@ brave_chrome_java_deps = [ "//brave/browser/ui/android/omnibox:java", "//brave/browser/ui/android/theme:java", "//brave/components/brave_news/common:mojom_java", - "//brave/components/brave_rewards/common/mojom:ledger_interfaces_java", - "//brave/components/brave_rewards/common/mojom:ledger_types_java", + "//brave/components/brave_rewards/common/mojom:rewards_interfaces_java", + "//brave/components/brave_rewards/common/mojom:rewards_types_java", "//brave/components/brave_shields/common:mojom_java", "//brave/components/brave_wallet/common:mojom_java", "//brave/components/browser_ui/accessibility/android:java", diff --git a/chromium_presubmit_config.json5 b/chromium_presubmit_config.json5 index 0d9ba0c1b6d..b2ecfb7937c 100644 --- a/chromium_presubmit_config.json5 +++ b/chromium_presubmit_config.json5 @@ -58,7 +58,7 @@ "default_files_to_skip": [ "\\.storybook/", "components/brave_wallet/resources/solana_web3_script\\.js", - "ios/browser/api/ledger/legacy_database/core_data_models/", + "ios/browser/api/brave_rewards/legacy_database/core_data_models/", "third_party/rust/", "win_build_output/", ], @@ -91,8 +91,8 @@ "components/permissions/permission_lifetime_utils\\.cc", "components/tor/tor_launcher_factory\\.cc", "components/webcompat_reporter/browser/webcompat_report_uploader\\.cc", - "ios/browser/api/ledger/legacy_database/legacy_ledger_database\\.mm", - "ios/browser/api/ledger/promotion_solution\\.mm", + "ios/browser/api/brave_rewards/legacy_database/legacy_ledger_database\\.mm", + "ios/browser/api/brave_rewards/promotion_solution\\.mm", ], "CheckUniquePtrOnUpload": [ "components/brave_sync/qr_code_data\\.cc", @@ -143,12 +143,11 @@ "components/cosmetic_filters/renderer/cosmetic_filters_js_handler\\.h", "components/speedreader/renderer/speedreader_js_handler\\.h", ], - // A temporary fix to silence a failing presubmit check on a namespace - // change. + // A temporary fix to silence a failing presubmit check on file renames. "CheckStableMojomChanges": [ - "components/services/bat_ledger/public/interfaces/ledger_factory\\.mojom", - "components/brave_rewards/common/mojom/bat_ledger\\.mojom", - "components/brave_rewards/common/mojom/tip_panel\\.mojom", + "components/brave_rewards/common/mojom/.*", + "components/services/bat_ledger/public/interfaces/.*", + "components/services/bat_rewards/public/interfaces/.*", ], "CheckWebDevStyle": [ "components/speedreader/resources/speedreader-desktop.css", @@ -176,18 +175,16 @@ ], "/\\bstd::bind\\b": [ "components/brave_rewards/.*", - "components/services/bat_ledger/bat_ledger_impl\\.cc", - "components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge\\.cc", ], "/\\bstd::function\\b": [ "chromium_src/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views\\.cc", - "components/brave_rewards/.*", + "components/brave_rewards/core/.*", "ios/browser/api/bookmarks/exporter/brave_bookmarks_exporter\\.mm", "ios/browser/api/bookmarks/importer/brave_bookmarks_importer\\.mm", ], "/\\bstd::shared_ptr\\b": [ "browser/net/.*", - "components/brave_rewards/.*", + "components/brave_rewards/core/.*", "ios/browser/api/certificate/brave_certificate\\.mm", "ios/browser/api/net/certificate_utility\\.mm", ], diff --git a/common/extensions/api/brave_rewards.json b/common/extensions/api/brave_rewards.json index 9e647d29b7b..6c76923973e 100644 --- a/common/extensions/api/brave_rewards.json +++ b/common/extensions/api/brave_rewards.json @@ -1471,7 +1471,7 @@ { "name": "isInitialized", "type": "function", - "description": "Is ledger process initialized", + "description": "Is rewards engine initialized", "parameters": [ { "type": "function", diff --git a/components/brave_ads/browser/ads_service_impl.cc b/components/brave_ads/browser/ads_service_impl.cc index 4b9005e6526..af8d502f63b 100644 --- a/components/brave_ads/browser/ads_service_impl.cc +++ b/components/brave_ads/browser/ads_service_impl.cc @@ -52,7 +52,7 @@ #include "brave/components/brave_federated/data_stores/async_data_store.h" #include "brave/components/brave_news/common/pref_names.h" #include "brave/components/brave_rewards/browser/rewards_service.h" -#include "brave/components/brave_rewards/common/mojom/ledger.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" #include "brave/components/l10n/common/locale_util.h" #include "brave/components/ntp_background_images/common/pref_names.h" #include "build/build_config.h" diff --git a/components/brave_ads/browser/ads_service_impl.h b/components/brave_ads/browser/ads_service_impl.h index cc46a9b5314..1398170530b 100644 --- a/components/brave_ads/browser/ads_service_impl.h +++ b/components/brave_ads/browser/ads_service_impl.h @@ -25,7 +25,7 @@ #include "brave/components/brave_ads/browser/component_updater/resource_component_observer.h" #include "brave/components/brave_ads/common/interfaces/brave_ads.mojom.h" #include "brave/components/brave_ads/core/ads_callback.h" -#include "brave/components/brave_rewards/common/mojom/ledger.mojom-forward.h" +#include "brave/components/brave_rewards/common/mojom/rewards.mojom-forward.h" #include "brave/components/services/bat_ads/public/interfaces/bat_ads.mojom.h" #include "components/history/core/browser/history_service.h" #include "components/prefs/pref_change_registrar.h" diff --git a/components/brave_rewards/browser/BUILD.gn b/components/brave_rewards/browser/BUILD.gn index 06d1fa02d55..4a4d62b9887 100644 --- a/components/brave_rewards/browser/BUILD.gn +++ b/components/brave_rewards/browser/BUILD.gn @@ -46,7 +46,7 @@ static_library("browser") { "//brave/components/brave_rewards/common", "//brave/components/brave_rewards/common/buildflags", "//brave/components/resources", - "//brave/components/services/bat_ledger/public/interfaces", + "//brave/components/services/bat_rewards/public/interfaces", "//mojo/public/cpp/bindings", "//net", "//services/data_decoder/public/cpp", diff --git a/components/brave_rewards/browser/CHANGELOG.md b/components/brave_rewards/browser/CHANGELOG.md index f14b2c980ce..a09826af1d0 100644 --- a/components/brave_rewards/browser/CHANGELOG.md +++ b/components/brave_rewards/browser/CHANGELOG.md @@ -6,7 +6,7 @@ ##### Related issue [https://github.com/brave/brave-browser/issues/9870](https://github.com/brave/brave-browser/issues/9870) ##### Description -Moved bat-native-confirmations from ledger to ads process +Moved bat-native-confirmations from rewards to ads process ### Changed API (5th June 2020) ##### Related PR @@ -28,7 +28,7 @@ With this PR we now pass `should_refresh` ##### Related PR [https://github.com/brave/brave-core/pull/3918](https://github.com/brave/brave-core/pull/3918) ##### Description -With this PR we completely changed the logic of how grants work. Instead of using anonize we now used blinded tokens. +With this PR we completely changed the logic of how grants work. Instead of using anonize we now used blinded tokens. You can read more about what is done in this issue [https://github.com/brave/brave-browser/issues/6078](https://github.com/brave/brave-browser/issues/6078). For `ClaimPromotion` Android should use the one with `promotion_id` param @@ -39,29 +39,29 @@ For `ClaimPromotion` Android should use the one with `promotion_id` param | Signature | `FetchGrants` | `FetchPromotions` | | Return value | | | | Parameters | `const std::string& lang` | | -| | `const std::string& paymentId` | | +| | `const std::string& paymentId` | | | | Old version | New version | |---|---|---| | Signature | `GetGrantCaptcha` | `ClaimPromotion` | | Return value | | | | Parameters | `const std::string& promotion_id` | `ClaimPromotionCallback callback` | -| | `const std::string& promotion_type` | | +| | `const std::string& promotion_type` | | | | Old version | New version | |---|---|---| | Signature | | `ClaimPromotion` | | Return value | | | | Parameters | | `const std::string& promotion_id` | -| | | `AttestPromotionCallback callback` | +| | | `AttestPromotionCallback callback` | | | Old version | New version | |---|---|---| | Signature | `SolveGrantCaptcha` | `AttestPromotion` | | Return value | | | | Parameters | `const std::string& solution` | `const std::string& promotion_id` | -| | `const std::string& promotionId` | `const std::string& solution` | -| | | `AttestPromotionCallback callback` | +| | `const std::string& promotionId` | `const std::string& solution` | +| | | `AttestPromotionCallback callback` | | | Old version | New version | |---|---|---| @@ -94,7 +94,7 @@ Renamed `RewardsCategory` to `RewardsType` and added migration path. ##### Description We added new API which allows us to get information if we should only show anonymous wallet functionality. -It's based on user location, country. List of countries is located in `static_values.h`. +It's based on user location, country. List of countries is located in `static_values.h`. We use [Chromium api](https://cs.chromium.org/chromium/src/components/country_codes/country_codes.h?type=cs&q=GetCountryIDFromPrefs&g=0&l=53) to determine which country user is in. diff --git a/components/brave_rewards/browser/android_util.h b/components/brave_rewards/browser/android_util.h index b81471a550e..e8f56543aaa 100644 --- a/components/brave_rewards/browser/android_util.h +++ b/components/brave_rewards/browser/android_util.h @@ -6,7 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_ANDROID_UTIL_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_ANDROID_UTIL_H_ -#include "brave/components/brave_rewards/common/mojom/ledger.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" namespace android_util { diff --git a/components/brave_rewards/browser/rewards_notification_service.h b/components/brave_rewards/browser/rewards_notification_service.h index 2fd4498d672..e7db97ce924 100644 --- a/components/brave_rewards/browser/rewards_notification_service.h +++ b/components/brave_rewards/browser/rewards_notification_service.h @@ -37,7 +37,7 @@ class RewardsNotificationService { REWARDS_NOTIFICATION_FAILED_CONTRIBUTION = 4, REWARDS_NOTIFICATION_IMPENDING_CONTRIBUTION = 5, REWARDS_NOTIFICATION_TIPS_PROCESSED = 8, - REWARDS_NOTIFICATION_GENERAL_LEDGER = 12, + REWARDS_NOTIFICATION_GENERAL = 12, }; struct RewardsNotification { diff --git a/components/brave_rewards/browser/rewards_notification_service_impl.cc b/components/brave_rewards/browser/rewards_notification_service_impl.cc index c29418533d6..704297a877e 100644 --- a/components/brave_rewards/browser/rewards_notification_service_impl.cc +++ b/components/brave_rewards/browser/rewards_notification_service_impl.cc @@ -327,7 +327,7 @@ void RewardsNotificationServiceImpl::OnFetchPromotions( RewardsService* rewards_service, const mojom::Result result, const std::vector& list) { - if (static_cast(result) != mojom::Result::LEDGER_OK) { + if (static_cast(result) != mojom::Result::OK) { return; } @@ -384,12 +384,11 @@ void RewardsNotificationServiceImpl::OnReconcileComplete( } const bool completed_auto_contribute = - result == mojom::Result::LEDGER_OK && + result == mojom::Result::OK && type == mojom::RewardsType::AUTO_CONTRIBUTE; if (completed_auto_contribute || result == mojom::Result::NOT_ENOUGH_FUNDS || - result == mojom::Result::LEDGER_ERROR || - result == mojom::Result::TIP_ERROR) { + result == mojom::Result::FAILED || result == mojom::Result::TIP_ERROR) { RewardsNotificationService::RewardsNotificationArgs args; args.push_back(contribution_id); args.push_back(base::NumberToString(static_cast(result))); diff --git a/components/brave_rewards/browser/rewards_service.h b/components/brave_rewards/browser/rewards_service.h index 78c27ad19b9..3fd748e9126 100644 --- a/components/brave_rewards/browser/rewards_service.h +++ b/components/brave_rewards/browser/rewards_service.h @@ -16,7 +16,7 @@ #include "base/types/expected.h" #include "base/version.h" #include "brave/components/brave_rewards/browser/rewards_notification_service.h" -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom.h" #include "brave/components/brave_rewards/core/mojom_structs.h" #include "build/build_config.h" #include "components/keyed_service/core/keyed_service.h" diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index c94efc12318..63690e7c48c 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -50,7 +50,7 @@ #include "brave/components/brave_rewards/common/features.h" #include "brave/components/brave_rewards/common/pref_names.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_database.h" +#include "brave/components/brave_rewards/core/rewards_database.h" #include "brave/components/brave_rewards/resources/grit/brave_rewards_resources.h" #include "brave/grit/brave_generated_resources.h" #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h" @@ -147,13 +147,13 @@ std::pair LoadStateOnFileTaskRunner( std::string error_message; auto value = deserializer.Deserialize(&error_code, &error_message); if (!value) { - VLOG(0) << "Cannot deserialize ledger state, error code: " << error_code - << " message: " << error_message; + VLOG(0) << "Cannot deserialize state, error code: " << error_code + << " message: " << error_message; return result; } if (!value->is_dict()) { - VLOG(0) << "Corrupted ledger state."; + VLOG(0) << "Corrupted legacy state."; return result; } @@ -267,13 +267,13 @@ void DeferCallback(base::Location location, Callback callback, Args&&... args) { // read comment about file pathes at src\base\files\file_path.h #if BUILDFLAG(IS_WIN) const base::FilePath::StringType kDiagnosticLogPath(L"Rewards.log"); -const base::FilePath::StringType kLedger_state(L"ledger_state"); +const base::FilePath::StringType kLegacy_state(L"ledger_state"); const base::FilePath::StringType kPublisher_state(L"publisher_state"); const base::FilePath::StringType kPublisher_info_db(L"publisher_info_db"); const base::FilePath::StringType kPublishers_list(L"publishers_list"); #else const base::FilePath::StringType kDiagnosticLogPath("Rewards.log"); -const base::FilePath::StringType kLedger_state("ledger_state"); +const base::FilePath::StringType kLegacy_state("ledger_state"); const base::FilePath::StringType kPublisher_state("publisher_state"); const base::FilePath::StringType kPublisher_info_db("publisher_info_db"); const base::FilePath::StringType kPublishers_list("publishers_list"); @@ -296,7 +296,7 @@ RewardsServiceImpl::RewardsServiceImpl(Profile* profile) base::TaskShutdownBehavior::BLOCK_SHUTDOWN})), json_sanitizer_task_runner_(base::ThreadPool::CreateSequencedTaskRunner( {base::MayBlock(), base::TaskPriority::BEST_EFFORT})), - ledger_state_path_(profile_->GetPath().Append(kLedger_state)), + legacy_state_path_(profile_->GetPath().Append(kLegacy_state)), publisher_state_path_(profile_->GetPath().Append(kPublisher_state)), publisher_info_db_path_(profile->GetPath().Append(kPublisher_info_db)), publisher_list_path_(profile->GetPath().Append(kPublishers_list)), @@ -338,13 +338,13 @@ RewardsServiceImpl::~RewardsServiceImpl() { } void RewardsServiceImpl::ConnectionClosed() { - BLOG(0, "Restarting ledger process after disconnect"); + BLOG(0, "Restarting engine process after disconnect"); Reset(); base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask( FROM_HERE, - base::BindOnce(&RewardsServiceImpl::StartLedgerProcessIfNecessary, + base::BindOnce(&RewardsServiceImpl::StartEngineProcessIfNecessary, AsWeakPtr()), base::Seconds(10)); } @@ -386,7 +386,7 @@ void RewardsServiceImpl::InitPrefChangeRegistrar() { void RewardsServiceImpl::OnPreferenceChanged(const std::string& key) { if (key == prefs::kAutoContributeEnabled) { if (profile_->GetPrefs()->GetBoolean(prefs::kAutoContributeEnabled)) { - StartLedgerProcessIfNecessary(); + StartEngineProcessIfNecessary(); } // Must check for connected external wallet before recording // AC state. @@ -431,48 +431,47 @@ void RewardsServiceImpl::CheckPreferences() { if (prefs->GetUserPrefValue(prefs::kEnabled)) { // If the "enabled" pref is set, then start the background Rewards // utility process. - StartLedgerProcessIfNecessary(); + StartEngineProcessIfNecessary(); } } -void RewardsServiceImpl::StartLedgerProcessIfNecessary() { +void RewardsServiceImpl::StartEngineProcessIfNecessary() { if (Connected()) { - BLOG(1, "Ledger process is already running"); + BLOG(1, "Engine process is already running"); return; } - ledger_database_ = base::SequenceBound( + rewards_database_ = base::SequenceBound( file_task_runner_, publisher_info_db_path_); - BLOG(1, "Starting ledger process"); + BLOG(1, "Starting engine process"); - if (!ledger_factory_.is_bound()) { + if (!engine_factory_.is_bound()) { content::ServiceProcessHost::Launch( - ledger_factory_.BindNewPipeAndPassReceiver(), + engine_factory_.BindNewPipeAndPassReceiver(), content::ServiceProcessHost::Options() - .WithDisplayName(IDS_UTILITY_PROCESS_LEDGER_NAME) + .WithDisplayName(IDS_UTILITY_PROCESS_REWARDS_NAME) .Pass()); - ledger_factory_.set_disconnect_handler( + engine_factory_.set_disconnect_handler( base::BindOnce(&RewardsServiceImpl::ConnectionClosed, AsWeakPtr())); } auto options = HandleFlags(RewardsFlags::ForCurrentProcess()); - PrepareLedgerEnvForTesting(*options); - - ledger_factory_->CreateLedger( - ledger_.BindNewEndpointAndPassReceiver(), + PrepareEngineEnvForTesting(*options); + engine_factory_->CreateRewardsEngine( + engine_.BindNewEndpointAndPassReceiver(), receiver_.BindNewEndpointAndPassRemote(), std::move(options), - base::BindOnce(&RewardsServiceImpl::OnLedgerCreated, AsWeakPtr())); + base::BindOnce(&RewardsServiceImpl::OnEngineCreated, AsWeakPtr())); } -void RewardsServiceImpl::OnLedgerCreated() { +void RewardsServiceImpl::OnEngineCreated() { if (!Connected()) { return; } - ledger_->Initialize( - base::BindOnce(&RewardsServiceImpl::OnLedgerInitialized, AsWeakPtr())); + engine_->Initialize( + base::BindOnce(&RewardsServiceImpl::OnEngineInitialized, AsWeakPtr())); } void RewardsServiceImpl::CreateRewardsWallet( @@ -550,14 +549,14 @@ void RewardsServiceImpl::CreateRewardsWallet( std::move(callback).Run(CreateRewardsWalletResult::kSuccess); }; - self->ledger_->CreateRewardsWallet( + self->engine_->CreateRewardsWallet( country, base::BindOnce(on_created, self, country, std::move(callback))); }; ready_->Post(FROM_HERE, base::BindOnce(on_start, AsWeakPtr(), country, std::move(callback))); - StartLedgerProcessIfNecessary(); + StartEngineProcessIfNecessary(); } void RewardsServiceImpl::GetUserType( @@ -650,7 +649,7 @@ void RewardsServiceImpl::GetAvailableCountries( return std::move(callback).Run(kNonBitflyerCountries); }; - ledger_->GetExternalWallet( + engine_->GetExternalWallet( GetExternalWalletType(), base::BindOnce(on_external_wallet, std::move(callback))); } @@ -665,7 +664,7 @@ void RewardsServiceImpl::GetActivityInfoList( std::vector()); } - ledger_->GetActivityInfoList( + engine_->GetActivityInfoList( start, limit, std::move(filter), base::BindOnce(&RewardsServiceImpl::OnGetPublisherInfoList, AsWeakPtr(), std::move(callback))); @@ -676,7 +675,7 @@ void RewardsServiceImpl::GetPublishersVisitedCount( if (!Connected()) { return DeferCallback(FROM_HERE, std::move(callback), 0); } - ledger_->GetPublishersVisitedCount(std::move(callback)); + engine_->GetPublishersVisitedCount(std::move(callback)); } void RewardsServiceImpl::GetExcludedList( @@ -686,7 +685,7 @@ void RewardsServiceImpl::GetExcludedList( std::vector()); } - ledger_->GetExcludedList( + engine_->GetExcludedList( base::BindOnce(&RewardsServiceImpl::OnGetPublisherInfoList, AsWeakPtr(), std::move(callback))); } @@ -717,7 +716,7 @@ void RewardsServiceImpl::OnLoad(SessionID tab_id, const GURL& url) { data->path = url.path(); data->tab_id = tab_id.id(); data->url = url.scheme() + "://" + *publisher_domain + "/"; - ledger_->OnLoad(std::move(data), GetCurrentTimestamp()); + engine_->OnLoad(std::move(data), GetCurrentTimestamp()); } void RewardsServiceImpl::OnUnload(SessionID tab_id) { @@ -725,7 +724,7 @@ void RewardsServiceImpl::OnUnload(SessionID tab_id) { return; } - ledger_->OnUnload(tab_id.id(), GetCurrentTimestamp()); + engine_->OnUnload(tab_id.id(), GetCurrentTimestamp()); } void RewardsServiceImpl::OnShow(SessionID tab_id) { @@ -733,7 +732,7 @@ void RewardsServiceImpl::OnShow(SessionID tab_id) { return; } - ledger_->OnShow(tab_id.id(), GetCurrentTimestamp()); + engine_->OnShow(tab_id.id(), GetCurrentTimestamp()); } void RewardsServiceImpl::OnHide(SessionID tab_id) { @@ -741,7 +740,7 @@ void RewardsServiceImpl::OnHide(SessionID tab_id) { return; } - ledger_->OnHide(tab_id.id(), GetCurrentTimestamp()); + engine_->OnHide(tab_id.id(), GetCurrentTimestamp()); } void RewardsServiceImpl::OnForeground(SessionID tab_id) { @@ -749,7 +748,7 @@ void RewardsServiceImpl::OnForeground(SessionID tab_id) { return; } - ledger_->OnForeground(tab_id.id(), GetCurrentTimestamp()); + engine_->OnForeground(tab_id.id(), GetCurrentTimestamp()); } void RewardsServiceImpl::OnBackground(SessionID tab_id) { @@ -757,7 +756,7 @@ void RewardsServiceImpl::OnBackground(SessionID tab_id) { return; } - ledger_->OnBackground(tab_id.id(), GetCurrentTimestamp()); + engine_->OnBackground(tab_id.id(), GetCurrentTimestamp()); } void RewardsServiceImpl::OnXHRLoad(SessionID tab_id, @@ -783,12 +782,12 @@ void RewardsServiceImpl::OnXHRLoad(SessionID tab_id, data->path = url.spec(); data->tab_id = tab_id.id(); - ledger_->OnXHRLoad(tab_id.id(), url.spec(), parts, first_party_url.spec(), + engine_->OnXHRLoad(tab_id.id(), url.spec(), parts, first_party_url.spec(), referrer.spec(), std::move(data)); } void RewardsServiceImpl::OnRestorePublishers(const mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { return; } @@ -803,7 +802,7 @@ void RewardsServiceImpl::RestorePublishers() { return; } - ledger_->RestorePublishers( + engine_->RestorePublishers( base::BindOnce(&RewardsServiceImpl::OnRestorePublishers, AsWeakPtr())); } @@ -825,12 +824,12 @@ void RewardsServiceImpl::Shutdown() { receiver_.reset(); url_loaders_.clear(); - ledger_.reset(); + engine_.reset(); RewardsService::Shutdown(); } -void RewardsServiceImpl::OnLedgerInitialized(mojom::Result result) { - if (result == mojom::Result::LEDGER_OK) { +void RewardsServiceImpl::OnEngineInitialized(mojom::Result result) { + if (result == mojom::Result::OK) { StartNotificationTimers(); } @@ -854,18 +853,18 @@ void RewardsServiceImpl::GetAutoContributeProperties( return DeferCallback(FROM_HERE, std::move(callback), nullptr); } - ledger_->GetAutoContributeProperties(std::move(callback)); + engine_->GetAutoContributeProperties(std::move(callback)); } void RewardsServiceImpl::OnReconcileComplete( mojom::Result result, mojom::ContributionInfoPtr contribution) { - if (result == mojom::Result::LEDGER_OK && + if (result == mojom::Result::OK && contribution->type == mojom::RewardsType::RECURRING_TIP) { MaybeShowNotificationTipsPaid(); } - if (result == mojom::Result::LEDGER_OK) { + if (result == mojom::Result::OK) { RecordBackendP3AStats(); } @@ -879,15 +878,15 @@ void RewardsServiceImpl::OnReconcileComplete( contribution->processor); } -void RewardsServiceImpl::LoadLedgerState(LoadLedgerStateCallback callback) { +void RewardsServiceImpl::LoadLegacyState(LoadLegacyStateCallback callback) { file_task_runner_->PostTaskAndReplyWithResult( - FROM_HERE, base::BindOnce(&LoadStateOnFileTaskRunner, ledger_state_path_), - base::BindOnce(&RewardsServiceImpl::OnLedgerStateLoaded, AsWeakPtr(), + FROM_HERE, base::BindOnce(&LoadStateOnFileTaskRunner, legacy_state_path_), + base::BindOnce(&RewardsServiceImpl::OnLegacyStateLoaded, AsWeakPtr(), std::move(callback))); } -void RewardsServiceImpl::OnLedgerStateLoaded( - LoadLedgerStateCallback callback, +void RewardsServiceImpl::OnLegacyStateLoaded( + LoadLegacyStateCallback callback, std::pair state) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -902,8 +901,7 @@ void RewardsServiceImpl::OnLedgerStateLoaded( // Run callbacks. const std::string& data = state.first; std::move(callback).Run( - data.empty() ? mojom::Result::NO_LEDGER_STATE : mojom::Result::LEDGER_OK, - data); + data.empty() ? mojom::Result::NO_LEGACY_STATE : mojom::Result::OK, data); } void RewardsServiceImpl::LoadPublisherState( @@ -922,9 +920,9 @@ void RewardsServiceImpl::OnPublisherStateLoaded( return; } - std::move(callback).Run(data.empty() ? mojom::Result::NO_PUBLISHER_STATE - : mojom::Result::LEDGER_OK, - data); + std::move(callback).Run( + data.empty() ? mojom::Result::NO_PUBLISHER_STATE : mojom::Result::OK, + data); } void RewardsServiceImpl::LoadURL(mojom::UrlRequestPtr request, @@ -1092,7 +1090,7 @@ void RewardsServiceImpl::GetRewardsParameters( return DeferCallback(FROM_HERE, std::move(callback), nullptr); } - ledger_->GetRewardsParameters( + engine_->GetRewardsParameters( base::BindOnce(&OnGetRewardsParameters, std::move(callback))); } @@ -1133,7 +1131,7 @@ void RewardsServiceImpl::FetchPromotions(FetchPromotionsCallback callback) { std::move(callback).Run(std::move(promotions)); }; - ledger_->FetchPromotions( + engine_->FetchPromotions( base::BindOnce(on_fetch, AsWeakPtr(), std::move(callback))); } @@ -1167,7 +1165,7 @@ void RewardsServiceImpl::OnClaimPromotion(ClaimPromotionCallback callback, std::string hint; std::string id; - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, image, hint, id); return; } @@ -1186,13 +1184,13 @@ void RewardsServiceImpl::AttestationAndroid(const std::string& promotion_id, AttestPromotionCallback callback, const mojom::Result result, const std::string& nonce) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, nullptr); return; } if (nonce.empty()) { - std::move(callback).Run(mojom::Result::LEDGER_ERROR, nullptr); + std::move(callback).Run(mojom::Result::FAILED, nullptr); return; } @@ -1213,7 +1211,7 @@ void RewardsServiceImpl::OnAttestationAndroid( const std::string& token, const bool attestation_passed) { if (!Connected() || !token_received) { - std::move(callback).Run(mojom::Result::LEDGER_ERROR, nullptr); + std::move(callback).Run(mojom::Result::FAILED, nullptr); return; } @@ -1224,7 +1222,7 @@ void RewardsServiceImpl::OnAttestationAndroid( std::string json; base::JSONWriter::Write(solution, &json); - ledger_->AttestPromotion( + engine_->AttestPromotion( promotion_id, json, base::BindOnce(&RewardsServiceImpl::OnAttestPromotion, AsWeakPtr(), std::move(callback))); @@ -1234,23 +1232,23 @@ void RewardsServiceImpl::ClaimPromotion( const std::string& promotion_id, ClaimPromotionCallback callback) { if (!Connected()) { - return DeferCallback(FROM_HERE, std::move(callback), - mojom::Result::LEDGER_ERROR, "", "", ""); + return DeferCallback(FROM_HERE, std::move(callback), mojom::Result::FAILED, + "", "", ""); } auto claim_callback = base::BindOnce(&RewardsServiceImpl::OnClaimPromotion, AsWeakPtr(), std::move(callback)); - ledger_->ClaimPromotion(promotion_id, "", std::move(claim_callback)); + engine_->ClaimPromotion(promotion_id, "", std::move(claim_callback)); } void RewardsServiceImpl::ClaimPromotion( const std::string& promotion_id, AttestPromotionCallback callback) { if (!Connected()) { - return DeferCallback(FROM_HERE, std::move(callback), - mojom::Result::LEDGER_ERROR, nullptr); + return DeferCallback(FROM_HERE, std::move(callback), mojom::Result::FAILED, + nullptr); } auto claim_callback = base::BindOnce(&RewardsServiceImpl::AttestationAndroid, @@ -1258,7 +1256,7 @@ void RewardsServiceImpl::ClaimPromotion( promotion_id, std::move(callback)); - ledger_->ClaimPromotion(promotion_id, "", std::move(claim_callback)); + engine_->ClaimPromotion(promotion_id, "", std::move(claim_callback)); } std::vector RewardsServiceImpl::GetExternalWalletProviders() @@ -1285,11 +1283,11 @@ void RewardsServiceImpl::AttestPromotion( const std::string& solution, AttestPromotionCallback callback) { if (!Connected()) { - return DeferCallback(FROM_HERE, std::move(callback), - mojom::Result::LEDGER_ERROR, nullptr); + return DeferCallback(FROM_HERE, std::move(callback), mojom::Result::FAILED, + nullptr); } - ledger_->AttestPromotion( + engine_->AttestPromotion( promotion_id, solution, base::BindOnce(&RewardsServiceImpl::OnAttestPromotion, AsWeakPtr(), std::move(callback))); @@ -1298,7 +1296,7 @@ void RewardsServiceImpl::AttestPromotion( void RewardsServiceImpl::OnAttestPromotion(AttestPromotionCallback callback, const mojom::Result result, mojom::PromotionPtr promotion) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, nullptr); return; } @@ -1315,7 +1313,7 @@ void RewardsServiceImpl::GetReconcileStamp(GetReconcileStampCallback callback) { return DeferCallback(FROM_HERE, std::move(callback), 0); } - ledger_->GetReconcileStamp(std::move(callback)); + engine_->GetReconcileStamp(std::move(callback)); } #if BUILDFLAG(ENABLE_GREASELION) @@ -1356,11 +1354,11 @@ void RewardsServiceImpl::OnRulesReady( } #endif -void RewardsServiceImpl::StopLedger(StopLedgerCallback callback) { - BLOG(1, "Shutting down ledger process"); +void RewardsServiceImpl::StopEngine(StopEngineCallback callback) { + BLOG(1, "Shutting down rewards process"); if (!Connected()) { - BLOG(1, "Ledger process not running"); - OnStopLedger(std::move(callback), mojom::Result::LEDGER_OK); + BLOG(1, "Rewards process not running"); + OnStopEngine(std::move(callback), mojom::Result::OK); return; } @@ -1368,20 +1366,20 @@ void RewardsServiceImpl::StopLedger(StopLedgerCallback callback) { p3a_tip_report_timer_.Stop(); p3a::RecordNoWalletCreatedForAllMetrics(); - ledger_->Shutdown(base::BindOnce(&RewardsServiceImpl::OnStopLedger, + engine_->Shutdown(base::BindOnce(&RewardsServiceImpl::OnStopEngine, AsWeakPtr(), std::move(callback))); } -void RewardsServiceImpl::OnStopLedger(StopLedgerCallback callback, +void RewardsServiceImpl::OnStopEngine(StopEngineCallback callback, const mojom::Result result) { - BLOG_IF(1, result != mojom::Result::LEDGER_OK, - "Ledger process was not shut down successfully"); + BLOG_IF(1, result != mojom::Result::OK, + "Rewards process was not shut down successfully"); Reset(); - BLOG(1, "Successfully shutdown ledger"); + BLOG(1, "Successfully shutdown rewards process"); std::move(callback).Run(result); } -void RewardsServiceImpl::OnStopLedgerForCompleteReset( +void RewardsServiceImpl::OnStopEngineForCompleteReset( SuccessCallback callback, const mojom::Result result) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -1396,10 +1394,10 @@ void RewardsServiceImpl::OnDiagnosticLogDeletedForCompleteReset( bool success) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); const std::vector paths = { - ledger_state_path_, - publisher_state_path_, - publisher_info_db_path_, - publisher_list_path_, + legacy_state_path_, + publisher_state_path_, + publisher_info_db_path_, + publisher_list_path_, }; file_task_runner_->PostTaskAndReplyWithResult( FROM_HERE, base::BindOnce(&DeleteFilesOnFileTaskRunner, paths), @@ -1419,11 +1417,11 @@ void RewardsServiceImpl::Reset() { } current_media_fetchers_.clear(); - ledger_.reset(); + engine_.reset(); receiver_.reset(); - ledger_factory_.reset(); + engine_factory_.reset(); ready_ = std::make_unique(); - ledger_database_.Reset(); + rewards_database_.Reset(); BLOG(1, "Successfully reset rewards service"); } @@ -1541,7 +1539,7 @@ void RewardsServiceImpl::GetPublisherMinVisitTime( return DeferCallback(FROM_HERE, std::move(callback), 0); } - ledger_->GetPublisherMinVisitTime(std::move(callback)); + engine_->GetPublisherMinVisitTime(std::move(callback)); } void RewardsServiceImpl::SetPublisherMinVisitTime( @@ -1550,7 +1548,7 @@ void RewardsServiceImpl::SetPublisherMinVisitTime( return; } - ledger_->SetPublisherMinVisitTime(duration_in_seconds); + engine_->SetPublisherMinVisitTime(duration_in_seconds); } void RewardsServiceImpl::GetPublisherMinVisits( @@ -1559,7 +1557,7 @@ void RewardsServiceImpl::GetPublisherMinVisits( return DeferCallback(FROM_HERE, std::move(callback), 0); } - ledger_->GetPublisherMinVisits(std::move(callback)); + engine_->GetPublisherMinVisits(std::move(callback)); } void RewardsServiceImpl::SetPublisherMinVisits(int visits) const { @@ -1567,7 +1565,7 @@ void RewardsServiceImpl::SetPublisherMinVisits(int visits) const { return; } - ledger_->SetPublisherMinVisits(visits); + engine_->SetPublisherMinVisits(visits); } void RewardsServiceImpl::SetAutoContributionAmount(const double amount) const { @@ -1575,7 +1573,7 @@ void RewardsServiceImpl::SetAutoContributionAmount(const double amount) const { return; } - ledger_->SetAutoContributionAmount(amount); + engine_->SetAutoContributionAmount(amount); } void RewardsServiceImpl::GetAutoContributeEnabled( @@ -1584,7 +1582,7 @@ void RewardsServiceImpl::GetAutoContributeEnabled( return DeferCallback(FROM_HERE, std::move(callback), false); } - ledger_->GetAutoContributeEnabled(std::move(callback)); + engine_->GetAutoContributeEnabled(std::move(callback)); } void RewardsServiceImpl::SetAutoContributeEnabled(bool enabled) { @@ -1592,7 +1590,7 @@ void RewardsServiceImpl::SetAutoContributeEnabled(bool enabled) { return; } - ledger_->SetAutoContributeEnabled(enabled); + engine_->SetAutoContributeEnabled(enabled); } void RewardsServiceImpl::OnGetBalanceReport( @@ -1607,11 +1605,11 @@ void RewardsServiceImpl::GetBalanceReport( const uint32_t year, GetBalanceReportCallback callback) { if (!Connected()) { - return DeferCallback(FROM_HERE, std::move(callback), - mojom::Result::LEDGER_OK, nullptr); + return DeferCallback(FROM_HERE, std::move(callback), mojom::Result::OK, + nullptr); } - ledger_->GetBalanceReport( + engine_->GetBalanceReport( static_cast(month), year, base::BindOnce(&RewardsServiceImpl::OnGetBalanceReport, AsWeakPtr(), std::move(callback))); @@ -1646,15 +1644,14 @@ void RewardsServiceImpl::GetPublisherActivityFromUrl( visit_data->url = parsed_url.scheme() + "://" + *publisher_domain + "/"; visit_data->favicon_url = favicon_url; - ledger_->GetPublisherActivityFromUrl(windowId, std::move(visit_data), + engine_->GetPublisherActivityFromUrl(windowId, std::move(visit_data), publisher_blob); } void RewardsServiceImpl::OnPanelPublisherInfo(mojom::Result result, mojom::PublisherInfoPtr info, uint64_t windowId) { - if (result != mojom::Result::LEDGER_OK && - result != mojom::Result::NOT_FOUND) { + if (result != mojom::Result::OK && result != mojom::Result::NOT_FOUND) { return; } @@ -1671,7 +1668,7 @@ void RewardsServiceImpl::GetAutoContributionAmount( return DeferCallback(FROM_HERE, std::move(callback), 0); } - ledger_->GetAutoContributionAmount(std::move(callback)); + engine_->GetAutoContributionAmount(std::move(callback)); } void RewardsServiceImpl::FetchFavIcon(const std::string& url, @@ -1746,7 +1743,7 @@ void RewardsServiceImpl::GetPublisherBanner( return DeferCallback(FROM_HERE, std::move(callback), nullptr); } - ledger_->GetPublisherBanner( + engine_->GetPublisherBanner( publisher_id, base::BindOnce(&RewardsServiceImpl::OnPublisherBanner, AsWeakPtr(), std::move(callback))); } @@ -1759,7 +1756,7 @@ void RewardsServiceImpl::OnPublisherBanner(GetPublisherBannerCallback callback, void RewardsServiceImpl::OnSaveRecurringTip(OnTipCallback callback, mojom::Result result) { for (auto& observer : observers_) { - observer.OnRecurringTipSaved(this, result == mojom::Result::LEDGER_OK); + observer.OnRecurringTipSaved(this, result == mojom::Result::OK); } std::move(callback).Run(result); @@ -1769,8 +1766,7 @@ void RewardsServiceImpl::SaveRecurringTip(const std::string& publisher_key, double amount, OnTipCallback callback) { if (!Connected()) { - return DeferCallback(FROM_HERE, std::move(callback), - mojom::Result::LEDGER_ERROR); + return DeferCallback(FROM_HERE, std::move(callback), mojom::Result::FAILED); } mojom::RecurringTipPtr info = mojom::RecurringTip::New(); @@ -1778,7 +1774,7 @@ void RewardsServiceImpl::SaveRecurringTip(const std::string& publisher_key, info->amount = amount; info->created_at = GetCurrentTimestamp(); - ledger_->SaveRecurringTip( + engine_->SaveRecurringTip( std::move(info), base::BindOnce(&RewardsServiceImpl::OnSaveRecurringTip, AsWeakPtr(), std::move(callback))); } @@ -1792,7 +1788,7 @@ void RewardsServiceImpl::SendContribution( return DeferCallback(FROM_HERE, std::move(callback), false); } - ledger_->SendContribution( + engine_->SendContribution( publisher_key, amount, set_monthly, base::BindOnce(&RewardsServiceImpl::OnContributionSent, AsWeakPtr(), set_monthly, std::move(callback))); @@ -1822,7 +1818,7 @@ void RewardsServiceImpl::UpdateMediaDuration( return; } - ledger_->UpdateMediaDuration(window_id, publisher_key, duration, first_visit); + engine_->UpdateMediaDuration(window_id, publisher_key, duration, first_visit); } void RewardsServiceImpl::IsPublisherRegistered( @@ -1832,29 +1828,29 @@ void RewardsServiceImpl::IsPublisherRegistered( return DeferCallback(FROM_HERE, std::move(callback), false); } - ledger_->IsPublisherRegistered(publisher_id, std::move(callback)); + engine_->IsPublisherRegistered(publisher_id, std::move(callback)); } void RewardsServiceImpl::GetPublisherInfo( const std::string& publisher_key, GetPublisherInfoCallback callback) { if (!Connected()) { - return DeferCallback(FROM_HERE, std::move(callback), - mojom::Result::LEDGER_ERROR, nullptr); + return DeferCallback(FROM_HERE, std::move(callback), mojom::Result::FAILED, + nullptr); } - ledger_->GetPublisherInfo(publisher_key, std::move(callback)); + engine_->GetPublisherInfo(publisher_key, std::move(callback)); } void RewardsServiceImpl::GetPublisherPanelInfo( const std::string& publisher_key, GetPublisherInfoCallback callback) { if (!Connected()) { - return DeferCallback(FROM_HERE, std::move(callback), - mojom::Result::LEDGER_ERROR, nullptr); + return DeferCallback(FROM_HERE, std::move(callback), mojom::Result::FAILED, + nullptr); } - ledger_->GetPublisherPanelInfo(publisher_key, std::move(callback)); + engine_->GetPublisherPanelInfo(publisher_key, std::move(callback)); } void RewardsServiceImpl::SavePublisherInfo( @@ -1862,11 +1858,10 @@ void RewardsServiceImpl::SavePublisherInfo( mojom::PublisherInfoPtr publisher_info, SavePublisherInfoCallback callback) { if (!Connected()) { - return DeferCallback(FROM_HERE, std::move(callback), - mojom::Result::LEDGER_ERROR); + return DeferCallback(FROM_HERE, std::move(callback), mojom::Result::FAILED); } - ledger_->SavePublisherInfo(window_id, std::move(publisher_info), + engine_->SavePublisherInfo(window_id, std::move(publisher_info), std::move(callback)); } @@ -1877,7 +1872,7 @@ void RewardsServiceImpl::GetRecurringTips( std::vector()); } - ledger_->GetRecurringTips(std::move(callback)); + engine_->GetRecurringTips(std::move(callback)); } void RewardsServiceImpl::GetOneTimeTips(GetOneTimeTipsCallback callback) { @@ -1886,11 +1881,11 @@ void RewardsServiceImpl::GetOneTimeTips(GetOneTimeTipsCallback callback) { std::vector()); } - ledger_->GetOneTimeTips(std::move(callback)); + engine_->GetOneTimeTips(std::move(callback)); } void RewardsServiceImpl::OnRecurringTip(const mojom::Result result) { - bool success = result == mojom::Result::LEDGER_OK; + bool success = result == mojom::Result::OK; for (auto& observer : observers_) { observer.OnRecurringTipRemoved(this, success); } @@ -1902,7 +1897,7 @@ void RewardsServiceImpl::RemoveRecurringTip( return; } - ledger_->RemoveRecurringTip( + engine_->RemoveRecurringTip( publisher_key, base::BindOnce(&RewardsServiceImpl::OnRecurringTip, AsWeakPtr())); } @@ -1910,7 +1905,7 @@ void RewardsServiceImpl::RemoveRecurringTip( void RewardsServiceImpl::OnSetPublisherExclude(const std::string& publisher_key, const bool exclude, const mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { return; } @@ -1929,7 +1924,7 @@ void RewardsServiceImpl::SetPublisherExclude( mojom::PublisherExclude status = exclude ? mojom::PublisherExclude::EXCLUDED : mojom::PublisherExclude::INCLUDED; - ledger_->SetPublisherExclude( + engine_->SetPublisherExclude( publisher_key, status, base::BindOnce(&RewardsServiceImpl::OnSetPublisherExclude, AsWeakPtr(), publisher_key, exclude)); @@ -1994,7 +1989,7 @@ void RewardsServiceImpl::WriteDiagnosticLog(const std::string& file, const int line, const int verbose_level, const std::string& message) { - if (ledger_for_testing_ || resetting_rewards_) { + if (engine_for_testing_ || resetting_rewards_) { return; } @@ -2045,9 +2040,9 @@ void RewardsServiceImpl::Log(const std::string& file, } } -mojom::LedgerOptionsPtr RewardsServiceImpl::HandleFlags( +mojom::RewardsEngineOptionsPtr RewardsServiceImpl::HandleFlags( const RewardsFlags& flags) { - auto options = mojom::LedgerOptions::New(); + auto options = mojom::RewardsEngineOptions::New(); if (flags.environment) { switch (*flags.environment) { @@ -2093,7 +2088,7 @@ void RewardsServiceImpl::GetRewardsInternalsInfo( return DeferCallback(FROM_HERE, std::move(callback), nullptr); } - ledger_->GetRewardsInternalsInfo(std::move(callback)); + engine_->GetRewardsInternalsInfo(std::move(callback)); } void RewardsServiceImpl::OnTip(const std::string& publisher_key, @@ -2101,8 +2096,7 @@ void RewardsServiceImpl::OnTip(const std::string& publisher_key, bool recurring, OnTipCallback callback) { if (!Connected()) { - return DeferCallback(FROM_HERE, std::move(callback), - mojom::Result::LEDGER_ERROR); + return DeferCallback(FROM_HERE, std::move(callback), mojom::Result::FAILED); } RecordBackendP3AStats(/*delay_report*/ true); @@ -2111,35 +2105,35 @@ void RewardsServiceImpl::OnTip(const std::string& publisher_key, return SaveRecurringTip(publisher_key, amount, std::move(callback)); } - ledger_->OneTimeTip(publisher_key, amount, std::move(callback)); + engine_->OneTimeTip(publisher_key, amount, std::move(callback)); } bool RewardsServiceImpl::Connected() const { - return ledger_.is_bound(); + return engine_.is_bound(); } void RewardsServiceImpl::StartProcessForTesting(base::OnceClosure callback) { ready_->Post(FROM_HERE, std::move(callback)); - StartLedgerProcessIfNecessary(); + StartEngineProcessIfNecessary(); } -void RewardsServiceImpl::SetLedgerEnvForTesting() { - ledger_for_testing_ = true; +void RewardsServiceImpl::SetEngineEnvForTesting() { + engine_for_testing_ = true; } -void RewardsServiceImpl::SetLedgerStateTargetVersionForTesting(int version) { - ledger_state_target_version_for_testing_ = version; +void RewardsServiceImpl::SetEngineStateTargetVersionForTesting(int version) { + engine_state_target_version_for_testing_ = version; } -void RewardsServiceImpl::PrepareLedgerEnvForTesting( - mojom::LedgerOptions& options) { - if (!ledger_for_testing_) { +void RewardsServiceImpl::PrepareEngineEnvForTesting( + mojom::RewardsEngineOptions& options) { + if (!engine_for_testing_) { return; } options.is_testing = true; options.state_migration_target_version_for_testing = - ledger_state_target_version_for_testing_; + engine_state_target_version_for_testing_; options.retry_interval = 1; profile_->GetPrefs()->SetInteger(prefs::kMinVisitTime, 1); @@ -2150,7 +2144,7 @@ void RewardsServiceImpl::StartContributionsForTesting() { return; } - ledger_->StartContributionsForTesting(); // IN-TEST + engine_->StartContributionsForTesting(); // IN-TEST } void RewardsServiceImpl::GetEnvironment(GetEnvironmentCallback callback) { @@ -2158,7 +2152,7 @@ void RewardsServiceImpl::GetEnvironment(GetEnvironmentCallback callback) { return DeferCallback(FROM_HERE, std::move(callback), GetDefaultServerEnvironment()); } - ledger_->GetEnvironment(std::move(callback)); + engine_->GetEnvironment(std::move(callback)); } p3a::ConversionMonitor* RewardsServiceImpl::GetP3AConversionMonitor() { @@ -2197,7 +2191,7 @@ void RewardsServiceImpl::RefreshPublisher( return DeferCallback(FROM_HERE, std::move(callback), mojom::PublisherStatus::NOT_VERIFIED, ""); } - ledger_->RefreshPublisher( + engine_->RefreshPublisher( publisher_key, base::BindOnce(&RewardsServiceImpl::OnRefreshPublisher, AsWeakPtr(), std::move(callback), publisher_key)); @@ -2222,7 +2216,7 @@ void RewardsServiceImpl::SetInlineTippingPlatformEnabled( } const auto platform = ConvertInlineTipStringToPlatform(key); - ledger_->SetInlineTippingPlatformEnabled(platform, enabled); + engine_->SetInlineTippingPlatformEnabled(platform, enabled); } void RewardsServiceImpl::GetInlineTippingPlatformEnabled( @@ -2233,7 +2227,7 @@ void RewardsServiceImpl::GetInlineTippingPlatformEnabled( } const auto platform = ConvertInlineTipStringToPlatform(key); - ledger_->GetInlineTippingPlatformEnabled(platform, std::move(callback)); + engine_->GetInlineTippingPlatformEnabled(platform, std::move(callback)); } void RewardsServiceImpl::GetShareURL( @@ -2243,7 +2237,7 @@ void RewardsServiceImpl::GetShareURL( return DeferCallback(FROM_HERE, std::move(callback), ""); } - ledger_->GetShareURL(args, std::move(callback)); + engine_->GetShareURL(args, std::move(callback)); } void RewardsServiceImpl::FetchBalance(FetchBalanceCallback callback) { @@ -2253,7 +2247,7 @@ void RewardsServiceImpl::FetchBalance(FetchBalanceCallback callback) { base::unexpected(mojom::FetchBalanceError::kUnexpected)); } - ledger_->FetchBalance(std::move(callback)); + engine_->FetchBalance(std::move(callback)); } bool RewardsServiceImpl::IsAutoContributeSupported() const { @@ -2279,7 +2273,7 @@ void RewardsServiceImpl::GetExternalWallet(GetExternalWalletCallback callback) { base::unexpected(mojom::GetExternalWalletError::kUnexpected)); } - ledger_->GetExternalWallet(GetExternalWalletType(), std::move(callback)); + engine_->GetExternalWallet(GetExternalWalletType(), std::move(callback)); } void RewardsServiceImpl::ConnectExternalWallet( @@ -2318,7 +2312,7 @@ void RewardsServiceImpl::ConnectExternalWallet( it.GetUnescapedValue(); } - ledger_->ConnectExternalWallet(wallet_type, query_parameters, + engine_->ConnectExternalWallet(wallet_type, query_parameters, std::move(inner_callback)); } @@ -2326,7 +2320,7 @@ void RewardsServiceImpl::ShowNotification(const std::string& type, const std::vector& args, ShowNotificationCallback callback) { if (type.empty()) { - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -2334,11 +2328,10 @@ void RewardsServiceImpl::ShowNotification(const std::string& type, notification_args.push_back(type); notification_args.insert(notification_args.end(), args.begin(), args.end()); notification_service_->AddNotification( - RewardsNotificationService::REWARDS_NOTIFICATION_GENERAL_LEDGER, - notification_args, - "rewards_notification_general_ledger_" + type); + RewardsNotificationService::REWARDS_NOTIFICATION_GENERAL, + notification_args, "rewards_notification_general_" + type); - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); } void RewardsServiceImpl::RecordBackendP3AStats(bool delay_report) { @@ -2389,7 +2382,7 @@ void RewardsServiceImpl::GetAllContributionsForP3A() { return; } - ledger_->GetAllContributions(base::BindOnce( + engine_->GetAllContributions(base::BindOnce( &RewardsServiceImpl::OnRecordBackendP3AStatsContributions, AsWeakPtr())); } @@ -2483,7 +2476,7 @@ void RewardsServiceImpl::GetMonthlyReport( return DeferCallback(FROM_HERE, std::move(callback), nullptr); } - ledger_->GetMonthlyReport( + engine_->GetMonthlyReport( static_cast(month), year, base::BindOnce(&RewardsServiceImpl::OnGetMonthlyReport, AsWeakPtr(), std::move(callback))); @@ -2504,8 +2497,8 @@ void RewardsServiceImpl::ReconcileStampReset() { void RewardsServiceImpl::RunDBTransaction(mojom::DBTransactionPtr transaction, RunDBTransactionCallback callback) { - DCHECK(ledger_database_); - ledger_database_.AsyncCall(&internal::LedgerDatabase::RunTransaction) + DCHECK(rewards_database_); + rewards_database_.AsyncCall(&internal::RewardsDatabase::RunTransaction) .WithArgs(std::move(transaction)) .Then(base::BindOnce(&RewardsServiceImpl::OnRunDBTransaction, AsWeakPtr(), std::move(callback))); @@ -2530,7 +2523,7 @@ void RewardsServiceImpl::GetAllMonthlyReportIds( std::vector()); } - ledger_->GetAllMonthlyReportIds(std::move(callback)); + engine_->GetAllMonthlyReportIds(std::move(callback)); } void RewardsServiceImpl::GetAllContributions( @@ -2540,7 +2533,7 @@ void RewardsServiceImpl::GetAllContributions( std::vector()); } - ledger_->GetAllContributions(std::move(callback)); + engine_->GetAllContributions(std::move(callback)); } void RewardsServiceImpl::GetAllPromotions(GetAllPromotionsCallback callback) { @@ -2549,7 +2542,7 @@ void RewardsServiceImpl::GetAllPromotions(GetAllPromotionsCallback callback) { std::vector()); } - ledger_->GetAllPromotions( + engine_->GetAllPromotions( base::BindOnce(&RewardsServiceImpl::OnGetAllPromotions, AsWeakPtr(), std::move(callback))); } @@ -2578,11 +2571,9 @@ void RewardsServiceImpl::CompleteReset(SuccessCallback callback) { notification_service_->DeleteAllNotifications(true); auto stop_callback = - base::BindOnce( - &RewardsServiceImpl::OnStopLedgerForCompleteReset, - AsWeakPtr(), - std::move(callback)); - StopLedger(std::move(stop_callback)); + base::BindOnce(&RewardsServiceImpl::OnStopEngineForCompleteReset, + AsWeakPtr(), std::move(callback)); + StopEngine(std::move(stop_callback)); } void RewardsServiceImpl::OnFilesDeletedForCompleteReset( @@ -2622,8 +2613,7 @@ void RewardsServiceImpl::DeleteLog(DeleteLogCallback callback) { void RewardsServiceImpl::OnDiagnosticLogDeleted(DeleteLogCallback callback, bool success) { - const auto result = - success ? mojom::Result::LEDGER_OK : mojom::Result::LEDGER_ERROR; + const auto result = success ? mojom::Result::OK : mojom::Result::FAILED; std::move(callback).Run(result); } @@ -2633,7 +2623,7 @@ void RewardsServiceImpl::GetEventLogs(GetEventLogsCallback callback) { std::vector()); } - ledger_->GetEventLogs(std::move(callback)); + engine_->GetEventLogs(std::move(callback)); } void RewardsServiceImpl::EncryptString(const std::string& value, @@ -2661,7 +2651,7 @@ void RewardsServiceImpl::GetRewardsWallet(GetRewardsWalletCallback callback) { return DeferCallback(FROM_HERE, std::move(callback), nullptr); } - ledger_->GetRewardsWallet(std::move(callback)); + engine_->GetRewardsWallet(std::move(callback)); } bool RewardsServiceImpl::IsBitFlyerCountry() const { diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h index ae2199f37de..f3e8dbf0279 100644 --- a/components/brave_rewards/browser/rewards_service_impl.h +++ b/components/brave_rewards/browser/rewards_service_impl.h @@ -29,10 +29,10 @@ #include "brave/components/brave_rewards/browser/diagnostic_log.h" #include "brave/components/brave_rewards/browser/rewards_p3a.h" #include "brave/components/brave_rewards/browser/rewards_service.h" -#include "brave/components/brave_rewards/common/mojom/bat_ledger.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom.h" #include "brave/components/brave_rewards/common/rewards_flags.h" #include "brave/components/greaselion/browser/buildflags/buildflags.h" -#include "brave/components/services/bat_ledger/public/interfaces/ledger_factory.mojom.h" +#include "brave/components/services/bat_rewards/public/interfaces/rewards_engine_factory.mojom.h" #include "build/build_config.h" #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h" #include "components/prefs/pref_change_registrar.h" @@ -70,8 +70,7 @@ namespace brave_rewards { class RewardsFlagBrowserTest; namespace internal { -class Ledger; -class LedgerDatabase; +class RewardsDatabase; } // namespace internal class RewardsNotificationServiceImpl; @@ -87,10 +86,10 @@ using GetTestResponseCallback = base::RepeatingCallback* headers)>; -using StopLedgerCallback = base::OnceCallback; +using StopEngineCallback = base::OnceCallback; class RewardsServiceImpl : public RewardsService, - public mojom::LedgerClient, + public mojom::RewardsEngineClient, #if BUILDFLAG(ENABLE_GREASELION) public greaselion::GreaselionService::Observer, #endif @@ -197,7 +196,7 @@ class RewardsServiceImpl : public RewardsService, p3a::ConversionMonitor* GetP3AConversionMonitor() override; - mojom::LedgerOptionsPtr HandleFlags(const RewardsFlags& flags); + mojom::RewardsEngineOptionsPtr HandleFlags(const RewardsFlags& flags); void GetAutoContributeProperties( GetAutoContributePropertiesCallback callback) override; @@ -293,7 +292,7 @@ class RewardsServiceImpl : public RewardsService, void GetEventLogs(GetEventLogsCallback callback) override; - void StopLedger(StopLedgerCallback callback); + void StopEngine(StopEngineCallback callback); void EncryptString(const std::string& value, EncryptStringCallback callback) override; @@ -304,9 +303,9 @@ class RewardsServiceImpl : public RewardsService, void GetRewardsWallet(GetRewardsWalletCallback callback) override; // Testing methods - void SetLedgerEnvForTesting(); - void SetLedgerStateTargetVersionForTesting(int version); - void PrepareLedgerEnvForTesting(mojom::LedgerOptions& options); + void SetEngineEnvForTesting(); + void SetEngineStateTargetVersionForTesting(int version); + void PrepareEngineEnvForTesting(mojom::RewardsEngineOptions& options); void StartContributionsForTesting(); void ForTestingSetTestResponseCallback( const GetTestResponseCallback& callback); @@ -330,11 +329,11 @@ class RewardsServiceImpl : public RewardsService, void CheckPreferences(); - void StartLedgerProcessIfNecessary(); + void StartEngineProcessIfNecessary(); - void OnStopLedger(StopLedgerCallback callback, const mojom::Result result); + void OnStopEngine(StopEngineCallback callback, const mojom::Result result); - void OnStopLedgerForCompleteReset(SuccessCallback callback, + void OnStopEngineForCompleteReset(SuccessCallback callback, const mojom::Result result); void OnDiagnosticLogDeletedForCompleteReset(SuccessCallback callback, @@ -342,9 +341,9 @@ class RewardsServiceImpl : public RewardsService, void Reset(); - void OnLedgerCreated(); + void OnEngineCreated(); - void OnLedgerStateLoaded(LoadLedgerStateCallback callback, + void OnLegacyStateLoaded(LoadLegacyStateCallback callback, std::pair data); void OnPublisherStateLoaded(LoadPublisherStateCallback callback, const std::string& data); @@ -372,7 +371,7 @@ class RewardsServiceImpl : public RewardsService, const bool exclude, const mojom::Result result); - void OnLedgerInitialized(mojom::Result result); + void OnEngineInitialized(mojom::Result result); void OnClaimPromotion(ClaimPromotionCallback callback, const mojom::Result result, @@ -391,13 +390,13 @@ class RewardsServiceImpl : public RewardsService, const std::string& token, const bool attestation_passed); - // mojom::LedgerClient + // mojom::RewardsEngineClient void OnReconcileComplete(mojom::Result result, mojom::ContributionInfoPtr contribution) override; void OnAttestPromotion(AttestPromotionCallback callback, const mojom::Result result, mojom::PromotionPtr promotion); - void LoadLedgerState(LoadLedgerStateCallback callback) override; + void LoadLegacyState(LoadLegacyStateCallback callback) override; void LoadPublisherState(LoadPublisherStateCallback callback) override; void LoadURL(mojom::UrlRequestPtr request, LoadURLCallback callback) override; void SetPublisherMinVisits(int visits) const override; @@ -512,7 +511,7 @@ class RewardsServiceImpl : public RewardsService, void DeleteLog(DeleteLogCallback callback) override; - // end mojom::LedgerClient + // end mojom::RewardsEngineClient void OnRefreshPublisher(RefreshPublisherCallback callback, const std::string& publisher_key, @@ -572,19 +571,19 @@ class RewardsServiceImpl : public RewardsService, nullptr; // NOT OWNED bool greaselion_enabled_ = false; #endif - mojo::AssociatedReceiver receiver_; - mojo::AssociatedRemote ledger_; - mojo::Remote ledger_factory_; + mojo::AssociatedReceiver receiver_; + mojo::AssociatedRemote engine_; + mojo::Remote engine_factory_; const scoped_refptr file_task_runner_; const scoped_refptr json_sanitizer_task_runner_; - const base::FilePath ledger_state_path_; + const base::FilePath legacy_state_path_; const base::FilePath publisher_state_path_; const base::FilePath publisher_info_db_path_; const base::FilePath publisher_list_path_; std::unique_ptr diagnostic_log_; - base::SequenceBound ledger_database_; + base::SequenceBound rewards_database_; std::unique_ptr notification_service_; std::unique_ptr extension_observer_; @@ -596,8 +595,8 @@ class RewardsServiceImpl : public RewardsService, std::unique_ptr notification_periodic_timer_; PrefChangeRegistrar profile_pref_change_registrar_; - bool ledger_for_testing_ = false; - int ledger_state_target_version_for_testing_ = -1; + bool engine_for_testing_ = false; + int engine_state_target_version_for_testing_ = -1; bool resetting_rewards_ = false; int persist_log_level_ = 0; base::WallClockTimer p3a_daily_timer_; diff --git a/components/brave_rewards/browser/service_sandbox_type.h b/components/brave_rewards/browser/service_sandbox_type.h index 0429777fac7..9e95f0cb571 100644 --- a/components/brave_rewards/browser/service_sandbox_type.h +++ b/components/brave_rewards/browser/service_sandbox_type.h @@ -10,12 +10,12 @@ #include "content/public/browser/service_process_host.h" namespace brave_rewards::mojom { -class LedgerFactory; +class RewardsEngineFactory; } // namespace brave_rewards::mojom template <> inline sandbox::mojom::Sandbox -content::GetServiceSandboxType() { +content::GetServiceSandboxType() { #if !BUILDFLAG(IS_ANDROID) return sandbox::mojom::Sandbox::kNoSandbox; #else diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_contribution.cc b/components/brave_rewards/browser/test/common/rewards_browsertest_contribution.cc index 2ca8b590c84..9bb9da5bee0 100644 --- a/components/brave_rewards/browser/test/common/rewards_browsertest_contribution.cc +++ b/components/brave_rewards/browser/test/common/rewards_browsertest_contribution.cc @@ -162,7 +162,7 @@ void RewardsBrowserTestContribution::TipPublisher( ASSERT_EQ(static_cast(multiple_tip_reconcile_status_.size()), number_of_contributions); for (const auto status : multiple_tip_reconcile_status_) { - ASSERT_EQ(status, mojom::Result::LEDGER_OK); + ASSERT_EQ(status, mojom::Result::OK); } if (set_monthly) { @@ -172,7 +172,7 @@ void RewardsBrowserTestContribution::TipPublisher( // Wait for reconciliation to complete WaitForTipReconcileCompleted(); - ASSERT_EQ(tip_reconcile_status_, mojom::Result::LEDGER_OK); + ASSERT_EQ(tip_reconcile_status_, mojom::Result::OK); } VerifyTip(amount, set_monthly); @@ -233,7 +233,7 @@ void RewardsBrowserTestContribution::OnReconcileComplete( const double amount, const mojom::RewardsType type, const mojom::ContributionProcessor processor) { - if (result == mojom::Result::LEDGER_OK) { + if (result == mojom::Result::OK) { UpdateContributionBalance( amount, true, @@ -261,7 +261,7 @@ void RewardsBrowserTestContribution::OnReconcileComplete( if (type == mojom::RewardsType::ONE_TIME_TIP || type == mojom::RewardsType::RECURRING_TIP) { - if (result == mojom::Result::LEDGER_OK) { + if (result == mojom::Result::OK) { reconciled_tip_total_ += amount; } diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_contribution.h b/components/brave_rewards/browser/test/common/rewards_browsertest_contribution.h index 16adb616250..1f810252fc4 100644 --- a/components/brave_rewards/browser/test/common/rewards_browsertest_contribution.h +++ b/components/brave_rewards/browser/test/common/rewards_browsertest_contribution.h @@ -113,7 +113,7 @@ class RewardsBrowserTestContribution : public RewardsServiceObserver { bool tip_reconcile_completed_ = false; std::unique_ptr wait_for_tip_completed_loop_; - mojom::Result tip_reconcile_status_ = mojom::Result::LEDGER_ERROR; + mojom::Result tip_reconcile_status_ = mojom::Result::FAILED; bool recurring_tip_saved_ = false; std::unique_ptr wait_for_recurring_tip_saved_loop_; bool multiple_tip_reconcile_completed_ = false; @@ -128,7 +128,7 @@ class RewardsBrowserTestContribution : public RewardsServiceObserver { std::vector multiple_ac_reconcile_status_ = {}; bool ac_reconcile_completed_ = false; std::unique_ptr wait_for_ac_completed_loop_; - mojom::Result ac_reconcile_status_ = mojom::Result::LEDGER_ERROR; + mojom::Result ac_reconcile_status_ = mojom::Result::FAILED; raw_ptr browser_ = nullptr; // NOT OWNED raw_ptr rewards_service_ = nullptr; // NOT OWNED diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_promotion.cc b/components/brave_rewards/browser/test/common/rewards_browsertest_promotion.cc index df118b7a5be..360ebf86855 100644 --- a/components/brave_rewards/browser/test/common/rewards_browsertest_promotion.cc +++ b/components/brave_rewards/browser/test/common/rewards_browsertest_promotion.cc @@ -40,7 +40,7 @@ void RewardsBrowserTestPromotion::OnFetchPromotions( RewardsService* rewards_service, const mojom::Result result, const std::vector& list) { - ASSERT_EQ(result, mojom::Result::LEDGER_OK); + ASSERT_EQ(result, mojom::Result::OK); initialized_ = true; if (wait_for_initialization_loop_) { @@ -64,7 +64,7 @@ void RewardsBrowserTestPromotion::OnPromotionFinished( const mojom::Result result, mojom::PromotionPtr promotion) { if (should_succeed_) { - ASSERT_EQ(static_cast(result), mojom::Result::LEDGER_OK); + ASSERT_EQ(static_cast(result), mojom::Result::OK); } finished_ = true; diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_util.cc b/components/brave_rewards/browser/test/common/rewards_browsertest_util.cc index b50eeb2c711..ce0066695e9 100644 --- a/components/brave_rewards/browser/test/common/rewards_browsertest_util.cc +++ b/components/brave_rewards/browser/test/common/rewards_browsertest_util.cc @@ -16,7 +16,7 @@ #include "base/test/bind.h" #include "brave/browser/brave_rewards/rewards_service_factory.h" #include "brave/components/brave_rewards/browser/rewards_service_observer.h" -#include "brave/components/brave_rewards/common/mojom/bat_ledger.mojom-test-utils.h" +#include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom-test-utils.h" #include "brave/components/brave_rewards/common/pref_names.h" #include "brave/components/brave_rewards/core/mojom_structs.h" #include "brave/components/constants/brave_paths.h" @@ -135,9 +135,9 @@ void NavigateToPublisherAndWaitForUpdate(Browser* browser, waiter.Wait(); } -void WaitForLedgerStop(RewardsServiceImpl* rewards_service) { +void WaitForEngineStop(RewardsServiceImpl* rewards_service) { base::RunLoop run_loop; - rewards_service->StopLedger(base::BindLambdaForTesting( + rewards_service->StopEngine(base::BindLambdaForTesting( [&](const mojom::Result) { run_loop.Quit(); })); run_loop.Run(); } @@ -184,8 +184,8 @@ absl::optional EncryptPrefString( const std::string& value) { DCHECK(rewards_service); - auto encrypted = - mojom::LedgerClientAsyncWaiter(rewards_service).EncryptString(value); + auto encrypted = mojom::RewardsEngineClientAsyncWaiter(rewards_service) + .EncryptString(value); if (!encrypted) { return {}; } @@ -203,7 +203,8 @@ absl::optional DecryptPrefString( return {}; } - return mojom::LedgerClientAsyncWaiter(rewards_service).DecryptString(decoded); + return mojom::RewardsEngineClientAsyncWaiter(rewards_service) + .DecryptString(decoded); } } // namespace brave_rewards::test_util diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_util.h b/components/brave_rewards/browser/test/common/rewards_browsertest_util.h index 4d3808fe2ba..0af819d8ae7 100644 --- a/components/brave_rewards/browser/test/common/rewards_browsertest_util.h +++ b/components/brave_rewards/browser/test/common/rewards_browsertest_util.h @@ -50,7 +50,7 @@ void NavigateToPublisherAndWaitForUpdate(Browser* browser, net::EmbeddedTestServer* https_server, const std::string& publisher_key); -void WaitForLedgerStop(RewardsServiceImpl* rewards_service); +void WaitForEngineStop(RewardsServiceImpl* rewards_service); void WaitForAutoContributeVisitTime(); @@ -60,7 +60,7 @@ void CreateRewardsWallet(RewardsServiceImpl* rewards_service, void SetOnboardingBypassed(Browser* browser, bool bypassed = true); // TODO(zenparsing): Remove these functions when browser tests that read or -// write encrypted "state" are migrated to the bat ledger library. +// write encrypted "state" are migrated to the bat rewards library. absl::optional EncryptPrefString( RewardsServiceImpl* rewards_service, const std::string& value); diff --git a/components/brave_rewards/browser/test/rewards_browsertest.cc b/components/brave_rewards/browser/test/rewards_browsertest.cc index 895ec008071..2955063c41d 100644 --- a/components/brave_rewards/browser/test/rewards_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_browsertest.cc @@ -100,7 +100,7 @@ class RewardsBrowserTest : public InProcessBrowserTest { base::BindRepeating( &RewardsBrowserTest::GetTestResponse, base::Unretained(this))); - rewards_service_->SetLedgerEnvForTesting(); + rewards_service_->SetEngineEnvForTesting(); // Other contribution_->Initialize(browser(), rewards_service_); diff --git a/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc b/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc index 9ae70067be0..4aaf778a90d 100644 --- a/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc @@ -72,7 +72,7 @@ class RewardsContributionBrowserTest : public InProcessBrowserTest { base::BindRepeating( &RewardsContributionBrowserTest::GetTestResponse, base::Unretained(this))); - rewards_service_->SetLedgerEnvForTesting(); + rewards_service_->SetEngineEnvForTesting(); // Other promotion_->Initialize(browser(), rewards_service_); @@ -142,7 +142,7 @@ IN_PROC_BROWSER_TEST_F(RewardsContributionBrowserTest, AutoContribution) { rewards_service_->StartContributionsForTesting(); contribution_->WaitForACReconcileCompleted(); - ASSERT_EQ(contribution_->GetACStatus(), mojom::Result::LEDGER_OK); + ASSERT_EQ(contribution_->GetACStatus(), mojom::Result::OK); contribution_->IsBalanceCorrect(); @@ -222,7 +222,7 @@ IN_PROC_BROWSER_TEST_F(RewardsContributionBrowserTest, rewards_service_->StartContributionsForTesting(); contribution_->WaitForACReconcileCompleted(); - ASSERT_EQ(contribution_->GetACStatus(), mojom::Result::LEDGER_OK); + ASSERT_EQ(contribution_->GetACStatus(), mojom::Result::OK); contribution_->IsBalanceCorrect(); @@ -278,7 +278,7 @@ IN_PROC_BROWSER_TEST_F(RewardsContributionBrowserTest, rewards_service_->StartContributionsForTesting(); contribution_->WaitForACReconcileCompleted(); - ASSERT_EQ(contribution_->GetACStatus(), mojom::Result::LEDGER_OK); + ASSERT_EQ(contribution_->GetACStatus(), mojom::Result::OK); contribution_->IsBalanceCorrect(); @@ -399,7 +399,7 @@ IN_PROC_BROWSER_TEST_F(RewardsContributionBrowserTest, TipNonIntegralAmount) { rewards_service_->SendContribution("duckduckgo.com", 2.5, false, base::DoNothing()); contribution_->WaitForTipReconcileCompleted(); - ASSERT_EQ(contribution_->GetTipStatus(), mojom::Result::LEDGER_OK); + ASSERT_EQ(contribution_->GetTipStatus(), mojom::Result::OK); ASSERT_EQ(contribution_->GetReconcileTipTotal(), 2.5); } @@ -419,7 +419,7 @@ IN_PROC_BROWSER_TEST_F(RewardsContributionBrowserTest, base::DoNothing()); rewards_service_->StartContributionsForTesting(); contribution_->WaitForTipReconcileCompleted(); - ASSERT_EQ(contribution_->GetTipStatus(), mojom::Result::LEDGER_OK); + ASSERT_EQ(contribution_->GetTipStatus(), mojom::Result::OK); ASSERT_EQ(contribution_->GetReconcileTipTotal(), 2.5); } @@ -448,11 +448,11 @@ IN_PROC_BROWSER_TEST_F(RewardsContributionBrowserTest, // Wait for reconciliation to complete contribution_->WaitForTipReconcileCompleted(); - ASSERT_EQ(contribution_->GetTipStatus(), mojom::Result::LEDGER_OK); + ASSERT_EQ(contribution_->GetTipStatus(), mojom::Result::OK); // Wait for reconciliation to complete successfully contribution_->WaitForACReconcileCompleted(); - ASSERT_EQ(contribution_->GetACStatus(), mojom::Result::LEDGER_OK); + ASSERT_EQ(contribution_->GetACStatus(), mojom::Result::OK); // Make sure that balance is updated correctly contribution_->IsBalanceCorrect(); @@ -490,11 +490,11 @@ IN_PROC_BROWSER_TEST_F(RewardsContributionBrowserTest, // Wait for reconciliation to complete contribution_->WaitForMultipleTipReconcileCompleted(3); - ASSERT_EQ(contribution_->GetTipStatus(), mojom::Result::LEDGER_OK); + ASSERT_EQ(contribution_->GetTipStatus(), mojom::Result::OK); // Wait for reconciliation to complete successfully contribution_->WaitForACReconcileCompleted(); - ASSERT_EQ(contribution_->GetACStatus(), mojom::Result::LEDGER_OK); + ASSERT_EQ(contribution_->GetACStatus(), mojom::Result::OK); // Make sure that balance is updated correctly contribution_->IsBalanceCorrect(); @@ -542,8 +542,8 @@ IN_PROC_BROWSER_TEST_F(RewardsContributionBrowserTest, // Wait for reconciliation to complete successfully contribution_->WaitForMultipleACReconcileCompleted(2); auto statuses = contribution_->GetMultipleACStatus(); - ASSERT_EQ(statuses[0], mojom::Result::LEDGER_OK); - ASSERT_EQ(statuses[1], mojom::Result::LEDGER_OK); + ASSERT_EQ(statuses[0], mojom::Result::OK); + ASSERT_EQ(statuses[1], mojom::Result::OK); // Wait for UI to update with contribution test_util::WaitForElementToContain( diff --git a/components/brave_rewards/browser/test/rewards_flag_browsertest.cc b/components/brave_rewards/browser/test/rewards_flag_browsertest.cc index 975c37de002..81f0d884ca4 100644 --- a/components/brave_rewards/browser/test/rewards_flag_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_flag_browsertest.cc @@ -62,7 +62,7 @@ class RewardsFlagBrowserTest : public InProcessBrowserTest { base::BindRepeating( &RewardsFlagBrowserTest::GetTestResponse, base::Unretained(this))); - rewards_service_->SetLedgerEnvForTesting(); + rewards_service_->SetEngineEnvForTesting(); test_util::SetOnboardingBypassed(browser()); } diff --git a/components/brave_rewards/browser/test/rewards_notification_browsertest.cc b/components/brave_rewards/browser/test/rewards_notification_browsertest.cc index bdc600030bc..7db7b28a653 100644 --- a/components/brave_rewards/browser/test/rewards_notification_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_notification_browsertest.cc @@ -72,7 +72,7 @@ class RewardsNotificationBrowserTest base::BindRepeating( &RewardsNotificationBrowserTest::GetTestResponse, base::Unretained(this))); - rewards_service_->SetLedgerEnvForTesting(); + rewards_service_->SetEngineEnvForTesting(); // Other promotion_->Initialize(browser(), rewards_service_); diff --git a/components/brave_rewards/browser/test/rewards_p3a_browsertest.cc b/components/brave_rewards/browser/test/rewards_p3a_browsertest.cc index 076f4399329..4a95dab975c 100644 --- a/components/brave_rewards/browser/test/rewards_p3a_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_p3a_browsertest.cc @@ -70,7 +70,7 @@ class RewardsP3ABrowserTest : public InProcessBrowserTest, response_->LoadMocks(); rewards_service_->ForTestingSetTestResponseCallback(base::BindRepeating( &RewardsP3ABrowserTest::GetTestResponse, base::Unretained(this))); - rewards_service_->SetLedgerEnvForTesting(); + rewards_service_->SetEngineEnvForTesting(); // Other promotion_->Initialize(browser(), rewards_service_); @@ -168,7 +168,7 @@ IN_PROC_BROWSER_TEST_F(RewardsP3ABrowserTest, Duration) { p3a::AdsEnabledDuration::kStillEnabled, 1); - // We can't turn rewards back off without shutting down the ledger + // We can't turn rewards back off without shutting down the rewards // process, which interferes with other tests running in parallel. // Instead rely on the fact that the EnabledDuration P3A measurement // is made by the rewards service preference observer. diff --git a/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc b/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc index 89d3fdfe5e6..292beb397c0 100644 --- a/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc @@ -61,7 +61,7 @@ class RewardsPromotionBrowserTest : public InProcessBrowserTest { base::BindRepeating( &RewardsPromotionBrowserTest::GetTestResponse, base::Unretained(this))); - rewards_service_->SetLedgerEnvForTesting(); + rewards_service_->SetEngineEnvForTesting(); // Other promotion_->Initialize(browser(), rewards_service_); diff --git a/components/brave_rewards/browser/test/rewards_publisher_browsertest.cc b/components/brave_rewards/browser/test/rewards_publisher_browsertest.cc index 03c9608ae57..d1cc352a44e 100644 --- a/components/brave_rewards/browser/test/rewards_publisher_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_publisher_browsertest.cc @@ -61,7 +61,7 @@ class RewardsPublisherBrowserTest : public InProcessBrowserTest { base::BindRepeating( &RewardsPublisherBrowserTest::GetTestResponse, base::Unretained(this))); - rewards_service_->SetLedgerEnvForTesting(); + rewards_service_->SetEngineEnvForTesting(); test_util::SetOnboardingBypassed(browser()); } diff --git a/components/brave_rewards/browser/test/rewards_state_browsertest.cc b/components/brave_rewards/browser/test/rewards_state_browsertest.cc index 0e31c6df4a1..b446e2a165e 100644 --- a/components/brave_rewards/browser/test/rewards_state_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_state_browsertest.cc @@ -78,7 +78,7 @@ class RewardsStateBrowserTest : public InProcessBrowserTest { base::BindRepeating( &RewardsStateBrowserTest::GetTestResponse, base::Unretained(this))); - rewards_service_->SetLedgerEnvForTesting(); + rewards_service_->SetEngineEnvForTesting(); } void GetTestResponse( @@ -1125,7 +1125,7 @@ INSTANTIATE_TEST_SUITE_P( IN_PROC_BROWSER_TEST_P_(V10, Paths) { // testing migration from v9 to v10 profile_->GetPrefs()->SetInteger("brave.rewards.version", 9); - rewards_service_->SetLedgerStateTargetVersionForTesting(10); + rewards_service_->SetEngineStateTargetVersionForTesting(10); const auto& params = GetParam(); const auto& from_wallet = std::get<0>(params); @@ -1265,7 +1265,7 @@ INSTANTIATE_TEST_SUITE_P( IN_PROC_BROWSER_TEST_P_(V12, Paths) { // testing migration from v11 to v12 profile_->GetPrefs()->SetInteger("brave.rewards.version", 11); - rewards_service_->SetLedgerStateTargetVersionForTesting(12); + rewards_service_->SetEngineStateTargetVersionForTesting(12); const auto encrypted_from_wallet = test_util::EncryptPrefString(rewards_service_, std::get<1>(GetParam())); @@ -1351,7 +1351,7 @@ INSTANTIATE_TEST_SUITE_P( IN_PROC_BROWSER_TEST_P_(V13, Paths) { // testing migration from v12 to v13 profile_->GetPrefs()->SetInteger("brave.rewards.version", 12); - rewards_service_->SetLedgerStateTargetVersionForTesting(13); + rewards_service_->SetEngineStateTargetVersionForTesting(13); const auto wallet_status = std::get<1>(GetParam()); const auto encrypted_wallet = test_util::EncryptPrefString( diff --git a/components/brave_rewards/common/mojom/BUILD.gn b/components/brave_rewards/common/mojom/BUILD.gn index bb897cfa5b8..9d24e10c7e3 100644 --- a/components/brave_rewards/common/mojom/BUILD.gn +++ b/components/brave_rewards/common/mojom/BUILD.gn @@ -12,27 +12,27 @@ mojom("mojom") { ] deps = [ - ":ledger_interfaces", - ":ledger_types", + ":rewards_interfaces", + ":rewards_types", ] public_deps = [ "//mojo/public/mojom/base" ] } -mojom("ledger_interfaces") { +mojom("rewards_interfaces") { generate_java = true sources = [ - "ledger.mojom", - "ledger_database.mojom", - "ledger_endpoints.mojom", + "rewards.mojom", + "rewards_database.mojom", + "rewards_endpoints.mojom", ] public_deps = [ "//mojo/public/mojom/base" ] } -mojom("ledger_types") { +mojom("rewards_types") { generate_java = true - sources = [ "ledger_types.mojom" ] + sources = [ "rewards_types.mojom" ] cpp_typemaps = [ { @@ -54,19 +54,19 @@ mojom("ledger_types") { }, ] - traits_headers = [ "ledger_types_mojom_traits.h" ] - traits_sources = [ "ledger_types_mojom_traits.cc" ] + traits_headers = [ "rewards_types_mojom_traits.h" ] + traits_sources = [ "rewards_types_mojom_traits.cc" ] }, ] } mojom("interfaces") { - sources = [ "bat_ledger.mojom" ] + sources = [ "rewards_engine.mojom" ] public_deps = [ "//mojo/public/mojom/base" ] deps = [ - "//brave/components/brave_rewards/common/mojom:ledger_interfaces", - "//brave/components/brave_rewards/common/mojom:ledger_types", + "//brave/components/brave_rewards/common/mojom:rewards_interfaces", + "//brave/components/brave_rewards/common/mojom:rewards_types", ] } diff --git a/components/brave_rewards/common/mojom/ledger.mojom b/components/brave_rewards/common/mojom/rewards.mojom similarity index 99% rename from components/brave_rewards/common/mojom/ledger.mojom rename to components/brave_rewards/common/mojom/rewards.mojom index 9f6840b0d24..917f3c7517b 100644 --- a/components/brave_rewards/common/mojom/ledger.mojom +++ b/components/brave_rewards/common/mojom/rewards.mojom @@ -161,12 +161,11 @@ struct RewardsInternalsInfo { }; enum Result { - LEDGER_OK = 0, - LEDGER_ERROR = 1, + OK = 0, + FAILED = 1, NO_PUBLISHER_STATE = 2, - NO_LEDGER_STATE = 3, + NO_LEGACY_STATE = 3, INVALID_PUBLISHER_STATE = 4, - INVALID_LEDGER_STATE = 5, CAPTCHA_FAILED = 6, NO_PUBLISHER_LIST = 7, diff --git a/components/brave_rewards/common/mojom/ledger_database.mojom b/components/brave_rewards/common/mojom/rewards_database.mojom similarity index 100% rename from components/brave_rewards/common/mojom/ledger_database.mojom rename to components/brave_rewards/common/mojom/rewards_database.mojom diff --git a/components/brave_rewards/common/mojom/ledger_endpoints.mojom b/components/brave_rewards/common/mojom/rewards_endpoints.mojom similarity index 100% rename from components/brave_rewards/common/mojom/ledger_endpoints.mojom rename to components/brave_rewards/common/mojom/rewards_endpoints.mojom diff --git a/components/brave_rewards/common/mojom/bat_ledger.mojom b/components/brave_rewards/common/mojom/rewards_engine.mojom similarity index 74% rename from components/brave_rewards/common/mojom/bat_ledger.mojom rename to components/brave_rewards/common/mojom/rewards_engine.mojom index 978d59dd156..92f43e598d1 100644 --- a/components/brave_rewards/common/mojom/bat_ledger.mojom +++ b/components/brave_rewards/common/mojom/rewards_engine.mojom @@ -4,19 +4,19 @@ // You can obtain one at https://mozilla.org/MPL/2.0/. module brave_rewards.mojom; -import "brave/components/brave_rewards/common/mojom/ledger.mojom"; -import "brave/components/brave_rewards/common/mojom/ledger_database.mojom"; -import "brave/components/brave_rewards/common/mojom/ledger_types.mojom"; +import "brave/components/brave_rewards/common/mojom/rewards.mojom"; +import "brave/components/brave_rewards/common/mojom/rewards_database.mojom"; +import "brave/components/brave_rewards/common/mojom/rewards_types.mojom"; import "mojo/public/mojom/base/time.mojom"; import "mojo/public/mojom/base/values.mojom"; -interface Ledger { +interface RewardsEngine { Initialize() => (Result result); GetEnvironment() => (Environment environment); - CreateRewardsWallet(string country) => - (CreateRewardsWalletResult result); + CreateRewardsWallet(string country) + => (CreateRewardsWalletResult result); GetRewardsParameters() => (RewardsParameters properties); @@ -49,15 +49,18 @@ interface Ledger { string referrer, VisitData visit_data); - SetPublisherExclude(string publisher_key, PublisherExclude exclude) => (Result result); + SetPublisherExclude(string publisher_key, PublisherExclude exclude) + => (Result result); RestorePublishers() => (Result result); FetchPromotions() => (Result result, array promotion); - ClaimPromotion(string promotion_id, string payload) => (Result result, string response); + ClaimPromotion(string promotion_id, string payload) + => (Result result, string response); - AttestPromotion(string promotion_id, string solution) => (Result result, Promotion? promotion); + AttestPromotion(string promotion_id, string solution) + => (Result result, Promotion? promotion); SetPublisherMinVisitTime(int32 duration_in_seconds); @@ -67,17 +70,17 @@ interface Ledger { SetAutoContributeEnabled(bool enabled); - GetBalanceReport(ActivityMonth month, int32 year) => - (Result result, BalanceReportInfo report); + GetBalanceReport(ActivityMonth month, int32 year) + => (Result result, BalanceReportInfo report); GetPublisherActivityFromUrl(uint64 window_id, - VisitData visit_data, - string publisher_blob); + VisitData visit_data, + string publisher_blob); GetAutoContributionAmount() => (double contribution_amount); - GetPublisherBanner(string publisher_id) => - (PublisherBanner? banner); + GetPublisherBanner(string publisher_id) + => (PublisherBanner? banner); OneTimeTip(string publisher_id, double amount) => (Result result); @@ -90,15 +93,15 @@ interface Ledger { // DEPRECATED SaveRecurringTip(RecurringTip info) => (Result result); - SendContribution(string publisher_id, double amount, bool set_monthly) => - (bool success); + SendContribution(string publisher_id, double amount, bool set_monthly) + => (bool success); GetRecurringTips() => (array list); GetOneTimeTips() => (array list); - GetActivityInfoList(uint32 start, uint32 limit, ActivityInfoFilter? filter) => - (array list); + GetActivityInfoList(uint32 start, uint32 limit, ActivityInfoFilter? filter) + => (array list); GetPublishersVisitedCount() => (int32 count); @@ -108,21 +111,26 @@ interface Ledger { StartContributionsForTesting(); - UpdateMediaDuration(uint64 window_id, string publisher_key, uint64 duration, bool first_visit); + UpdateMediaDuration(uint64 window_id, + string publisher_key, + uint64 duration, + bool first_visit); IsPublisherRegistered(string publisher_id) => (bool registered); - GetPublisherInfo(string publisher_key) => (Result result, PublisherInfo? info); + GetPublisherInfo(string publisher_key) + => (Result result, PublisherInfo? info); - GetPublisherPanelInfo(string publisher_key) => - (Result result, PublisherInfo? info); + GetPublisherPanelInfo(string publisher_key) + => (Result result, PublisherInfo? info); - SavePublisherInfo(uint64 window_id, PublisherInfo publisher_info) => - (Result result); + SavePublisherInfo(uint64 window_id, PublisherInfo publisher_info) + => (Result result); SetInlineTippingPlatformEnabled(InlineTipsPlatforms platform, bool enabled); - GetInlineTippingPlatformEnabled(InlineTipsPlatforms platform) => (bool enabled); + GetInlineTippingPlatformEnabled(InlineTipsPlatforms platform) + => (bool enabled); GetShareURL(map args) => (string url); @@ -130,15 +138,19 @@ interface Ledger { GetExternalWallet(string wallet_type) => (GetExternalWalletResult result); - ConnectExternalWallet(string wallet_type, map args) => (ConnectExternalWalletResult result); + ConnectExternalWallet(string wallet_type, map args) + => (ConnectExternalWalletResult result); - GetTransactionReport(ActivityMonth month, int32 year) => (array list); + GetTransactionReport(ActivityMonth month, int32 year) + => (array list); - GetContributionReport(ActivityMonth month, int32 year) => (array list); + GetContributionReport(ActivityMonth month, int32 year) + => (array list); GetAllContributions() => (array list); - GetMonthlyReport(ActivityMonth month, int32 year) => (Result result, MonthlyReportInfo report); + GetMonthlyReport(ActivityMonth month, int32 year) + => (Result result, MonthlyReportInfo report); GetAllMonthlyReportIds() => (array ids); @@ -151,8 +163,8 @@ interface Ledger { GetRewardsWallet() => (RewardsWallet? wallet); }; -interface LedgerClient { - LoadLedgerState() => (Result result, string data); +interface RewardsEngineClient { + LoadLegacyState() => (Result result, string data); LoadPublisherState() => (Result result, string data); @@ -162,8 +174,8 @@ interface LedgerClient { PublisherInfo publisher_info, uint64 window_id); - FetchFavIcon(string url, string favicon_key) => (bool success, - string favicon_url); + FetchFavIcon(string url, string favicon_key) + => (bool success, string favicon_url); LoadURL(UrlRequest request) => (UrlResponse response); diff --git a/components/brave_rewards/common/mojom/ledger_types.mojom b/components/brave_rewards/common/mojom/rewards_types.mojom similarity index 100% rename from components/brave_rewards/common/mojom/ledger_types.mojom rename to components/brave_rewards/common/mojom/rewards_types.mojom diff --git a/components/brave_rewards/common/mojom/ledger_types_mojom_traits.cc b/components/brave_rewards/common/mojom/rewards_types_mojom_traits.cc similarity index 98% rename from components/brave_rewards/common/mojom/ledger_types_mojom_traits.cc rename to components/brave_rewards/common/mojom/rewards_types_mojom_traits.cc index a396fb465c6..5391510427e 100644 --- a/components/brave_rewards/common/mojom/ledger_types_mojom_traits.cc +++ b/components/brave_rewards/common/mojom/rewards_types_mojom_traits.cc @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "brave/components/brave_rewards/common/mojom/ledger_types_mojom_traits.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types_mojom_traits.h" #include -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom.h" namespace mojo { diff --git a/components/brave_rewards/common/mojom/ledger_types_mojom_traits.h b/components/brave_rewards/common/mojom/rewards_types_mojom_traits.h similarity index 89% rename from components/brave_rewards/common/mojom/ledger_types_mojom_traits.h rename to components/brave_rewards/common/mojom/rewards_types_mojom_traits.h index 157d1386864..8799f9bbeae 100644 --- a/components/brave_rewards/common/mojom/ledger_types_mojom_traits.h +++ b/components/brave_rewards/common/mojom/rewards_types_mojom_traits.h @@ -3,12 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_COMMON_MOJOM_LEDGER_TYPES_MOJOM_TRAITS_H_ -#define BRAVE_COMPONENTS_BRAVE_REWARDS_COMMON_MOJOM_LEDGER_TYPES_MOJOM_TRAITS_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_COMMON_MOJOM_REWARDS_TYPES_MOJOM_TRAITS_H_ +#define BRAVE_COMPONENTS_BRAVE_REWARDS_COMMON_MOJOM_REWARDS_TYPES_MOJOM_TRAITS_H_ #include "base/types/expected.h" -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom-forward.h" -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom-shared.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom-forward.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom-shared.h" #include "mojo/public/cpp/bindings/union_traits.h" namespace mojo { @@ -88,4 +88,4 @@ struct UnionTraits< } // namespace mojo -#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_COMMON_MOJOM_LEDGER_TYPES_MOJOM_TRAITS_H_ +#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_COMMON_MOJOM_REWARDS_TYPES_MOJOM_TRAITS_H_ diff --git a/components/brave_rewards/common/mojom/tip_panel.mojom b/components/brave_rewards/common/mojom/tip_panel.mojom index b16c055c175..fa003693df9 100644 --- a/components/brave_rewards/common/mojom/tip_panel.mojom +++ b/components/brave_rewards/common/mojom/tip_panel.mojom @@ -5,8 +5,8 @@ module brave_rewards.mojom; -import "brave/components/brave_rewards/common/mojom/ledger.mojom"; -import "brave/components/brave_rewards/common/mojom/ledger_types.mojom"; +import "brave/components/brave_rewards/common/mojom/rewards.mojom"; +import "brave/components/brave_rewards/common/mojom/rewards_types.mojom"; // Used by the WebUI page to bootstrap bidirectional communication. interface TipPanelHandlerFactory { diff --git a/components/brave_rewards/common/pref_names.h b/components/brave_rewards/common/pref_names.h index f732af3de39..dc8d4a54bbb 100644 --- a/components/brave_rewards/common/pref_names.h +++ b/components/brave_rewards/common/pref_names.h @@ -38,7 +38,7 @@ extern const char kBadgeText[]; extern const char kUseRewardsStagingServer[]; extern const char kExternalWalletType[]; -// Defined in native-ledger +// Defined in core extern const char kServerPublisherListStamp[]; extern const char kUpholdAnonAddress[]; // DEPRECATED extern const char kPromotionLastFetchStamp[]; diff --git a/components/brave_rewards/core/BUILD.gn b/components/brave_rewards/core/BUILD.gn index e746261d26b..471823fd7e0 100644 --- a/components/brave_rewards/core/BUILD.gn +++ b/components/brave_rewards/core/BUILD.gn @@ -51,7 +51,7 @@ buildflag_header("buildflags") { } group("core") { - public_deps = [ ":ledger" ] + public_deps = [ ":engine" ] } source_set("headers") { @@ -67,10 +67,10 @@ source_set("headers") { sources = [ "global_constants.h", - "ledger_callbacks.h", - "ledger_database.cc", - "ledger_database.h", "mojom_structs.h", + "rewards_callbacks.h", + "rewards_database.cc", + "rewards_database.h", ] deps = [ "//sql:sql" ] @@ -78,8 +78,8 @@ source_set("headers") { public_deps = [ ":buildflags", "//brave/components/brave_rewards/common/mojom:interfaces", - "//brave/components/brave_rewards/common/mojom:ledger_interfaces", - "//brave/components/brave_rewards/common/mojom:ledger_types", + "//brave/components/brave_rewards/common/mojom:rewards_interfaces", + "//brave/components/brave_rewards/common/mojom:rewards_types", ] } @@ -90,7 +90,7 @@ proto_library("publishers_proto") { ] } -static_library("ledger") { +static_library("engine") { visibility = [ ":*" ] output_name = "brave_rewards_core" @@ -388,8 +388,6 @@ static_library("ledger") { "gemini/gemini.h", "gemini/gemini_util.cc", "gemini/gemini_util.h", - "ledger_impl.cc", - "ledger_impl.h", "legacy/bat_helper.cc", "legacy/bat_helper.h", "legacy/bat_state.cc", @@ -449,6 +447,8 @@ static_library("ledger") { "recovery/recovery_empty_balance.h", "report/report.cc", "report/report.h", + "rewards_engine_impl.cc", + "rewards_engine_impl.h", "sku/sku.cc", "sku/sku.h", "sku/sku_common.cc", diff --git a/components/brave_rewards/core/api/api.cc b/components/brave_rewards/core/api/api.cc index 6d725528f5d..19d159ed708 100644 --- a/components/brave_rewards/core/api/api.cc +++ b/components/brave_rewards/core/api/api.cc @@ -10,7 +10,7 @@ namespace brave_rewards::internal { namespace api { -API::API(LedgerImpl& ledger) : parameters_(ledger) {} +API::API(RewardsEngineImpl& engine) : parameters_(engine) {} API::~API() = default; diff --git a/components/brave_rewards/core/api/api.h b/components/brave_rewards/core/api/api.h index 5fb07654e12..523663f99e1 100644 --- a/components/brave_rewards/core/api/api.h +++ b/components/brave_rewards/core/api/api.h @@ -7,17 +7,17 @@ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_API_API_H_ #include "brave/components/brave_rewards/core/api/api_parameters.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/mojom_structs.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace api { class API { public: - explicit API(LedgerImpl& ledger); + explicit API(RewardsEngineImpl& engine); ~API(); void Initialize(); diff --git a/components/brave_rewards/core/api/api_parameters.cc b/components/brave_rewards/core/api/api_parameters.cc index 80a74d2dd2e..fe38ba46beb 100644 --- a/components/brave_rewards/core/api/api_parameters.cc +++ b/components/brave_rewards/core/api/api_parameters.cc @@ -11,7 +11,7 @@ #include "base/time/time.h" #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" namespace brave_rewards::internal { @@ -21,7 +21,7 @@ using endpoints::RequestFor; namespace api { -APIParameters::APIParameters(LedgerImpl& ledger) : ledger_(ledger) {} +APIParameters::APIParameters(RewardsEngineImpl& engine) : engine_(engine) {} APIParameters::~APIParameters() = default; @@ -39,14 +39,14 @@ void APIParameters::Fetch(GetRewardsParametersCallback callback) { refresh_timer_.Stop(); - RequestFor(*ledger_).Send( + RequestFor(*engine_).Send( base::BindOnce(&APIParameters::OnFetch, base::Unretained(this))); } void APIParameters::OnFetch(GetParameters::Result&& result) { if (result.has_value()) { DCHECK(result.value()); - ledger_->state()->SetRewardsParameters(*result.value()); + engine_->state()->SetRewardsParameters(*result.value()); RunCallbacks(); return SetRefreshTimer(base::Minutes(10), base::Hours(3)); } @@ -67,7 +67,7 @@ void APIParameters::RunCallbacks() { // Execute callbacks with the current parameters stored in state. // If the last fetch failed, callbacks will be run with the last // successfully fetched parameters or a default set of parameters. - auto parameters = ledger_->state()->GetRewardsParameters(); + auto parameters = engine_->state()->GetRewardsParameters(); DCHECK(parameters); auto callbacks = std::move(callbacks_); diff --git a/components/brave_rewards/core/api/api_parameters.h b/components/brave_rewards/core/api/api_parameters.h index 865237265ea..1922cad1a08 100644 --- a/components/brave_rewards/core/api/api_parameters.h +++ b/components/brave_rewards/core/api/api_parameters.h @@ -12,16 +12,16 @@ #include "base/memory/raw_ref.h" #include "base/timer/timer.h" #include "brave/components/brave_rewards/core/endpoints/get_parameters/get_parameters.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace api { class APIParameters { public: - explicit APIParameters(LedgerImpl& ledger); + explicit APIParameters(RewardsEngineImpl& engine); ~APIParameters(); void Initialize(); @@ -36,7 +36,7 @@ class APIParameters { void SetRefreshTimer(base::TimeDelta delay, base::TimeDelta base_delay = base::TimeDelta()); - const raw_ref ledger_; + const raw_ref engine_; base::OneShotTimer refresh_timer_; std::vector callbacks_; }; diff --git a/components/brave_rewards/core/attestation/attestation.cc b/components/brave_rewards/core/attestation/attestation.cc index f0f25573f82..d6493f851e7 100644 --- a/components/brave_rewards/core/attestation/attestation.cc +++ b/components/brave_rewards/core/attestation/attestation.cc @@ -4,12 +4,12 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/attestation/attestation.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace attestation { -Attestation::Attestation(LedgerImpl& ledger) : ledger_(ledger) {} +Attestation::Attestation(RewardsEngineImpl& engine) : engine_(engine) {} Attestation::~Attestation() = default; diff --git a/components/brave_rewards/core/attestation/attestation.h b/components/brave_rewards/core/attestation/attestation.h index 338a57f85d8..2545dc6d241 100644 --- a/components/brave_rewards/core/attestation/attestation.h +++ b/components/brave_rewards/core/attestation/attestation.h @@ -10,10 +10,10 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace attestation { @@ -24,7 +24,7 @@ using ConfirmCallback = base::OnceCallback; class Attestation { public: - explicit Attestation(LedgerImpl& ledger); + explicit Attestation(RewardsEngineImpl& engine); virtual ~Attestation(); virtual void Start(const std::string& payload, StartCallback callback) = 0; @@ -33,7 +33,7 @@ class Attestation { ConfirmCallback callback) = 0; protected: - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace attestation diff --git a/components/brave_rewards/core/attestation/attestation_androidx.cc b/components/brave_rewards/core/attestation/attestation_androidx.cc index 13cd5fd9cbd..fb9c12a3fde 100644 --- a/components/brave_rewards/core/attestation/attestation_androidx.cc +++ b/components/brave_rewards/core/attestation/attestation_androidx.cc @@ -9,13 +9,13 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "brave/components/brave_rewards/core/attestation/attestation_androidx.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace attestation { -AttestationAndroid::AttestationAndroid(LedgerImpl& ledger) - : Attestation(ledger), promotion_server_(ledger) {} +AttestationAndroid::AttestationAndroid(RewardsEngineImpl& engine) + : Attestation(engine), promotion_server_(engine) {} AttestationAndroid::~AttestationAndroid() = default; @@ -58,13 +58,13 @@ void AttestationAndroid::Start(const std::string& payload, void AttestationAndroid::OnStart(StartCallback callback, mojom::Result result, const std::string& nonce) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to start attestation"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + std::move(callback).Run(mojom::Result::FAILED, ""); return; } - std::move(callback).Run(mojom::Result::LEDGER_OK, nonce); + std::move(callback).Run(mojom::Result::OK, nonce); } void AttestationAndroid::Confirm(const std::string& solution, @@ -83,13 +83,13 @@ void AttestationAndroid::Confirm(const std::string& solution, void AttestationAndroid::OnConfirm(ConfirmCallback callback, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to confirm attestation"); std::move(callback).Run(result); return; } - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); } } // namespace attestation diff --git a/components/brave_rewards/core/attestation/attestation_androidx.h b/components/brave_rewards/core/attestation/attestation_androidx.h index bd130682cfc..3623e38a651 100644 --- a/components/brave_rewards/core/attestation/attestation_androidx.h +++ b/components/brave_rewards/core/attestation/attestation_androidx.h @@ -13,13 +13,13 @@ #include "brave/components/brave_rewards/core/endpoint/promotion/promotion_server.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace attestation { class AttestationAndroid : public Attestation { public: - explicit AttestationAndroid(LedgerImpl& ledger); + explicit AttestationAndroid(RewardsEngineImpl& engine); ~AttestationAndroid() override; void Start(const std::string& payload, StartCallback callback) override; diff --git a/components/brave_rewards/core/attestation/attestation_desktop.cc b/components/brave_rewards/core/attestation/attestation_desktop.cc index a7c2dcdac2c..75d4745b50e 100644 --- a/components/brave_rewards/core/attestation/attestation_desktop.cc +++ b/components/brave_rewards/core/attestation/attestation_desktop.cc @@ -8,13 +8,13 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "brave/components/brave_rewards/core/attestation/attestation_desktop.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace attestation { -AttestationDesktop::AttestationDesktop(LedgerImpl& ledger) - : Attestation(ledger), promotion_server_(ledger) {} +AttestationDesktop::AttestationDesktop(RewardsEngineImpl& engine) + : Attestation(engine), promotion_server_(engine) {} AttestationDesktop::~AttestationDesktop() = default; @@ -27,32 +27,32 @@ mojom::Result AttestationDesktop::ParseClaimSolution( absl::optional value = base::JSONReader::Read(response); if (!value || !value->is_dict()) { - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* id = dict.FindString("captchaId"); if (!id) { BLOG(0, "Captcha id is wrong"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const auto x_parse = dict.FindInt("x"); if (!x_parse) { BLOG(0, "X is wrong"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const auto y_parse = dict.FindInt("y"); if (!y_parse) { BLOG(0, "Y is wrong"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } *x = *x_parse; *y = *y_parse; *captcha_id = *id; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void AttestationDesktop::Start(const std::string& payload, @@ -68,8 +68,8 @@ void AttestationDesktop::DownloadCaptchaImage(StartCallback callback, mojom::Result result, const std::string& hint, const std::string& captcha_id) { - if (result != mojom::Result::LEDGER_OK) { - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + if (result != mojom::Result::OK) { + std::move(callback).Run(mojom::Result::FAILED, ""); return; } @@ -85,8 +85,8 @@ void AttestationDesktop::OnDownloadCaptchaImage(StartCallback callback, const std::string& captcha_id, mojom::Result result, const std::string& image) { - if (result != mojom::Result::LEDGER_OK) { - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + if (result != mojom::Result::OK) { + std::move(callback).Run(mojom::Result::FAILED, ""); return; } @@ -97,7 +97,7 @@ void AttestationDesktop::OnDownloadCaptchaImage(StartCallback callback, std::string json; base::JSONWriter::Write(dict, &json); - std::move(callback).Run(mojom::Result::LEDGER_OK, json); + std::move(callback).Run(mojom::Result::OK, json); } void AttestationDesktop::Confirm(const std::string& solution, @@ -108,7 +108,7 @@ void AttestationDesktop::Confirm(const std::string& solution, const mojom::Result result = ParseClaimSolution(solution, &x, &y, &captcha_id); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to parse solution"); std::move(callback).Run(result); return; @@ -124,13 +124,13 @@ void AttestationDesktop::Confirm(const std::string& solution, void AttestationDesktop::OnConfirm(ConfirmCallback callback, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to confirm attestation"); std::move(callback).Run(result); return; } - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); } } // namespace attestation diff --git a/components/brave_rewards/core/attestation/attestation_desktop.h b/components/brave_rewards/core/attestation/attestation_desktop.h index 314d7f2d011..b446d2bf4b6 100644 --- a/components/brave_rewards/core/attestation/attestation_desktop.h +++ b/components/brave_rewards/core/attestation/attestation_desktop.h @@ -13,13 +13,13 @@ #include "brave/components/brave_rewards/core/endpoint/promotion/promotion_server.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace attestation { class AttestationDesktop : public Attestation { public: - explicit AttestationDesktop(LedgerImpl& ledger); + explicit AttestationDesktop(RewardsEngineImpl& engine); ~AttestationDesktop() override; void Start(const std::string& payload, StartCallback callback) override; diff --git a/components/brave_rewards/core/attestation/attestation_impl.cc b/components/brave_rewards/core/attestation/attestation_impl.cc index 0d4d407f113..925cadfab9b 100644 --- a/components/brave_rewards/core/attestation/attestation_impl.cc +++ b/components/brave_rewards/core/attestation/attestation_impl.cc @@ -8,7 +8,7 @@ #include "brave/components/brave_rewards/core/attestation/attestation_impl.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "build/build_config.h" #include "net/http/http_status_code.h" @@ -23,13 +23,14 @@ namespace brave_rewards::internal { namespace attestation { -AttestationImpl::AttestationImpl(LedgerImpl& ledger) : Attestation(ledger) { +AttestationImpl::AttestationImpl(RewardsEngineImpl& engine) + : Attestation(engine) { #if BUILDFLAG(IS_IOS) - platform_instance_ = std::make_unique(ledger); + platform_instance_ = std::make_unique(engine); #elif BUILDFLAG(IS_ANDROID) - platform_instance_ = std::make_unique(ledger); + platform_instance_ = std::make_unique(engine); #else - platform_instance_ = std::make_unique(ledger); + platform_instance_ = std::make_unique(engine); #endif } diff --git a/components/brave_rewards/core/attestation/attestation_impl.h b/components/brave_rewards/core/attestation/attestation_impl.h index 060985e864d..7096d928ce2 100644 --- a/components/brave_rewards/core/attestation/attestation_impl.h +++ b/components/brave_rewards/core/attestation/attestation_impl.h @@ -12,13 +12,13 @@ #include "brave/components/brave_rewards/core/attestation/attestation.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace attestation { class AttestationImpl : public Attestation { public: - explicit AttestationImpl(LedgerImpl& ledger); + explicit AttestationImpl(RewardsEngineImpl& engine); ~AttestationImpl() override; void Start(const std::string& payload, StartCallback callback) override; diff --git a/components/brave_rewards/core/attestation/attestation_iosx.cc b/components/brave_rewards/core/attestation/attestation_iosx.cc index 993771c0aee..a1680bf5358 100644 --- a/components/brave_rewards/core/attestation/attestation_iosx.cc +++ b/components/brave_rewards/core/attestation/attestation_iosx.cc @@ -9,13 +9,13 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "brave/components/brave_rewards/core/attestation/attestation_iosx.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace attestation { -AttestationIOS::AttestationIOS(LedgerImpl& ledger) - : Attestation(ledger), promotion_server_(ledger) {} +AttestationIOS::AttestationIOS(RewardsEngineImpl& engine) + : Attestation(engine), promotion_server_(engine) {} AttestationIOS::~AttestationIOS() = default; @@ -41,32 +41,32 @@ mojom::Result AttestationIOS::ParseClaimSolution(const std::string& response, std::string* signature) { absl::optional value = base::JSONReader::Read(response); if (!value || !value->is_dict()) { - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* nonce_parsed = dict.FindString("nonce"); if (!nonce_parsed) { BLOG(0, "Nonce is wrong"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const auto* blob_parsed = dict.FindString("blob"); if (!blob_parsed) { BLOG(0, "Blob is wrong"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const auto* signature_parsed = dict.FindString("signature"); if (!signature_parsed) { BLOG(0, "Signature is wrong"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } *nonce = *nonce_parsed; *blob = *blob_parsed; *signature = *signature_parsed; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void AttestationIOS::Start(const std::string& payload, StartCallback callback) { @@ -74,7 +74,7 @@ void AttestationIOS::Start(const std::string& payload, StartCallback callback) { if (key.empty()) { BLOG(0, "Key is empty"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + std::move(callback).Run(mojom::Result::FAILED, ""); return; } auto url_callback = base::BindOnce( @@ -86,13 +86,13 @@ void AttestationIOS::Start(const std::string& payload, StartCallback callback) { void AttestationIOS::OnStart(StartCallback callback, mojom::Result result, const std::string& nonce) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to start attestation"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + std::move(callback).Run(mojom::Result::FAILED, ""); return; } - std::move(callback).Run(mojom::Result::LEDGER_OK, nonce); + std::move(callback).Run(mojom::Result::OK, nonce); } void AttestationIOS::Confirm(const std::string& solution, @@ -103,9 +103,9 @@ void AttestationIOS::Confirm(const std::string& solution, const mojom::Result result = ParseClaimSolution(solution, &nonce, &blob, &signature); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to parse solution"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -117,13 +117,13 @@ void AttestationIOS::Confirm(const std::string& solution, } void AttestationIOS::OnConfirm(ConfirmCallback callback, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to confirm attestation"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); } } // namespace attestation diff --git a/components/brave_rewards/core/attestation/attestation_iosx.h b/components/brave_rewards/core/attestation/attestation_iosx.h index d550e94d13b..30216fab673 100644 --- a/components/brave_rewards/core/attestation/attestation_iosx.h +++ b/components/brave_rewards/core/attestation/attestation_iosx.h @@ -13,13 +13,13 @@ #include "brave/components/brave_rewards/core/endpoint/promotion/promotion_server.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace attestation { class AttestationIOS : public Attestation { public: - explicit AttestationIOS(LedgerImpl& ledger); + explicit AttestationIOS(RewardsEngineImpl& engine); ~AttestationIOS() override; void Start(const std::string& payload, StartCallback callback) override; diff --git a/components/brave_rewards/core/bitflyer/bitflyer.cc b/components/brave_rewards/core/bitflyer/bitflyer.cc index 1f73f630c6a..d2399f8633d 100644 --- a/components/brave_rewards/core/bitflyer/bitflyer.cc +++ b/components/brave_rewards/core/bitflyer/bitflyer.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" #include "brave/components/brave_rewards/core/wallet_provider/bitflyer/bitflyer_transfer.h" @@ -23,12 +23,12 @@ namespace brave_rewards::internal::bitflyer { -Bitflyer::Bitflyer(LedgerImpl& ledger) - : ledger_(ledger), - connect_wallet_(ledger), - get_wallet_(ledger), - transfer_(ledger), - bitflyer_server_(ledger) {} +Bitflyer::Bitflyer(RewardsEngineImpl& engine) + : engine_(engine), + connect_wallet_(engine), + get_wallet_(engine), + transfer_(engine), + bitflyer_server_(engine) {} Bitflyer::~Bitflyer() = default; @@ -49,7 +49,7 @@ void Bitflyer::StartContribution(const std::string& contribution_id, LegacyResultCallback callback) { if (!info) { BLOG(0, "Publisher info is null"); - return callback(mojom::Result::LEDGER_ERROR); + return callback(mojom::Result::FAILED); } const double fee = amount * 0.05; @@ -65,11 +65,11 @@ void Bitflyer::ContributionCompleted(LegacyResultCallback callback, double fee, const std::string& publisher_key, mojom::Result result) { - if (result == mojom::Result::LEDGER_OK) { + if (result == mojom::Result::OK) { SaveTransferFee(contribution_id, fee); if (!publisher_key.empty()) { - ledger_->database()->UpdateContributionInfoContributedAmount( + engine_->database()->UpdateContributionInfoContributedAmount( contribution_id, publisher_key, callback); return; } @@ -81,7 +81,7 @@ void Bitflyer::ContributionCompleted(LegacyResultCallback callback, void Bitflyer::FetchBalance(FetchBalanceCallback callback) { auto wallet = GetWalletIf({mojom::WalletStatus::kConnected}); if (!wallet) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR, 0.0); + return std::move(callback).Run(mojom::Result::FAILED, 0.0); } auto url_callback = base::BindOnce( @@ -95,7 +95,7 @@ void Bitflyer::OnFetchBalance(FetchBalanceCallback callback, const mojom::Result result, const double available) { if (!GetWalletIf({mojom::WalletStatus::kConnected})) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR, 0.0); + return std::move(callback).Run(mojom::Result::FAILED, 0.0); } if (result == mojom::Result::EXPIRED_TOKEN) { @@ -103,19 +103,19 @@ void Bitflyer::OnFetchBalance(FetchBalanceCallback callback, if (!LogOutWallet()) { BLOG(0, "Failed to disconnect " << constant::kWalletBitflyer << " wallet!"); - return std::move(callback).Run(mojom::Result::LEDGER_ERROR, 0.0); + return std::move(callback).Run(mojom::Result::FAILED, 0.0); } return std::move(callback).Run(mojom::Result::EXPIRED_TOKEN, 0.0); } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Couldn't get balance"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, 0.0); + std::move(callback).Run(mojom::Result::FAILED, 0.0); return; } - std::move(callback).Run(mojom::Result::LEDGER_OK, available); + std::move(callback).Run(mojom::Result::OK, available); } void Bitflyer::TransferFunds(double amount, @@ -171,7 +171,7 @@ void Bitflyer::StartTransferFeeTimer(const std::string& fee_id, void Bitflyer::OnTransferFeeCompleted(const std::string& contribution_id, int attempts, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { if (attempts < 3) { BLOG(0, "Transaction fee failed, retrying"); StartTransferFeeTimer(contribution_id, attempts + 1); @@ -212,20 +212,20 @@ void Bitflyer::OnTransferFeeTimerElapsed(const std::string& id, } mojom::ExternalWalletPtr Bitflyer::GetWallet() { - return wallet::GetWallet(*ledger_, constant::kWalletBitflyer); + return wallet::GetWallet(*engine_, constant::kWalletBitflyer); } mojom::ExternalWalletPtr Bitflyer::GetWalletIf( const std::set& statuses) { - return wallet::GetWalletIf(*ledger_, constant::kWalletBitflyer, statuses); + return wallet::GetWalletIf(*engine_, constant::kWalletBitflyer, statuses); } bool Bitflyer::SetWallet(mojom::ExternalWalletPtr wallet) { - return wallet::SetWallet(*ledger_, std::move(wallet)); + return wallet::SetWallet(*engine_, std::move(wallet)); } bool Bitflyer::LogOutWallet() { - return wallet::LogOutWallet(*ledger_, constant::kWalletBitflyer); + return wallet::LogOutWallet(*engine_, constant::kWalletBitflyer); } void Bitflyer::RemoveTransferFee(const std::string& contribution_id) { diff --git a/components/brave_rewards/core/bitflyer/bitflyer.h b/components/brave_rewards/core/bitflyer/bitflyer.h index 430d240e096..d46547f43e4 100644 --- a/components/brave_rewards/core/bitflyer/bitflyer.h +++ b/components/brave_rewards/core/bitflyer/bitflyer.h @@ -17,13 +17,13 @@ #include "base/memory/raw_ref.h" #include "base/timer/timer.h" #include "brave/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/wallet_provider/bitflyer/bitflyer_transfer.h" #include "brave/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.h" #include "brave/components/brave_rewards/core/wallet_provider/bitflyer/get_bitflyer_wallet.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace bitflyer { @@ -31,7 +31,7 @@ using FetchBalanceCallback = base::OnceCallback; class Bitflyer { public: - explicit Bitflyer(LedgerImpl& ledger); + explicit Bitflyer(RewardsEngineImpl& engine); ~Bitflyer(); @@ -87,7 +87,7 @@ class Bitflyer { void RemoveTransferFee(const std::string& contribution_id); - const raw_ref ledger_; + const raw_ref engine_; ConnectBitFlyerWallet connect_wallet_; GetBitFlyerWallet get_wallet_; BitFlyerTransfer transfer_; diff --git a/components/brave_rewards/core/bitflyer/bitflyer_util.cc b/components/brave_rewards/core/bitflyer/bitflyer_util.cc index 37ffcc9c846..9f29ae16c10 100644 --- a/components/brave_rewards/core/bitflyer/bitflyer_util.cc +++ b/components/brave_rewards/core/bitflyer/bitflyer_util.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/buildflags.h" #include "brave/components/brave_rewards/core/common/random_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace { diff --git a/components/brave_rewards/core/bitflyer/bitflyer_util.h b/components/brave_rewards/core/bitflyer/bitflyer_util.h index 0617bff263c..c96a34bdb4d 100644 --- a/components/brave_rewards/core/bitflyer/bitflyer_util.h +++ b/components/brave_rewards/core/bitflyer/bitflyer_util.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom.h" namespace brave_rewards::internal::bitflyer { diff --git a/components/brave_rewards/core/bitflyer/bitflyer_util_unittest.cc b/components/brave_rewards/core/bitflyer/bitflyer_util_unittest.cc index 72ce2f40be0..0d39826a746 100644 --- a/components/brave_rewards/core/bitflyer/bitflyer_util_unittest.cc +++ b/components/brave_rewards/core/bitflyer/bitflyer_util_unittest.cc @@ -14,11 +14,11 @@ #include "brave/components/brave_rewards/core/bitflyer/bitflyer_util.h" #include "brave/components/brave_rewards/core/buildflags.h" #include "brave/components/brave_rewards/core/common/random_util.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" -#include "brave/components/brave_rewards/core/test/test_ledger_client.h" +#include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" #include "testing/gmock/include/gmock/gmock.h" // npm run test -- brave_unit_tests --filter=*BitflyerUtilTest.* @@ -83,19 +83,19 @@ TEST_F(BitflyerUtilTest, GetServerUrl) { TEST_F(BitflyerUtilTest, GetWallet) { base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; // no wallet - EXPECT_CALL(*mock_ledger_impl_.mock_client(), + EXPECT_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletBitflyer, _)) .Times(1) .WillOnce([](const std::string&, auto callback) { std::move(callback).Run(""); }); - auto result = mock_ledger_impl_.bitflyer()->GetWallet(); + auto result = mock_engine_impl_.bitflyer()->GetWallet(); EXPECT_FALSE(result); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), + EXPECT_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletBitflyer, _)) .Times(1) .WillOnce([](const std::string&, auto callback) { @@ -114,7 +114,7 @@ TEST_F(BitflyerUtilTest, GetWallet) { }); // Bitflyer wallet - result = mock_ledger_impl_.bitflyer()->GetWallet(); + result = mock_engine_impl_.bitflyer()->GetWallet(); EXPECT_TRUE(result); EXPECT_EQ(result->address, "2323dff2ba-d0d1-4dfw-8e56-a2605bcaf4af"); EXPECT_EQ(result->user_name, "test"); diff --git a/components/brave_rewards/core/common/brotli_util_unittest.cc b/components/brave_rewards/core/common/brotli_util_unittest.cc index f7fcd54bcdb..289d25bfb65 100644 --- a/components/brave_rewards/core/common/brotli_util_unittest.cc +++ b/components/brave_rewards/core/common/brotli_util_unittest.cc @@ -9,7 +9,7 @@ #include "testing/gtest/include/gtest/gtest.h" -// npm run test -- brave_unit_tests --filter='BraveLedgerBrotliHelpersTest.*' +// npm run test -- brave_unit_tests --filter='RewardsBrotliHelpersTest.*' namespace { @@ -30,14 +30,14 @@ constexpr char kUncompressed[] = namespace brave_rewards::internal { namespace util { -class BraveLedgerBrotliHelpersTest : public testing::Test { +class RewardsBrotliHelpersTest : public testing::Test { protected: static std::string GetInput() { return std::string(kCompressed.begin(), kCompressed.end()); } }; -TEST_F(BraveLedgerBrotliHelpersTest, TestDecode) { +TEST_F(RewardsBrotliHelpersTest, TestDecode) { std::string uncompressed(kUncompressed); std::string s; @@ -54,7 +54,7 @@ TEST_F(BraveLedgerBrotliHelpersTest, TestDecode) { EXPECT_FALSE(DecodeBrotliString("not brotli", 16, &s)); } -TEST_F(BraveLedgerBrotliHelpersTest, TestDecodeWithBuffer) { +TEST_F(RewardsBrotliHelpersTest, TestDecodeWithBuffer) { std::string s; EXPECT_TRUE(DecodeBrotliStringWithBuffer(GetInput(), 16, &s)); diff --git a/components/brave_rewards/core/common/random_util.cc b/components/brave_rewards/core/common/random_util.cc index 5987eea20af..f7bb658c4d7 100644 --- a/components/brave_rewards/core/common/random_util.cc +++ b/components/brave_rewards/core/common/random_util.cc @@ -8,7 +8,7 @@ #include "base/base64url.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "crypto/random.h" #include "crypto/sha2.h" diff --git a/components/brave_rewards/core/common/request_util.cc b/components/brave_rewards/core/common/request_util.cc index 6cfd63346da..7128c6b5b2b 100644 --- a/components/brave_rewards/core/common/request_util.cc +++ b/components/brave_rewards/core/common/request_util.cc @@ -7,7 +7,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/common/security_util.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { namespace util { diff --git a/components/brave_rewards/core/contribution/contribution.cc b/components/brave_rewards/core/contribution/contribution.cc index 0d55218f2d5..bbfdb1bff7a 100644 --- a/components/brave_rewards/core/contribution/contribution.cc +++ b/components/brave_rewards/core/contribution/contribution.cc @@ -22,8 +22,8 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/gemini/gemini.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/publisher/publisher_status_helper.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/uphold/uphold.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" @@ -64,7 +64,7 @@ bool IsRevivedAC(const mojom::ContributionInfo& contribution) { mojom::ContributionStep ConvertResultIntoContributionStep( const mojom::Result result) { switch (result) { - case mojom::Result::LEDGER_OK: { + case mojom::Result::OK: { return mojom::ContributionStep::STEP_COMPLETED; } case mojom::Result::AC_TABLE_EMPTY: { @@ -110,21 +110,21 @@ Contribution::ContributionRequest& Contribution::ContributionRequest::operator=( Contribution::ContributionRequest::~ContributionRequest() = default; -Contribution::Contribution(LedgerImpl& ledger) - : ledger_(ledger), - unblinded_(ledger), - sku_(ledger), - monthly_(ledger), - ac_(ledger), - tip_(ledger), - external_wallet_(ledger) {} +Contribution::Contribution(RewardsEngineImpl& engine) + : engine_(engine), + unblinded_(engine), + sku_(engine), + monthly_(engine), + ac_(engine), + tip_(engine), + external_wallet_(engine) {} Contribution::~Contribution() = default; void Contribution::Initialize() { - ledger_->uphold()->Initialize(); - ledger_->bitflyer()->Initialize(); - ledger_->gemini()->Initialize(); + engine_->uphold()->Initialize(); + engine_->bitflyer()->Initialize(); + engine_->gemini()->Initialize(); CheckContributionQueue(); CheckNotCompletedContributions(); @@ -151,7 +151,7 @@ void Contribution::ProcessContributionQueue() { const auto callback = std::bind(&Contribution::OnProcessContributionQueue, this, _1); - ledger_->database()->GetFirstContributionQueue(callback); + engine_->database()->GetFirstContributionQueue(callback); } void Contribution::OnProcessContributionQueue( @@ -170,7 +170,7 @@ void Contribution::CheckNotCompletedContributions() { auto get_callback = std::bind(&Contribution::NotCompletedContributions, this, _1); - ledger_->database()->GetNotCompletedContributions(get_callback); + engine_->database()->GetNotCompletedContributions(get_callback); } void Contribution::NotCompletedContributions( @@ -189,7 +189,7 @@ void Contribution::NotCompletedContributions( } void Contribution::ResetReconcileStamp() { - ledger_->state()->ResetReconcileStamp(); + engine_->state()->ResetReconcileStamp(); SetAutoContributeTimer(); } @@ -225,7 +225,7 @@ void Contribution::StartMonthlyContributions( // contribution dates and enqueue contributions, then we'll most likely end // up in a failure loop if we retry immediately. The timer will be reset // when the user creates another monthly contribution or restarts. - if (result == mojom::Result::LEDGER_OK) { + if (result == mojom::Result::OK) { SetMonthlyContributionTimer(); } @@ -239,7 +239,7 @@ void Contribution::StartMonthlyContributions( } void Contribution::StartAutoContribute() { - uint64_t reconcile_stamp = ledger_->state()->GetReconcileStamp(); + uint64_t reconcile_stamp = engine_->state()->GetReconcileStamp(); ResetReconcileStamp(); BLOG(1, "Starting auto-contribute"); ac_.Process(reconcile_stamp); @@ -262,7 +262,7 @@ void Contribution::OnBalance(mojom::ContributionQueuePtr queue, void Contribution::Start(mojom::ContributionQueuePtr info) { auto fetch_callback = base::BindOnce(&Contribution::OnBalance, base::Unretained(this), std::move(info)); - ledger_->wallet()->FetchBalance(std::move(fetch_callback)); + engine_->wallet()->FetchBalance(std::move(fetch_callback)); } void Contribution::SetAutoContributeTimer() { @@ -271,7 +271,7 @@ void Contribution::SetAutoContributeTimer() { } uint64_t now = std::time(nullptr); - uint64_t next_reconcile_stamp = ledger_->state()->GetReconcileStamp(); + uint64_t next_reconcile_stamp = engine_->state()->GetReconcileStamp(); base::TimeDelta delay; if (next_reconcile_stamp > now) { @@ -289,7 +289,7 @@ void Contribution::SetAutoContributeTimer() { void Contribution::SetMonthlyContributionTimer() { // Read the next contribution time of the monthly contribution that will // run soonest. - ledger_->database()->GetNextMonthlyContributionTime( + engine_->database()->GetNextMonthlyContributionTime( base::BindOnce(&Contribution::OnNextMonthlyContributionTimeRead, base::Unretained(this))); } @@ -353,7 +353,7 @@ void Contribution::OnContributionRequestCompleted(const std::string& queue_id, // should receive the result of the contribution, regardless of whether this // write succeeds or fails. if (success && request.set_monthly) { - ledger_->database()->SetMonthlyContribution( + engine_->database()->SetMonthlyContribution( request.publisher_id, request.amount, base::BindOnce(&Contribution::OnMonthlyContributionSet, base::Unretained(this))); @@ -385,10 +385,10 @@ void Contribution::ContributionCompleted( // browser restart. Those ACs should complete in the background without // updating the current month's balance report or generating a notification. if (!IsRevivedAC(*contribution)) { - ledger_->client()->OnReconcileComplete(result, contribution->Clone()); + engine_->client()->OnReconcileComplete(result, contribution->Clone()); - if (result == mojom::Result::LEDGER_OK) { - ledger_->database()->SaveBalanceReportInfoItem( + if (result == mojom::Result::OK) { + engine_->database()->SaveBalanceReportInfoItem( util::GetCurrentMonth(), util::GetCurrentYear(), GetReportTypeFromRewardsType(contribution->type), contribution->amount, [](const mojom::Result) {}); @@ -398,7 +398,7 @@ void Contribution::ContributionCompleted( auto save_callback = std::bind(&Contribution::ContributionCompletedSaved, this, _1, contribution->contribution_id); - ledger_->database()->UpdateContributionInfoStepAndCount( + engine_->database()->UpdateContributionInfoStepAndCount( contribution->contribution_id, ConvertResultIntoContributionStep(result), -1, save_callback); } @@ -406,13 +406,13 @@ void Contribution::ContributionCompleted( void Contribution::ContributionCompletedSaved( const mojom::Result result, const std::string& contribution_id) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Contribution step and count failed"); } auto callback = std::bind(&Contribution::OnMarkUnblindedTokensAsSpendable, this, _1, contribution_id); - ledger_->database()->MarkUnblindedTokensAsSpendable(contribution_id, + engine_->database()->MarkUnblindedTokensAsSpendable(contribution_id, callback); } @@ -421,7 +421,7 @@ void Contribution::OneTimeTip(const std::string& publisher_key, LegacyResultCallback callback) { auto on_added = [](LegacyResultCallback callback, absl::optional queue_id) { - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); }; tip_.Process(publisher_key, amount, @@ -450,7 +450,7 @@ void Contribution::MarkContributionQueueAsComplete(const std::string& id, auto callback = std::bind(&Contribution::OnMarkContributionQueueAsComplete, this, _1); - ledger_->database()->MarkContributionQueueAsComplete(id, callback); + engine_->database()->MarkContributionQueueAsComplete(id, callback); } void Contribution::CreateNewEntry(const std::string& wallet_type, @@ -534,7 +534,7 @@ void Contribution::CreateNewEntry(const std::string& wallet_type, contribution->contribution_id, wallet_type, *balance, shared_queue); - ledger_->database()->SaveContributionInfo(contribution->Clone(), + engine_->database()->SaveContributionInfo(contribution->Clone(), save_callback); } @@ -544,7 +544,7 @@ void Contribution::OnEntrySaved( const std::string& wallet_type, const mojom::Balance& balance, std::shared_ptr shared_queue) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Contribution was not saved correctly"); return; } @@ -575,7 +575,7 @@ void Contribution::OnEntrySaved( auto save_callback = std::bind(&Contribution::OnQueueSaved, this, _1, wallet_type, balance, shared_queue); - ledger_->database()->SaveContributionQueue((*shared_queue)->Clone(), + engine_->database()->SaveContributionQueue((*shared_queue)->Clone(), save_callback); } else { MarkContributionQueueAsComplete((*shared_queue)->id, true); @@ -587,7 +587,7 @@ void Contribution::OnQueueSaved( const std::string& wallet_type, const mojom::Balance& balance, std::shared_ptr shared_queue) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Queue was not saved successfully"); return; } @@ -643,19 +643,19 @@ void Contribution::TransferFunds(const mojom::SKUTransaction& transaction, const std::string& contribution_id, LegacyResultCallback callback) { if (wallet_type == constant::kWalletUphold) { - ledger_->uphold()->TransferFunds(transaction.amount, destination, + engine_->uphold()->TransferFunds(transaction.amount, destination, contribution_id, callback); return; } if (wallet_type == constant::kWalletBitflyer) { - ledger_->bitflyer()->TransferFunds(transaction.amount, destination, + engine_->bitflyer()->TransferFunds(transaction.amount, destination, contribution_id, callback); return; } if (wallet_type == constant::kWalletGemini) { - ledger_->gemini()->TransferFunds(transaction.amount, destination, + engine_->gemini()->TransferFunds(transaction.amount, destination, contribution_id, callback); return; } @@ -689,7 +689,7 @@ void Contribution::RetryUnblinded( auto get_callback = std::bind(&Contribution::RetryUnblindedContribution, this, _1, types, callback); - ledger_->database()->GetContributionInfo(contribution_id, get_callback); + engine_->database()->GetContributionInfo(contribution_id, get_callback); } void Contribution::RetryUnblindedContribution( @@ -705,7 +705,7 @@ void Contribution::Result(const mojom::Result result, auto get_callback = std::bind(&Contribution::OnResult, this, _1, result, queue_id); - ledger_->database()->GetContributionInfo(contribution_id, get_callback); + engine_->database()->GetContributionInfo(contribution_id, get_callback); } void Contribution::OnResult(mojom::ContributionInfoPtr contribution, @@ -719,7 +719,7 @@ void Contribution::OnResult(mojom::ContributionInfoPtr contribution, // successfully initiated. There may be a significant delay before the // transaction is completed by the provider. OnContributionRequestCompleted( - queue_id, result == mojom::Result::LEDGER_OK || + queue_id, result == mojom::Result::OK || result == mojom::Result::RETRY_PENDING_TRANSACTION_SHORT || result == mojom::Result::RETRY_PENDING_TRANSACTION_LONG); @@ -790,7 +790,7 @@ void Contribution::OnRetryTimerElapsed(const std::string& contribution_id) { auto callback = std::bind(&Contribution::SetRetryCounter, this, _1); - ledger_->database()->GetContributionInfo(contribution_id, callback); + engine_->database()->GetContributionInfo(contribution_id, callback); } void Contribution::SetRetryCounter(mojom::ContributionInfoPtr contribution) { @@ -811,7 +811,7 @@ void Contribution::SetRetryCounter(mojom::ContributionInfoPtr contribution) { &Contribution::Retry, this, _1, std::make_shared(contribution->Clone())); - ledger_->database()->UpdateContributionInfoStepAndCount( + engine_->database()->UpdateContributionInfoStepAndCount( contribution->contribution_id, contribution->step, contribution->retry_count + 1, save_callback); } @@ -819,7 +819,7 @@ void Contribution::SetRetryCounter(mojom::ContributionInfoPtr contribution) { void Contribution::OnMarkUnblindedTokensAsSpendable( const mojom::Result result, const std::string& contribution_id) { - BLOG_IF(1, result != mojom::Result::LEDGER_OK, + BLOG_IF(1, result != mojom::Result::OK, "Failed to mark unblinded tokens as unreserved for contribution " << contribution_id); } @@ -827,7 +827,7 @@ void Contribution::OnMarkUnblindedTokensAsSpendable( void Contribution::Retry( const mojom::Result result, std::shared_ptr shared_contribution) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Retry count update failed"); return; } @@ -843,7 +843,7 @@ void Contribution::Retry( } if ((*shared_contribution)->type == mojom::RewardsType::AUTO_CONTRIBUTE && - !ledger_->state()->GetAutoContributeEnabled()) { + !engine_->state()->GetAutoContributeEnabled()) { BLOG(1, "AC is disabled, completing contribution"); ContributionCompleted(mojom::Result::AC_OFF, std::move(*shared_contribution)); @@ -876,7 +876,7 @@ void Contribution::Retry( return; } case mojom::ContributionProcessor::NONE: { - Result(mojom::Result::LEDGER_ERROR, "", + Result(mojom::Result::FAILED, "", (*shared_contribution)->contribution_id); return; } @@ -884,11 +884,11 @@ void Contribution::Retry( } void Contribution::GetRecurringTips(GetRecurringTipsCallback callback) { - ledger_->database()->GetRecurringTips( + engine_->database()->GetRecurringTips( [this, callback](std::vector list) { // The publisher status field may be expired. Attempt to refresh // expired publisher status values before executing callback. - publisher::RefreshPublisherStatus(*ledger_, std::move(list), callback); + publisher::RefreshPublisherStatus(*engine_, std::move(list), callback); }); } diff --git a/components/brave_rewards/core/contribution/contribution.h b/components/brave_rewards/core/contribution/contribution.h index cee37897229..ec194cc1acd 100644 --- a/components/brave_rewards/core/contribution/contribution.h +++ b/components/brave_rewards/core/contribution/contribution.h @@ -24,16 +24,16 @@ #include "brave/components/brave_rewards/core/contribution/contribution_sku.h" #include "brave/components/brave_rewards/core/contribution/contribution_tip.h" #include "brave/components/brave_rewards/core/contribution/contribution_unblinded.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace contribution { class Contribution { public: - explicit Contribution(LedgerImpl& ledger); + explicit Contribution(RewardsEngineImpl& engine); ~Contribution(); @@ -178,7 +178,7 @@ class Contribution { void OnMarkUnblindedTokensAsSpendable(const mojom::Result result, const std::string& contribution_id); - const raw_ref ledger_; + const raw_ref engine_; Unblinded unblinded_; ContributionSKU sku_; ContributionMonthly monthly_; diff --git a/components/brave_rewards/core/contribution/contribution_ac.cc b/components/brave_rewards/core/contribution/contribution_ac.cc index e832c9e5382..6f505560973 100644 --- a/components/brave_rewards/core/contribution/contribution_ac.cc +++ b/components/brave_rewards/core/contribution/contribution_ac.cc @@ -9,9 +9,9 @@ #include "brave/components/brave_rewards/core/contribution/contribution.h" #include "brave/components/brave_rewards/core/contribution/contribution_ac.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" using std::placeholders::_1; @@ -20,26 +20,26 @@ using std::placeholders::_2; namespace brave_rewards::internal { namespace contribution { -ContributionAC::ContributionAC(LedgerImpl& ledger) : ledger_(ledger) {} +ContributionAC::ContributionAC(RewardsEngineImpl& engine) : engine_(engine) {} ContributionAC::~ContributionAC() = default; void ContributionAC::Process(const uint64_t reconcile_stamp) { - if (!ledger_->state()->GetAutoContributeEnabled()) { + if (!engine_->state()->GetAutoContributeEnabled()) { BLOG(1, "Auto contribution is off"); return; } BLOG(1, "Starting auto contribution"); - auto filter = ledger_->publisher()->CreateActivityFilter( + auto filter = engine_->publisher()->CreateActivityFilter( "", mojom::ExcludeFilter::FILTER_ALL_EXCEPT_EXCLUDED, true, - reconcile_stamp, false, ledger_->state()->GetPublisherMinVisits()); + reconcile_stamp, false, engine_->state()->GetPublisherMinVisits()); auto get_callback = std::bind(&ContributionAC::PreparePublisherList, this, _1); - ledger_->database()->GetActivityInfoList(0, 0, std::move(filter), + engine_->database()->GetActivityInfoList(0, 0, std::move(filter), get_callback); } @@ -47,7 +47,7 @@ void ContributionAC::PreparePublisherList( std::vector list) { std::vector normalized_list; - ledger_->publisher()->NormalizeContributeWinners(&normalized_list, &list, 0); + engine_->publisher()->NormalizeContributeWinners(&normalized_list, &list, 0); if (normalized_list.empty()) { BLOG(1, "AC list is empty"); @@ -75,25 +75,25 @@ void ContributionAC::PreparePublisherList( auto queue = mojom::ContributionQueue::New(); queue->id = base::Uuid::GenerateRandomV4().AsLowercaseString(); queue->type = mojom::RewardsType::AUTO_CONTRIBUTE; - queue->amount = ledger_->state()->GetAutoContributionAmount(); + queue->amount = engine_->state()->GetAutoContributionAmount(); queue->partial = true; queue->publishers = std::move(queue_list); - ledger_->database()->SaveEventLog(log::kACAddedToQueue, + engine_->database()->SaveEventLog(log::kACAddedToQueue, std::to_string(queue->amount)); auto save_callback = std::bind(&ContributionAC::QueueSaved, this, _1); - ledger_->database()->SaveContributionQueue(std::move(queue), save_callback); + engine_->database()->SaveContributionQueue(std::move(queue), save_callback); } void ContributionAC::QueueSaved(const mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Queue was not saved"); return; } - ledger_->contribution()->CheckContributionQueue(); + engine_->contribution()->CheckContributionQueue(); } } // namespace contribution diff --git a/components/brave_rewards/core/contribution/contribution_ac.h b/components/brave_rewards/core/contribution/contribution_ac.h index fa577c1dee0..2b997e8f71b 100644 --- a/components/brave_rewards/core/contribution/contribution_ac.h +++ b/components/brave_rewards/core/contribution/contribution_ac.h @@ -9,16 +9,16 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace contribution { class ContributionAC { public: - explicit ContributionAC(LedgerImpl& ledger); + explicit ContributionAC(RewardsEngineImpl& engine); ~ContributionAC(); @@ -29,7 +29,7 @@ class ContributionAC { void QueueSaved(const mojom::Result result); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace contribution diff --git a/components/brave_rewards/core/contribution/contribution_external_wallet.cc b/components/brave_rewards/core/contribution/contribution_external_wallet.cc index a0831fdf5ef..3a49d111df4 100644 --- a/components/brave_rewards/core/contribution/contribution_external_wallet.cc +++ b/components/brave_rewards/core/contribution/contribution_external_wallet.cc @@ -13,8 +13,8 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/gemini/gemini.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/uphold/uphold.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" @@ -24,8 +24,9 @@ using std::placeholders::_2; namespace brave_rewards::internal { namespace contribution { -ContributionExternalWallet::ContributionExternalWallet(LedgerImpl& ledger) - : ledger_(ledger) {} +ContributionExternalWallet::ContributionExternalWallet( + RewardsEngineImpl& engine) + : engine_(engine) {} ContributionExternalWallet::~ContributionExternalWallet() = default; @@ -33,13 +34,13 @@ void ContributionExternalWallet::Process(const std::string& contribution_id, LegacyResultCallback callback) { if (contribution_id.empty()) { BLOG(0, "Contribution id is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } auto get_callback = std::bind(&ContributionExternalWallet::ContributionInfo, this, _1, callback); - ledger_->database()->GetContributionInfo(contribution_id, get_callback); + engine_->database()->GetContributionInfo(contribution_id, get_callback); } void ContributionExternalWallet::ContributionInfo( @@ -47,7 +48,7 @@ void ContributionExternalWallet::ContributionInfo( LegacyResultCallback callback) { if (!contribution) { BLOG(0, "Contribution is null"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -55,15 +56,15 @@ void ContributionExternalWallet::ContributionInfo( switch (contribution->processor) { case mojom::ContributionProcessor::BITFLYER: wallet = - ledger_->bitflyer()->GetWalletIf({mojom::WalletStatus::kConnected}); + engine_->bitflyer()->GetWalletIf({mojom::WalletStatus::kConnected}); break; case mojom::ContributionProcessor::GEMINI: wallet = - ledger_->gemini()->GetWalletIf({mojom::WalletStatus::kConnected}); + engine_->gemini()->GetWalletIf({mojom::WalletStatus::kConnected}); break; case mojom::ContributionProcessor::UPHOLD: wallet = - ledger_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected}); + engine_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected}); break; default: break; @@ -71,11 +72,11 @@ void ContributionExternalWallet::ContributionInfo( if (!wallet) { BLOG(0, "Unexpected wallet status!"); - return callback(mojom::Result::LEDGER_ERROR); + return callback(mojom::Result::FAILED); } if (contribution->type == mojom::RewardsType::AUTO_CONTRIBUTE) { - ledger_->contribution()->SKUAutoContribution(contribution->contribution_id, + engine_->contribution()->SKUAutoContribution(contribution->contribution_id, wallet->type, callback); return; } @@ -93,13 +94,13 @@ void ContributionExternalWallet::ContributionInfo( contribution->type, contribution->processor, single_publisher, callback); - ledger_->publisher()->GetServerPublisherInfo(publisher->publisher_key, + engine_->publisher()->GetServerPublisherInfo(publisher->publisher_key, get_callback); return; } // we processed all publishers - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } void ContributionExternalWallet::OnServerPublisherInfo( @@ -112,7 +113,7 @@ void ContributionExternalWallet::OnServerPublisherInfo( LegacyResultCallback callback) { if (!info) { BLOG(0, "Publisher not found"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -138,7 +139,7 @@ void ContributionExternalWallet::OnServerPublisherInfo( // We can then infer that no other external wallet will be able to service // this contribution item, and we can safely error out. BLOG(1, "Publisher not verified"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -147,15 +148,15 @@ void ContributionExternalWallet::OnServerPublisherInfo( switch (processor) { case mojom::ContributionProcessor::UPHOLD: - ledger_->uphold()->StartContribution(contribution_id, std::move(info), + engine_->uphold()->StartContribution(contribution_id, std::move(info), amount, start_callback); break; case mojom::ContributionProcessor::BITFLYER: - ledger_->bitflyer()->StartContribution(contribution_id, std::move(info), + engine_->bitflyer()->StartContribution(contribution_id, std::move(info), amount, start_callback); break; case mojom::ContributionProcessor::GEMINI: - ledger_->gemini()->StartContribution(contribution_id, std::move(info), + engine_->gemini()->StartContribution(contribution_id, std::move(info), amount, start_callback); break; default: diff --git a/components/brave_rewards/core/contribution/contribution_external_wallet.h b/components/brave_rewards/core/contribution/contribution_external_wallet.h index 45a37464191..7defe009651 100644 --- a/components/brave_rewards/core/contribution/contribution_external_wallet.h +++ b/components/brave_rewards/core/contribution/contribution_external_wallet.h @@ -10,16 +10,16 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace contribution { class ContributionExternalWallet { public: - explicit ContributionExternalWallet(LedgerImpl& ledger); + explicit ContributionExternalWallet(RewardsEngineImpl& engine); ~ContributionExternalWallet(); @@ -47,7 +47,7 @@ class ContributionExternalWallet { bool single_publisher, LegacyResultCallback callback); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace contribution diff --git a/components/brave_rewards/core/contribution/contribution_monthly.cc b/components/brave_rewards/core/contribution/contribution_monthly.cc index 8aa6760fb19..47a629577ec 100644 --- a/components/brave_rewards/core/contribution/contribution_monthly.cc +++ b/components/brave_rewards/core/contribution/contribution_monthly.cc @@ -13,19 +13,19 @@ #include "brave/components/brave_rewards/core/contribution/contribution.h" #include "brave/components/brave_rewards/core/contribution/contribution_monthly.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace contribution { -ContributionMonthly::ContributionMonthly(LedgerImpl& ledger) - : ledger_(ledger) {} +ContributionMonthly::ContributionMonthly(RewardsEngineImpl& engine) + : engine_(engine) {} ContributionMonthly::~ContributionMonthly() = default; void ContributionMonthly::Process(absl::optional cutoff_time, LegacyResultCallback callback) { - ledger_->contribution()->GetRecurringTips( + engine_->contribution()->GetRecurringTips( [this, cutoff_time, callback](std::vector publishers) { AdvanceContributionDates(cutoff_time, callback, std::move(publishers)); @@ -53,7 +53,7 @@ void ContributionMonthly::AdvanceContributionDates( } // Advance the next contribution dates before attempting to add contributions. - ledger_->database()->AdvanceMonthlyContributionDates( + engine_->database()->AdvanceMonthlyContributionDates( publisher_ids, base::BindOnce(&ContributionMonthly::OnNextContributionDateAdvanced, base::Unretained(this), std::move(publishers), callback)); @@ -65,7 +65,7 @@ void ContributionMonthly::OnNextContributionDateAdvanced( bool success) { if (!success) { BLOG(0, "Unable to advance monthly contribution dates."); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -92,12 +92,12 @@ void ContributionMonthly::OnNextContributionDateAdvanced( queue->partial = false; queue->publishers.push_back(std::move(publisher)); - ledger_->database()->SaveContributionQueue(std::move(queue), + engine_->database()->SaveContributionQueue(std::move(queue), [](mojom::Result) {}); } - ledger_->contribution()->CheckContributionQueue(); - callback(mojom::Result::LEDGER_OK); + engine_->contribution()->CheckContributionQueue(); + callback(mojom::Result::OK); } } // namespace contribution diff --git a/components/brave_rewards/core/contribution/contribution_monthly.h b/components/brave_rewards/core/contribution/contribution_monthly.h index a5c705fc05a..a59f66ba13a 100644 --- a/components/brave_rewards/core/contribution/contribution_monthly.h +++ b/components/brave_rewards/core/contribution/contribution_monthly.h @@ -10,17 +10,17 @@ #include "base/memory/raw_ref.h" #include "base/time/time.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace contribution { class ContributionMonthly { public: - explicit ContributionMonthly(LedgerImpl& ledger); + explicit ContributionMonthly(RewardsEngineImpl& engine); ~ContributionMonthly(); @@ -38,7 +38,7 @@ class ContributionMonthly { LegacyResultCallback callback, bool success); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace contribution diff --git a/components/brave_rewards/core/contribution/contribution_sku.cc b/components/brave_rewards/core/contribution/contribution_sku.cc index e94204c6dc0..772807b5f21 100644 --- a/components/brave_rewards/core/contribution/contribution_sku.cc +++ b/components/brave_rewards/core/contribution/contribution_sku.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/contribution/contribution_util.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; using std::placeholders::_2; @@ -77,8 +77,8 @@ void GetCredentialTrigger(mojom::SKUOrderPtr order, namespace contribution { -ContributionSKU::ContributionSKU(LedgerImpl& ledger) - : ledger_(ledger), credentials_(ledger), sku_(ledger) {} +ContributionSKU::ContributionSKU(RewardsEngineImpl& engine) + : engine_(engine), credentials_(engine), sku_(engine) {} ContributionSKU::~ContributionSKU() = default; @@ -98,7 +98,7 @@ void ContributionSKU::Start(const std::string& contribution_id, auto get_callback = std::bind(&ContributionSKU::GetContributionInfo, this, _1, item, wallet_type, callback); - ledger_->database()->GetContributionInfo(contribution_id, get_callback); + engine_->database()->GetContributionInfo(contribution_id, get_callback); } void ContributionSKU::GetContributionInfo( @@ -108,7 +108,7 @@ void ContributionSKU::GetContributionInfo( LegacyResultCallback callback) { if (!contribution) { BLOG(0, "Contribution not found"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -136,7 +136,7 @@ void ContributionSKU::GetOrder(mojom::Result result, const std::string& order_id, const std::string& contribution_id, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "SKU was not processed"); callback(result); return; @@ -144,7 +144,7 @@ void ContributionSKU::GetOrder(mojom::Result result, auto get_callback = std::bind(&ContributionSKU::OnGetOrder, this, _1, contribution_id, callback); - ledger_->database()->GetSKUOrder(order_id, get_callback); + engine_->database()->GetSKUOrder(order_id, get_callback); } void ContributionSKU::OnGetOrder(mojom::SKUOrderPtr order, @@ -152,7 +152,7 @@ void ContributionSKU::OnGetOrder(mojom::SKUOrderPtr order, LegacyResultCallback callback) { if (!order) { BLOG(0, "Order was not found"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -170,7 +170,7 @@ void ContributionSKU::Completed(mojom::Result result, const std::string& contribution_id, mojom::RewardsType type, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Order not completed"); callback(result); return; @@ -179,20 +179,20 @@ void ContributionSKU::Completed(mojom::Result result, auto save_callback = std::bind(&ContributionSKU::CredsStepSaved, this, _1, contribution_id, callback); - ledger_->database()->UpdateContributionInfoStep( + engine_->database()->UpdateContributionInfoStep( contribution_id, mojom::ContributionStep::STEP_CREDS, save_callback); } void ContributionSKU::CredsStepSaved(mojom::Result result, const std::string& contribution_id, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Creds step not saved"); callback(result); return; } - ledger_->contribution()->StartUnblinded({mojom::CredsBatchType::SKU}, + engine_->contribution()->StartUnblinded({mojom::CredsBatchType::SKU}, contribution_id, callback); } @@ -201,7 +201,7 @@ void ContributionSKU::Merchant(const mojom::SKUTransaction& transaction, auto get_callback = std::bind(&ContributionSKU::GetUnblindedTokens, this, _1, transaction, callback); - ledger_->database()->GetSpendableUnblindedTokensByBatchTypes( + engine_->database()->GetSpendableUnblindedTokensByBatchTypes( {mojom::CredsBatchType::PROMOTION}, get_callback); } @@ -211,7 +211,7 @@ void ContributionSKU::GetUnblindedTokens( LegacyResultCallback callback) { if (list.empty()) { BLOG(0, "List is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -241,7 +241,7 @@ void ContributionSKU::GetUnblindedTokens( auto get_callback = std::bind(&ContributionSKU::GetOrderMerchant, this, _1, redeem, callback); - ledger_->database()->GetSKUOrder(transaction.order_id, get_callback); + engine_->database()->GetSKUOrder(transaction.order_id, get_callback); } void ContributionSKU::GetOrderMerchant( @@ -250,7 +250,7 @@ void ContributionSKU::GetOrderMerchant( LegacyResultCallback callback) { if (!order) { BLOG(0, "Order was not found"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -265,7 +265,7 @@ void ContributionSKU::GetOrderMerchant( void ContributionSKU::OnRedeemTokens(mojom::Result result, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Problem redeeming tokens"); callback(result); return; @@ -278,7 +278,7 @@ void ContributionSKU::Retry(mojom::ContributionInfoPtr contribution, LegacyResultCallback callback) { if (!contribution) { BLOG(0, "Contribution was not found"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -287,7 +287,7 @@ void ContributionSKU::Retry(mojom::ContributionInfoPtr contribution, std::make_shared(contribution->Clone()), callback); - ledger_->database()->GetSKUOrderByContributionId( + engine_->database()->GetSKUOrderByContributionId( contribution->contribution_id, get_callback); } @@ -298,7 +298,7 @@ void ContributionSKU::OnOrder( auto contribution = std::move(*shared_contribution); if (!contribution) { BLOG(0, "Contribution is null"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -311,7 +311,7 @@ void ContributionSKU::OnOrder( case mojom::ContributionStep::STEP_PREPARE: case mojom::ContributionStep::STEP_RESERVE: case mojom::ContributionStep::STEP_CREDS: { - ledger_->contribution()->RetryUnblinded({mojom::CredsBatchType::SKU}, + engine_->contribution()->RetryUnblinded({mojom::CredsBatchType::SKU}, contribution->contribution_id, callback); return; @@ -336,7 +336,7 @@ void ContributionSKU::RetryStartStep(mojom::ContributionInfoPtr contribution, LegacyResultCallback callback) { if (!contribution) { BLOG(0, "Contribution is null"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -356,7 +356,7 @@ void ContributionSKU::RetryStartStep(mojom::ContributionInfoPtr contribution, if (wallet_type.empty()) { BLOG(0, "Invalid processor for SKU contribution"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } diff --git a/components/brave_rewards/core/contribution/contribution_sku.h b/components/brave_rewards/core/contribution/contribution_sku.h index bb1b6beba46..7b293f1960c 100644 --- a/components/brave_rewards/core/contribution/contribution_sku.h +++ b/components/brave_rewards/core/contribution/contribution_sku.h @@ -12,17 +12,17 @@ #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/credentials/credentials_sku.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/sku/sku.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace contribution { class ContributionSKU { public: - explicit ContributionSKU(LedgerImpl& ledger); + explicit ContributionSKU(RewardsEngineImpl& engine); ~ContributionSKU(); void AutoContribution(const std::string& contribution_id, @@ -81,7 +81,7 @@ class ContributionSKU { mojom::SKUOrderPtr order, LegacyResultCallback callback); - const raw_ref ledger_; + const raw_ref engine_; credential::CredentialsSKU credentials_; sku::SKU sku_; }; diff --git a/components/brave_rewards/core/contribution/contribution_tip.cc b/components/brave_rewards/core/contribution/contribution_tip.cc index b200223a878..75ac6453a8a 100644 --- a/components/brave_rewards/core/contribution/contribution_tip.cc +++ b/components/brave_rewards/core/contribution/contribution_tip.cc @@ -14,12 +14,12 @@ #include "brave/components/brave_rewards/core/common/legacy_callback_helpers.h" #include "brave/components/brave_rewards/core/contribution/contribution.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal::contribution { -ContributionTip::ContributionTip(LedgerImpl& ledger) : ledger_(ledger) {} +ContributionTip::ContributionTip(RewardsEngineImpl& engine) : engine_(engine) {} ContributionTip::~ContributionTip() = default; @@ -32,7 +32,7 @@ void ContributionTip::Process(const std::string& publisher_id, return; } - ledger_->publisher()->GetServerPublisherInfo( + engine_->publisher()->GetServerPublisherInfo( publisher_id, ToLegacyCallback(base::BindOnce(&ContributionTip::OnPublisherDataRead, base::Unretained(this), publisher_id, @@ -64,7 +64,7 @@ void ContributionTip::OnPublisherDataRead( queue->partial = false; queue->publishers = std::move(queue_list); - ledger_->database()->SaveContributionQueue( + engine_->database()->SaveContributionQueue( std::move(queue), ToLegacyCallback( base::BindOnce(&ContributionTip::OnQueueSaved, base::Unretained(this), @@ -74,8 +74,8 @@ void ContributionTip::OnPublisherDataRead( void ContributionTip::OnQueueSaved(const std::string& queue_id, ProcessCallback callback, mojom::Result result) { - if (result == mojom::Result::LEDGER_OK) { - ledger_->contribution()->ProcessContributionQueue(); + if (result == mojom::Result::OK) { + engine_->contribution()->ProcessContributionQueue(); std::move(callback).Run(queue_id); } else { BLOG(0, "Queue was not saved"); diff --git a/components/brave_rewards/core/contribution/contribution_tip.h b/components/brave_rewards/core/contribution/contribution_tip.h index 7a5fd8d9a9e..94cb02ef1cd 100644 --- a/components/brave_rewards/core/contribution/contribution_tip.h +++ b/components/brave_rewards/core/contribution/contribution_tip.h @@ -10,18 +10,18 @@ #include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace contribution { class ContributionTip { public: - explicit ContributionTip(LedgerImpl& ledger); + explicit ContributionTip(RewardsEngineImpl& engine); ~ContributionTip(); @@ -43,7 +43,7 @@ class ContributionTip { void OnPendingTipSaved(mojom::Result result); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace contribution diff --git a/components/brave_rewards/core/contribution/contribution_unblinded.cc b/components/brave_rewards/core/contribution/contribution_unblinded.cc index ea20a1f74a3..7bc10721471 100644 --- a/components/brave_rewards/core/contribution/contribution_unblinded.cc +++ b/components/brave_rewards/core/contribution/contribution_unblinded.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/contribution/contribution_unblinded.h" #include "brave/components/brave_rewards/core/contribution/contribution_util.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave_base/random.h" using std::placeholders::_1; @@ -92,10 +92,10 @@ void GetStatisticalVotingWinners( } // namespace -Unblinded::Unblinded(LedgerImpl& ledger) - : ledger_(ledger), - credentials_promotion_(ledger), - credentials_sku_(ledger) {} +Unblinded::Unblinded(RewardsEngineImpl& engine) + : engine_(engine), + credentials_promotion_(engine), + credentials_sku_(engine) {} Unblinded::~Unblinded() = default; @@ -104,7 +104,7 @@ void Unblinded::Start(const std::vector& types, LegacyResultCallback callback) { if (contribution_id.empty()) { BLOG(0, "Contribution id is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -120,7 +120,7 @@ void Unblinded::GetContributionInfoAndUnblindedTokens( GetContributionInfoAndUnblindedTokensCallback callback) { auto get_callback = std::bind(&Unblinded::OnUnblindedTokens, this, _1, contribution_id, callback); - ledger_->database()->GetSpendableUnblindedTokensByBatchTypes(types, + engine_->database()->GetSpendableUnblindedTokensByBatchTypes(types, get_callback); } @@ -143,7 +143,7 @@ void Unblinded::OnUnblindedTokens( converted_list.push_back(new_item); } - ledger_->database()->GetContributionInfo( + engine_->database()->GetContributionInfo( contribution_id, std::bind(&Unblinded::OnGetContributionInfo, this, _1, std::move(converted_list), callback)); } @@ -153,7 +153,7 @@ void Unblinded::GetContributionInfoAndReservedUnblindedTokens( GetContributionInfoAndUnblindedTokensCallback callback) { auto get_callback = std::bind(&Unblinded::OnReservedUnblindedTokens, this, _1, contribution_id, callback); - ledger_->database()->GetReservedUnblindedTokens(contribution_id, + engine_->database()->GetReservedUnblindedTokens(contribution_id, get_callback); } @@ -176,7 +176,7 @@ void Unblinded::OnReservedUnblindedTokens( converted_list.push_back(new_item); } - ledger_->database()->GetContributionInfo( + engine_->database()->GetContributionInfo( contribution_id, std::bind(&Unblinded::OnGetContributionInfo, this, _1, converted_list, callback)); } @@ -195,7 +195,7 @@ void Unblinded::PrepareTokens( LegacyResultCallback callback) { if (!contribution) { BLOG(0, "Contribution not found"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -235,7 +235,7 @@ void Unblinded::PrepareTokens( std::make_shared(contribution->Clone()), types, callback); - ledger_->database()->MarkUnblindedTokensAsReserved( + engine_->database()->MarkUnblindedTokensAsReserved( token_id_list, contribution_id, reserved_callback); } @@ -245,15 +245,15 @@ void Unblinded::OnMarkUnblindedTokensAsReserved( std::shared_ptr shared_contribution, const std::vector& types, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to reserve unblinded tokens"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } if (!shared_contribution) { BLOG(0, "Contribution was not converted successfully"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -268,7 +268,7 @@ void Unblinded::PreparePublishers( LegacyResultCallback callback) { if (!contribution) { BLOG(0, "Contribution not found"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -288,7 +288,7 @@ void Unblinded::PreparePublishers( std::bind(&Unblinded::OnPrepareAutoContribution, this, _1, types, contribution->contribution_id, callback); - ledger_->database()->SaveContributionInfo(contribution->Clone(), + engine_->database()->SaveContributionInfo(contribution->Clone(), save_callback); return; } @@ -296,7 +296,7 @@ void Unblinded::PreparePublishers( auto save_callback = std::bind(&Unblinded::PrepareStepSaved, this, _1, types, contribution->contribution_id, callback); - ledger_->database()->UpdateContributionInfoStep( + engine_->database()->UpdateContributionInfoStep( contribution->contribution_id, mojom::ContributionStep::STEP_PREPARE, save_callback); } @@ -344,7 +344,7 @@ void Unblinded::OnPrepareAutoContribution( const std::vector& types, const std::string& contribution_id, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Contribution not saved"); callback(mojom::Result::RETRY); return; @@ -353,7 +353,7 @@ void Unblinded::OnPrepareAutoContribution( auto save_callback = std::bind(&Unblinded::PrepareStepSaved, this, _1, types, contribution_id, callback); - ledger_->database()->UpdateContributionInfoStep( + engine_->database()->UpdateContributionInfoStep( contribution_id, mojom::ContributionStep::STEP_PREPARE, save_callback); } @@ -362,7 +362,7 @@ void Unblinded::PrepareStepSaved( const std::vector& types, const std::string& contribution_id, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Prepare step was not saved"); callback(mojom::Result::RETRY); return; @@ -385,7 +385,7 @@ void Unblinded::OnProcessTokens( LegacyResultCallback callback) { if (!contribution || contribution->publishers.empty()) { BLOG(0, "Contribution not found"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -433,7 +433,7 @@ void Unblinded::OnProcessTokens( } // we processed all publishers - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } void Unblinded::TokenProcessed(mojom::Result result, @@ -441,7 +441,7 @@ void Unblinded::TokenProcessed(mojom::Result result, const std::string& publisher_key, bool final_publisher, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Tokens were not processed correctly"); callback(mojom::Result::RETRY); return; @@ -450,7 +450,7 @@ void Unblinded::TokenProcessed(mojom::Result result, auto save_callback = std::bind(&Unblinded::ContributionAmountSaved, this, _1, contribution_id, final_publisher, callback); - ledger_->database()->UpdateContributionInfoContributedAmount( + engine_->database()->UpdateContributionInfoContributedAmount( contribution_id, publisher_key, save_callback); } @@ -471,7 +471,7 @@ void Unblinded::Retry(const std::vector& types, LegacyResultCallback callback) { if (!contribution) { BLOG(0, "Contribution is null"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -484,7 +484,7 @@ void Unblinded::Retry(const std::vector& types, if (is_not_tokens && is_not_uphold_ac) { BLOG(0, "Retry is not for this func"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -502,7 +502,7 @@ void Unblinded::Retry(const std::vector& types, &Unblinded::OnReservedUnblindedTokensForRetryAttempt, this, _1, types, std::make_shared(contribution->Clone()), callback); - ledger_->database()->GetReservedUnblindedTokens( + engine_->database()->GetReservedUnblindedTokens( contribution->contribution_id, get_callback); return; } @@ -530,13 +530,13 @@ void Unblinded::OnReservedUnblindedTokensForRetryAttempt( LegacyResultCallback callback) { if (unblinded_tokens.empty()) { BLOG(0, "Token list is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } if (!shared_contribution) { BLOG(0, "Contribution was not converted successfully"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } diff --git a/components/brave_rewards/core/contribution/contribution_unblinded.h b/components/brave_rewards/core/contribution/contribution_unblinded.h index c2325f1256c..fa7c457d95d 100644 --- a/components/brave_rewards/core/contribution/contribution_unblinded.h +++ b/components/brave_rewards/core/contribution/contribution_unblinded.h @@ -17,10 +17,10 @@ #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/credentials/credentials_promotion.h" #include "brave/components/brave_rewards/core/credentials/credentials_sku.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace contribution { @@ -32,7 +32,7 @@ using StatisticalVotingWinners = std::map; class Unblinded { public: - explicit Unblinded(LedgerImpl& ledger); + explicit Unblinded(RewardsEngineImpl& engine); ~Unblinded(); void Start(const std::vector& types, @@ -134,7 +134,7 @@ class Unblinded { double amount, const std::vector& publisher_list); - const raw_ref ledger_; + const raw_ref engine_; credential::CredentialsPromotion credentials_promotion_; credential::CredentialsSKU credentials_sku_; }; diff --git a/components/brave_rewards/core/contribution/contribution_unblinded_unittest.cc b/components/brave_rewards/core/contribution/contribution_unblinded_unittest.cc index 7507ab9d285..8e90383215e 100644 --- a/components/brave_rewards/core/contribution/contribution_unblinded_unittest.cc +++ b/components/brave_rewards/core/contribution/contribution_unblinded_unittest.cc @@ -9,7 +9,7 @@ #include "brave/components/brave_rewards/core/contribution/contribution_unblinded.h" #include "brave/components/brave_rewards/core/database/database_contribution_info.h" #include "brave/components/brave_rewards/core/database/database_unblinded_token.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" // npm run test -- brave_unit_tests --filter=UnblindedTest.* @@ -26,12 +26,12 @@ namespace contribution { class UnblindedTest : public ::testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - Unblinded unblinded_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + Unblinded unblinded_{mock_engine_impl_}; }; TEST_F(UnblindedTest, NotEnoughFunds) { - EXPECT_CALL(*mock_ledger_impl_.mock_database(), + EXPECT_CALL(*mock_engine_impl_.mock_database(), GetSpendableUnblindedTokensByBatchTypes(_, _)) .Times(1) .WillOnce([](const std::vector&, auto callback) { @@ -47,7 +47,7 @@ TEST_F(UnblindedTest, NotEnoughFunds) { callback(std::move(tokens)); }); - EXPECT_CALL(*mock_ledger_impl_.mock_database(), + EXPECT_CALL(*mock_engine_impl_.mock_database(), GetContributionInfo(contribution_id, _)) .Times(1) .WillOnce([](const std::string& id, auto callback) { diff --git a/components/brave_rewards/core/credentials/credentials_common.cc b/components/brave_rewards/core/credentials/credentials_common.cc index 88f18fecb35..765f3183444 100644 --- a/components/brave_rewards/core/credentials/credentials_common.cc +++ b/components/brave_rewards/core/credentials/credentials_common.cc @@ -12,12 +12,13 @@ #include "brave/components/brave_rewards/core/credentials/credentials_common.h" #include "brave/components/brave_rewards/core/credentials/credentials_util.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace credential { -CredentialsCommon::CredentialsCommon(LedgerImpl& ledger) : ledger_(ledger) {} +CredentialsCommon::CredentialsCommon(RewardsEngineImpl& engine) + : engine_(engine) {} CredentialsCommon::~CredentialsCommon() = default; @@ -27,7 +28,7 @@ void CredentialsCommon::GetBlindedCreds(const CredentialsTrigger& trigger, if (creds.empty()) { BLOG(0, "Creds are empty"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -36,7 +37,7 @@ void CredentialsCommon::GetBlindedCreds(const CredentialsTrigger& trigger, if (blinded_creds.empty()) { BLOG(0, "Blinded creds are empty"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -55,7 +56,7 @@ void CredentialsCommon::GetBlindedCreds(const CredentialsTrigger& trigger, base::BindOnce(&CredentialsCommon::BlindedCredsSaved, base::Unretained(this), std::move(callback)); - ledger_->database()->SaveCredsBatch( + engine_->database()->SaveCredsBatch( std::move(creds_batch), [callback = std::make_shared(std::move(save_callback))]( @@ -64,13 +65,13 @@ void CredentialsCommon::GetBlindedCreds(const CredentialsTrigger& trigger, void CredentialsCommon::BlindedCredsSaved(ResultCallback callback, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Creds batch save failed"); std::move(callback).Run(mojom::Result::RETRY); return; } - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); } void CredentialsCommon::SaveUnblindedCreds( @@ -96,7 +97,7 @@ void CredentialsCommon::SaveUnblindedCreds( base::BindOnce(&CredentialsCommon::OnSaveUnblindedCreds, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->SaveUnblindedTokenList( + engine_->database()->SaveUnblindedTokenList( std::move(list), [callback = std::make_shared( std::move(save_callback))](mojom::Result result) { std::move(*callback).Run(result); @@ -106,13 +107,13 @@ void CredentialsCommon::SaveUnblindedCreds( void CredentialsCommon::OnSaveUnblindedCreds(ResultCallback callback, const CredentialsTrigger& trigger, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Token list not saved"); std::move(callback).Run(mojom::Result::RETRY); return; } - ledger_->database()->UpdateCredsBatchStatus( + engine_->database()->UpdateCredsBatchStatus( trigger.id, trigger.type, mojom::CredsBatchStatus::FINISHED, [callback = std::make_shared(std::move(callback))]( mojom::Result result) { std::move(*callback).Run(result); }); diff --git a/components/brave_rewards/core/credentials/credentials_common.h b/components/brave_rewards/core/credentials/credentials_common.h index 8c2345c6cf5..dec89b8460d 100644 --- a/components/brave_rewards/core/credentials/credentials_common.h +++ b/components/brave_rewards/core/credentials/credentials_common.h @@ -14,16 +14,16 @@ #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/credentials/credentials.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace credential { class CredentialsCommon { public: - explicit CredentialsCommon(LedgerImpl& ledger); + explicit CredentialsCommon(RewardsEngineImpl& engine); ~CredentialsCommon(); void GetBlindedCreds(const CredentialsTrigger& trigger, @@ -44,7 +44,7 @@ class CredentialsCommon { const CredentialsTrigger& trigger, mojom::Result result); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace credential diff --git a/components/brave_rewards/core/credentials/credentials_promotion.cc b/components/brave_rewards/core/credentials/credentials_promotion.cc index 308daec1536..7ab8b682fda 100644 --- a/components/brave_rewards/core/credentials/credentials_promotion.cc +++ b/components/brave_rewards/core/credentials/credentials_promotion.cc @@ -13,15 +13,15 @@ #include "brave/components/brave_rewards/core/credentials/credentials_promotion.h" #include "brave/components/brave_rewards/core/credentials/credentials_util.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; namespace brave_rewards::internal { namespace credential { -CredentialsPromotion::CredentialsPromotion(LedgerImpl& ledger) - : ledger_(ledger), common_(ledger), promotion_server_(ledger) {} +CredentialsPromotion::CredentialsPromotion(RewardsEngineImpl& engine) + : engine_(engine), common_(engine), promotion_server_(engine) {} CredentialsPromotion::~CredentialsPromotion() = default; @@ -31,7 +31,7 @@ void CredentialsPromotion::Start(const CredentialsTrigger& trigger, base::BindOnce(&CredentialsPromotion::OnStart, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->GetCredsBatchByTrigger( + engine_->database()->GetCredsBatchByTrigger( trigger.id, trigger.type, [callback = std::make_shared( std::move(get_callback))](mojom::CredsBatchPtr creds_batch) { @@ -57,7 +57,7 @@ void CredentialsPromotion::OnStart(ResultCallback callback, base::BindOnce(&CredentialsPromotion::Claim, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->GetCredsBatchByTrigger( + engine_->database()->GetCredsBatchByTrigger( trigger.id, trigger.type, [callback = std::make_shared( std::move(get_callback))](mojom::CredsBatchPtr creds_batch) { @@ -70,7 +70,7 @@ void CredentialsPromotion::OnStart(ResultCallback callback, base::BindOnce(&CredentialsPromotion::FetchSignedCreds, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->GetPromotion( + engine_->database()->GetPromotion( trigger.id, [callback = std::make_shared( std::move(get_callback))](mojom::PromotionPtr promotion) { @@ -83,7 +83,7 @@ void CredentialsPromotion::OnStart(ResultCallback callback, base::BindOnce(&CredentialsPromotion::Unblind, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->GetCredsBatchByTrigger( + engine_->database()->GetCredsBatchByTrigger( trigger.id, trigger.type, [callback = std::make_shared( std::move(get_callback))](mojom::CredsBatchPtr creds_batch) { @@ -92,11 +92,11 @@ void CredentialsPromotion::OnStart(ResultCallback callback, break; } case mojom::CredsBatchStatus::FINISHED: { - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); break; } case mojom::CredsBatchStatus::CORRUPTED: { - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); break; } } @@ -113,7 +113,7 @@ void CredentialsPromotion::Blind(ResultCallback callback, void CredentialsPromotion::OnBlind(ResultCallback callback, const CredentialsTrigger& trigger, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Blinding failed"); std::move(callback).Run(result); return; @@ -123,7 +123,7 @@ void CredentialsPromotion::OnBlind(ResultCallback callback, base::BindOnce(&CredentialsPromotion::Claim, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->GetCredsBatchByTrigger( + engine_->database()->GetCredsBatchByTrigger( trigger.id, trigger.type, [callback = std::make_shared( std::move(get_callback))](mojom::CredsBatchPtr creds_batch) { @@ -136,7 +136,7 @@ void CredentialsPromotion::Claim(ResultCallback callback, mojom::CredsBatchPtr creds) { if (!creds) { BLOG(0, "Creds not found"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -148,7 +148,7 @@ void CredentialsPromotion::Claim(ResultCallback callback, base::BindOnce(&CredentialsPromotion::RetryPreviousStepSaved, base::Unretained(this), std::move(callback)); - ledger_->database()->UpdateCredsBatchStatus( + engine_->database()->UpdateCredsBatchStatus( trigger.id, trigger.type, mojom::CredsBatchStatus::NONE, [callback = std::make_shared( std::move(save_callback))](mojom::Result result) { @@ -170,7 +170,7 @@ void CredentialsPromotion::OnClaim(ResultCallback callback, const CredentialsTrigger& trigger, mojom::Result result, const std::string& claim_id) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result); return; } @@ -179,7 +179,7 @@ void CredentialsPromotion::OnClaim(ResultCallback callback, base::BindOnce(&CredentialsPromotion::ClaimedSaved, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->SavePromotionClaimId( + engine_->database()->SavePromotionClaimId( trigger.id, claim_id, [callback = std::make_shared(std::move(save_callback))]( @@ -189,9 +189,9 @@ void CredentialsPromotion::OnClaim(ResultCallback callback, void CredentialsPromotion::ClaimedSaved(ResultCallback callback, const CredentialsTrigger& trigger, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Claim id was not saved"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -199,7 +199,7 @@ void CredentialsPromotion::ClaimedSaved(ResultCallback callback, base::BindOnce(&CredentialsPromotion::ClaimStatusSaved, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->UpdateCredsBatchStatus( + engine_->database()->UpdateCredsBatchStatus( trigger.id, trigger.type, mojom::CredsBatchStatus::CLAIMED, [callback = std::make_shared(std::move(save_callback))]( @@ -209,9 +209,9 @@ void CredentialsPromotion::ClaimedSaved(ResultCallback callback, void CredentialsPromotion::ClaimStatusSaved(ResultCallback callback, const CredentialsTrigger& trigger, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Claim status not saved"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -219,7 +219,7 @@ void CredentialsPromotion::ClaimStatusSaved(ResultCallback callback, base::BindOnce(&CredentialsPromotion::FetchSignedCreds, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->GetPromotion( + engine_->database()->GetPromotion( trigger.id, [callback = std::make_shared( std::move(get_callback))](mojom::PromotionPtr promotion) { @@ -229,9 +229,9 @@ void CredentialsPromotion::ClaimStatusSaved(ResultCallback callback, void CredentialsPromotion::RetryPreviousStepSaved(ResultCallback callback, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Previous step not saved"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -243,7 +243,7 @@ void CredentialsPromotion::FetchSignedCreds(ResultCallback callback, mojom::PromotionPtr promotion) { if (!promotion) { BLOG(0, "Corrupted data"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -254,7 +254,7 @@ void CredentialsPromotion::FetchSignedCreds(ResultCallback callback, base::BindOnce(&CredentialsPromotion::RetryPreviousStepSaved, base::Unretained(this), std::move(callback)); - ledger_->database()->UpdateCredsBatchStatus( + engine_->database()->UpdateCredsBatchStatus( trigger.id, trigger.type, mojom::CredsBatchStatus::BLINDED, [callback = std::make_shared( std::move(save_callback))](mojom::Result result) { @@ -283,9 +283,9 @@ void CredentialsPromotion::OnFetchSignedCreds(ResultCallback callback, return; } - if (result != mojom::Result::LEDGER_OK || !batch) { + if (result != mojom::Result::OK || !batch) { BLOG(0, "Problem parsing response"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -296,7 +296,7 @@ void CredentialsPromotion::OnFetchSignedCreds(ResultCallback callback, base::BindOnce(&CredentialsPromotion::SignedCredsSaved, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->SaveSignedCreds( + engine_->database()->SaveSignedCreds( std::move(batch), [callback = std::make_shared( std::move(save_callback))](mojom::Result result) { std::move(*callback).Run(result); @@ -306,9 +306,9 @@ void CredentialsPromotion::OnFetchSignedCreds(ResultCallback callback, void CredentialsPromotion::SignedCredsSaved(ResultCallback callback, const CredentialsTrigger& trigger, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Signed creds were not saved"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -316,7 +316,7 @@ void CredentialsPromotion::SignedCredsSaved(ResultCallback callback, base::BindOnce(&CredentialsPromotion::Unblind, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->GetCredsBatchByTrigger( + engine_->database()->GetCredsBatchByTrigger( trigger.id, trigger.type, [callback = std::make_shared( std::move(get_callback))](mojom::CredsBatchPtr creds_batch) { @@ -329,7 +329,7 @@ void CredentialsPromotion::Unblind(ResultCallback callback, mojom::CredsBatchPtr creds) { if (!creds) { BLOG(0, "Corrupted data"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -337,7 +337,7 @@ void CredentialsPromotion::Unblind(ResultCallback callback, base::Unretained(this), std::move(callback), trigger, *creds); - ledger_->database()->GetPromotion( + engine_->database()->GetPromotion( trigger.id, [callback = std::make_shared( std::move(get_callback))](mojom::PromotionPtr promotion) { @@ -351,7 +351,7 @@ void CredentialsPromotion::VerifyPublicKey(ResultCallback callback, mojom::PromotionPtr promotion) { if (!promotion) { BLOG(0, "Corrupted data"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -359,7 +359,7 @@ void CredentialsPromotion::VerifyPublicKey(ResultCallback callback, if (!promotion_keys || promotion_keys->empty()) { BLOG(0, "Public key is missing"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -372,7 +372,7 @@ void CredentialsPromotion::VerifyPublicKey(ResultCallback callback, if (!valid) { BLOG(0, "Public key is not valid"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -383,7 +383,7 @@ void CredentialsPromotion::VerifyPublicKey(ResultCallback callback, auto result = UnBlindCreds(creds); if (!result.has_value()) { BLOG(0, "UnBlindTokens: " << result.error()); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } unblinded_encoded_creds = std::move(result).value(); @@ -409,17 +409,17 @@ void CredentialsPromotion::VerifyPublicKey(ResultCallback callback, void CredentialsPromotion::Completed(ResultCallback callback, const CredentialsTrigger& trigger, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Unblinded token save failed"); std::move(callback).Run(result); return; } - ledger_->database()->PromotionCredentialCompleted( + engine_->database()->PromotionCredentialCompleted( trigger.id, [callback = std::make_shared(std::move(callback))]( mojom::Result result) { std::move(*callback).Run(result); }); - ledger_->client()->UnblindedTokensReady(); + engine_->client()->UnblindedTokensReady(); } void CredentialsPromotion::RedeemTokens(const CredentialsRedeem& redeem, @@ -428,7 +428,7 @@ void CredentialsPromotion::RedeemTokens(const CredentialsRedeem& redeem, if (redeem.token_list.empty()) { BLOG(0, "Token list empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -442,7 +442,7 @@ void CredentialsPromotion::RedeemTokens(const CredentialsRedeem& redeem, if (redeem.publisher_key.empty()) { BLOG(0, "Publisher key is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -454,9 +454,9 @@ void CredentialsPromotion::OnRedeemTokens( const std::vector& token_id_list, const CredentialsRedeem& redeem, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to parse redeem tokens response"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -465,7 +465,7 @@ void CredentialsPromotion::OnRedeemTokens( id = redeem.contribution_id; } - ledger_->database()->MarkUnblindedTokensAsSpent(token_id_list, redeem.type, + engine_->database()->MarkUnblindedTokensAsSpent(token_id_list, redeem.type, id, callback); } @@ -475,7 +475,7 @@ void CredentialsPromotion::DrainTokens(const CredentialsRedeem& redeem, if (redeem.token_list.empty()) { BLOG(0, "Token list empty"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + std::move(callback).Run(mojom::Result::FAILED, ""); return; } @@ -498,9 +498,9 @@ void CredentialsPromotion::OnDrainTokens( const CredentialsRedeem& redeem, mojom::Result result, std::string drain_id) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to parse drain tokens response"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + std::move(callback).Run(mojom::Result::FAILED, ""); return; } @@ -514,17 +514,16 @@ void CredentialsPromotion::OnDrainTokens( auto mark_tokens_callback = base::BindOnce( [](PostSuggestionsClaimCallback callback, std::string drain_id, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to mark tokens as spent"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + std::move(callback).Run(mojom::Result::FAILED, ""); } else { - std::move(callback).Run(mojom::Result::LEDGER_OK, - std::move(drain_id)); + std::move(callback).Run(mojom::Result::OK, std::move(drain_id)); } }, std::move(callback), std::move(drain_id)); - ledger_->database()->MarkUnblindedTokensAsSpent( + engine_->database()->MarkUnblindedTokensAsSpent( token_id_list, mojom::RewardsType::TRANSFER, id, [callback = std::make_shared( std::move(mark_tokens_callback))](mojom::Result result) { diff --git a/components/brave_rewards/core/credentials/credentials_promotion.h b/components/brave_rewards/core/credentials/credentials_promotion.h index 612e4e044b8..d63e21988ae 100644 --- a/components/brave_rewards/core/credentials/credentials_promotion.h +++ b/components/brave_rewards/core/credentials/credentials_promotion.h @@ -19,7 +19,7 @@ namespace credential { class CredentialsPromotion : public Credentials { public: - explicit CredentialsPromotion(LedgerImpl& ledger); + explicit CredentialsPromotion(RewardsEngineImpl& engine); ~CredentialsPromotion() override; void Start(const CredentialsTrigger& trigger, @@ -99,7 +99,7 @@ class CredentialsPromotion : public Credentials { mojom::Result result, std::string drain_id); - const raw_ref ledger_; + const raw_ref engine_; CredentialsCommon common_; endpoint::PromotionServer promotion_server_; }; diff --git a/components/brave_rewards/core/credentials/credentials_redeem.h b/components/brave_rewards/core/credentials/credentials_redeem.h index 27cb4a7b3bc..e03dae2d5cb 100644 --- a/components/brave_rewards/core/credentials/credentials_redeem.h +++ b/components/brave_rewards/core/credentials/credentials_redeem.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { namespace credential { diff --git a/components/brave_rewards/core/credentials/credentials_sku.cc b/components/brave_rewards/core/credentials/credentials_sku.cc index cc4af7f9d79..e3f18cd56b3 100644 --- a/components/brave_rewards/core/credentials/credentials_sku.cc +++ b/components/brave_rewards/core/credentials/credentials_sku.cc @@ -17,7 +17,7 @@ #include "brave/components/brave_rewards/core/credentials/credentials_sku.h" #include "brave/components/brave_rewards/core/credentials/credentials_util.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -72,8 +72,8 @@ std::string ConvertItemTypeToString(const std::string& type) { namespace credential { -CredentialsSKU::CredentialsSKU(LedgerImpl& ledger) - : ledger_(ledger), common_(ledger), payment_server_(ledger) {} +CredentialsSKU::CredentialsSKU(RewardsEngineImpl& engine) + : engine_(engine), common_(engine), payment_server_(engine) {} CredentialsSKU::~CredentialsSKU() = default; @@ -82,7 +82,7 @@ void CredentialsSKU::Start(const CredentialsTrigger& trigger, DCHECK_EQ(trigger.data.size(), 2ul); if (trigger.data.empty()) { BLOG(0, "Trigger data is missing"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -90,7 +90,7 @@ void CredentialsSKU::Start(const CredentialsTrigger& trigger, base::BindOnce(&CredentialsSKU::OnStart, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->GetCredsBatchByTrigger( + engine_->database()->GetCredsBatchByTrigger( trigger.id, trigger.type, [callback = std::make_shared( std::move(get_callback))](mojom::CredsBatchPtr creds_batch) { @@ -116,7 +116,7 @@ void CredentialsSKU::OnStart(ResultCallback callback, base::BindOnce(&CredentialsSKU::Claim, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->GetCredsBatchByTrigger( + engine_->database()->GetCredsBatchByTrigger( trigger.id, trigger.type, [callback = std::make_shared( std::move(get_callback))](mojom::CredsBatchPtr creds_batch) { @@ -133,7 +133,7 @@ void CredentialsSKU::OnStart(ResultCallback callback, base::BindOnce(&CredentialsSKU::Unblind, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->GetCredsBatchByTrigger( + engine_->database()->GetCredsBatchByTrigger( trigger.id, trigger.type, [callback = std::make_shared( std::move(get_callback))](mojom::CredsBatchPtr creds_batch) { @@ -142,11 +142,11 @@ void CredentialsSKU::OnStart(ResultCallback callback, break; } case mojom::CredsBatchStatus::FINISHED: { - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); break; } case mojom::CredsBatchStatus::CORRUPTED: { - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); break; } } @@ -163,7 +163,7 @@ void CredentialsSKU::Blind(ResultCallback callback, void CredentialsSKU::OnBlind(ResultCallback callback, const CredentialsTrigger& trigger, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Claim failed"); std::move(callback).Run(result); return; @@ -173,7 +173,7 @@ void CredentialsSKU::OnBlind(ResultCallback callback, base::BindOnce(&CredentialsSKU::Claim, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->GetCredsBatchByTrigger( + engine_->database()->GetCredsBatchByTrigger( trigger.id, trigger.type, [callback = std::make_shared( std::move(get_callback))](mojom::CredsBatchPtr creds_batch) { @@ -183,9 +183,9 @@ void CredentialsSKU::OnBlind(ResultCallback callback, void CredentialsSKU::RetryPreviousStepSaved(ResultCallback callback, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Previous step not saved"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -197,7 +197,7 @@ void CredentialsSKU::Claim(ResultCallback callback, mojom::CredsBatchPtr creds) { if (!creds) { BLOG(0, "Creds not found"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -209,7 +209,7 @@ void CredentialsSKU::Claim(ResultCallback callback, base::BindOnce(&CredentialsSKU::RetryPreviousStepSaved, base::Unretained(this), std::move(callback)); - ledger_->database()->UpdateCredsBatchStatus( + engine_->database()->UpdateCredsBatchStatus( trigger.id, trigger.type, mojom::CredsBatchStatus::NONE, [callback = std::make_shared( std::move(save_callback))](mojom::Result result) { @@ -232,7 +232,7 @@ void CredentialsSKU::Claim(ResultCallback callback, void CredentialsSKU::OnClaim(ResultCallback callback, const CredentialsTrigger& trigger, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to claim SKU creds"); std::move(callback).Run(mojom::Result::RETRY); return; @@ -242,7 +242,7 @@ void CredentialsSKU::OnClaim(ResultCallback callback, base::BindOnce(&CredentialsSKU::ClaimStatusSaved, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->UpdateCredsBatchStatus( + engine_->database()->UpdateCredsBatchStatus( trigger.id, trigger.type, mojom::CredsBatchStatus::CLAIMED, [callback = std::make_shared(std::move(save_callback))]( @@ -252,7 +252,7 @@ void CredentialsSKU::OnClaim(ResultCallback callback, void CredentialsSKU::ClaimStatusSaved(ResultCallback callback, const CredentialsTrigger& trigger, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Claim status not saved: " << result); std::move(callback).Run(mojom::Result::RETRY); return; @@ -275,7 +275,7 @@ void CredentialsSKU::OnFetchSignedCreds(ResultCallback callback, const CredentialsTrigger& trigger, mojom::Result result, mojom::CredsBatchPtr batch) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Couldn't fetch credentials: " << result); std::move(callback).Run(result); return; @@ -288,7 +288,7 @@ void CredentialsSKU::OnFetchSignedCreds(ResultCallback callback, base::BindOnce(&CredentialsSKU::SignedCredsSaved, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->SaveSignedCreds( + engine_->database()->SaveSignedCreds( std::move(batch), [callback = std::make_shared( std::move(get_callback))](mojom::Result result) { std::move(*callback).Run(result); @@ -298,7 +298,7 @@ void CredentialsSKU::OnFetchSignedCreds(ResultCallback callback, void CredentialsSKU::SignedCredsSaved(ResultCallback callback, const CredentialsTrigger& trigger, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Signed creds were not saved"); std::move(callback).Run(mojom::Result::RETRY); return; @@ -308,7 +308,7 @@ void CredentialsSKU::SignedCredsSaved(ResultCallback callback, base::BindOnce(&CredentialsSKU::Unblind, base::Unretained(this), std::move(callback), trigger); - ledger_->database()->GetCredsBatchByTrigger( + engine_->database()->GetCredsBatchByTrigger( trigger.id, trigger.type, [callback = std::make_shared( std::move(get_callback))](mojom::CredsBatchPtr creds_batch) { @@ -321,13 +321,13 @@ void CredentialsSKU::Unblind(ResultCallback callback, mojom::CredsBatchPtr creds) { if (!creds) { BLOG(0, "Corrupted data"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } if (!IsPublicKeyValid(creds->public_key)) { BLOG(0, "Public key is not valid"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -338,7 +338,7 @@ void CredentialsSKU::Unblind(ResultCallback callback, auto result = UnBlindCreds(*creds); if (!result.has_value()) { BLOG(0, "UnBlindTokens: " << result.error()); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } unblinded_encoded_creds = std::move(result).value(); @@ -358,13 +358,13 @@ void CredentialsSKU::Unblind(ResultCallback callback, void CredentialsSKU::Completed(ResultCallback callback, const CredentialsTrigger& trigger, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Unblinded token save failed"); std::move(callback).Run(result); return; } - ledger_->client()->UnblindedTokensReady(); + engine_->client()->UnblindedTokensReady(); std::move(callback).Run(result); } @@ -372,7 +372,7 @@ void CredentialsSKU::RedeemTokens(const CredentialsRedeem& redeem, LegacyResultCallback callback) { if (redeem.publisher_key.empty() || redeem.token_list.empty()) { BLOG(0, "Pub key / token list empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -392,9 +392,9 @@ void CredentialsSKU::OnRedeemTokens( const std::vector& token_id_list, const CredentialsRedeem& redeem, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to submit tokens"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -405,7 +405,7 @@ void CredentialsSKU::OnRedeemTokens( id = redeem.order_id; } - ledger_->database()->MarkUnblindedTokensAsSpent(token_id_list, redeem.type, + engine_->database()->MarkUnblindedTokensAsSpent(token_id_list, redeem.type, id, callback); } diff --git a/components/brave_rewards/core/credentials/credentials_sku.h b/components/brave_rewards/core/credentials/credentials_sku.h index 0dcae5fba1e..de9e32e2923 100644 --- a/components/brave_rewards/core/credentials/credentials_sku.h +++ b/components/brave_rewards/core/credentials/credentials_sku.h @@ -19,7 +19,7 @@ namespace credential { class CredentialsSKU : public Credentials { public: - explicit CredentialsSKU(LedgerImpl& ledger); + explicit CredentialsSKU(RewardsEngineImpl& engine); ~CredentialsSKU() override; void Start(const CredentialsTrigger& trigger, @@ -79,7 +79,7 @@ class CredentialsSKU : public Credentials { const CredentialsRedeem& redeem, LegacyResultCallback callback); - const raw_ref ledger_; + const raw_ref engine_; CredentialsCommon common_; endpoint::PaymentServer payment_server_; }; diff --git a/components/brave_rewards/core/credentials/credentials_trigger.h b/components/brave_rewards/core/credentials/credentials_trigger.h index 30eae582bbf..253565edbe2 100644 --- a/components/brave_rewards/core/credentials/credentials_trigger.h +++ b/components/brave_rewards/core/credentials/credentials_trigger.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { namespace credential { diff --git a/components/brave_rewards/core/credentials/credentials_util.cc b/components/brave_rewards/core/credentials/credentials_util.cc index 83aef627e94..9686035ea54 100644 --- a/components/brave_rewards/core/credentials/credentials_util.cc +++ b/components/brave_rewards/core/credentials/credentials_util.cc @@ -9,7 +9,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "brave/components/brave_rewards/core/credentials/credentials_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/third_party/challenge_bypass_ristretto_ffi/src/wrapper.h" namespace brave_rewards::internal { diff --git a/components/brave_rewards/core/credentials/credentials_util_unittest.cc b/components/brave_rewards/core/credentials/credentials_util_unittest.cc index f4f0188c306..c5188a8c07f 100644 --- a/components/brave_rewards/core/credentials/credentials_util_unittest.cc +++ b/components/brave_rewards/core/credentials/credentials_util_unittest.cc @@ -9,7 +9,7 @@ #include #include "brave/components/brave_rewards/core/credentials/credentials_util.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "testing/gtest/include/gtest/gtest.h" // npm run test -- brave_unit_tests --filter=PromotionUtilTest.* diff --git a/components/brave_rewards/core/database/database.cc b/components/brave_rewards/core/database/database.cc index 87a4125bdfa..30162162837 100644 --- a/components/brave_rewards/core/database/database.cc +++ b/components/brave_rewards/core/database/database.cc @@ -7,34 +7,34 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; namespace brave_rewards::internal { namespace database { -Database::Database(LedgerImpl& ledger) - : ledger_(ledger), - initialize_(ledger), - activity_info_(ledger), - balance_report_(ledger), - contribution_info_(ledger), - contribution_queue_(ledger), - creds_batch_(ledger), - event_log_(ledger), - external_transactions_(ledger), - promotion_(ledger), - media_publisher_info_(ledger), - multi_tables_(ledger), - publisher_info_(ledger), - publisher_prefix_list_(ledger), - recurring_tip_(ledger), - server_publisher_info_(ledger), - sku_order_(ledger), - sku_transaction_(ledger), - unblinded_token_(ledger) {} +Database::Database(RewardsEngineImpl& engine) + : engine_(engine), + initialize_(engine), + activity_info_(engine), + balance_report_(engine), + contribution_info_(engine), + contribution_queue_(engine), + creds_batch_(engine), + event_log_(engine), + external_transactions_(engine), + promotion_(engine), + media_publisher_info_(engine), + multi_tables_(engine), + publisher_info_(engine), + publisher_prefix_list_(engine), + recurring_tip_(engine), + server_publisher_info_(engine), + sku_order_(engine), + sku_transaction_(engine), + unblinded_token_(engine) {} Database::~Database() = default; @@ -50,7 +50,7 @@ void Database::Close(LegacyResultCallback callback) { transaction->commands.push_back(std::move(command)); auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } /** diff --git a/components/brave_rewards/core/database/database.h b/components/brave_rewards/core/database/database.h index 6d7a41046cd..9ca72b94d52 100644 --- a/components/brave_rewards/core/database/database.h +++ b/components/brave_rewards/core/database/database.h @@ -32,17 +32,17 @@ #include "brave/components/brave_rewards/core/database/database_sku_order.h" #include "brave/components/brave_rewards/core/database/database_sku_transaction.h" #include "brave/components/brave_rewards/core/database/database_unblinded_token.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/publisher/prefix_list_reader.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace database { class Database { public: - explicit Database(LedgerImpl& ledger); + explicit Database(RewardsEngineImpl& engine); virtual ~Database(); void Initialize(LegacyResultCallback callback); @@ -351,7 +351,7 @@ class Database { GetUnblindedTokenListCallback callback); private: - const raw_ref ledger_; + const raw_ref engine_; DatabaseInitialize initialize_; DatabaseActivityInfo activity_info_; DatabaseBalanceReport balance_report_; diff --git a/components/brave_rewards/core/database/database_activity_info.cc b/components/brave_rewards/core/database/database_activity_info.cc index dcaf292056a..c4c89858cb9 100644 --- a/components/brave_rewards/core/database/database_activity_info.cc +++ b/components/brave_rewards/core/database/database_activity_info.cc @@ -10,7 +10,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_activity_info.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" using std::placeholders::_1; @@ -124,8 +124,8 @@ void GenerateActivityFilterBind(mojom::DBCommand* command, namespace database { -DatabaseActivityInfo::DatabaseActivityInfo(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabaseActivityInfo::DatabaseActivityInfo(RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabaseActivityInfo::~DatabaseActivityInfo() = default; @@ -133,7 +133,7 @@ void DatabaseActivityInfo::NormalizeList( std::vector list, LegacyResultCallback callback) { if (list.empty()) { - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); return; } std::string main_query; @@ -144,7 +144,7 @@ void DatabaseActivityInfo::NormalizeList( } if (main_query.empty()) { - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -158,25 +158,25 @@ void DatabaseActivityInfo::NormalizeList( auto shared_list = std::make_shared>(std::move(list)); - ledger_->RunDBTransaction( + engine_->RunDBTransaction( std::move(transaction), [this, shared_list, callback](mojom::DBCommandResponsePtr response) { if (!response || response->status != mojom::DBCommandResponse::Status::RESPONSE_OK) { - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } - ledger_->client()->PublisherListNormalized(std::move(*shared_list)); + engine_->client()->PublisherListNormalized(std::move(*shared_list)); - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); }); } void DatabaseActivityInfo::InsertOrUpdate(mojom::PublisherInfoPtr info, LegacyResultCallback callback) { if (!info) { - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -204,7 +204,7 @@ void DatabaseActivityInfo::InsertOrUpdate(mojom::PublisherInfoPtr info, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseActivityInfo::GetRecordsList( @@ -260,7 +260,7 @@ void DatabaseActivityInfo::GetRecordsList( auto transaction_callback = std::bind(&DatabaseActivityInfo::OnGetRecordsList, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseActivityInfo::OnGetRecordsList( @@ -303,7 +303,7 @@ void DatabaseActivityInfo::OnGetRecordsList( void DatabaseActivityInfo::DeleteRecord(const std::string& publisher_key, LegacyResultCallback callback) { if (publisher_key.empty()) { - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -318,13 +318,13 @@ void DatabaseActivityInfo::DeleteRecord(const std::string& publisher_key, command->command = query; BindString(command.get(), 0, publisher_key); - BindInt64(command.get(), 1, ledger_->state()->GetReconcileStamp()); + BindInt64(command.get(), 1, engine_->state()->GetReconcileStamp()); transaction->commands.push_back(std::move(command)); auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseActivityInfo::GetPublishersVisitedCount( @@ -341,7 +341,7 @@ void DatabaseActivityInfo::GetPublishersVisitedCount( auto command = mojom::DBCommand::New(); command->type = mojom::DBCommand::Type::READ; command->command = query; - BindInt64(command.get(), 0, ledger_->state()->GetReconcileStamp()); + BindInt64(command.get(), 0, engine_->state()->GetReconcileStamp()); command->record_bindings = {mojom::DBCommand::RecordBindingType::INT_TYPE}; transaction->commands.push_back(std::move(command)); @@ -358,7 +358,7 @@ void DatabaseActivityInfo::GetPublishersVisitedCount( std::move(callback).Run(GetIntColumn(record, 0)); }; - ledger_->RunDBTransaction(std::move(transaction), + engine_->RunDBTransaction(std::move(transaction), base::BindOnce(on_read, std::move(callback))); } diff --git a/components/brave_rewards/core/database/database_activity_info.h b/components/brave_rewards/core/database/database_activity_info.h index e5c65b105ba..c27ca83a382 100644 --- a/components/brave_rewards/core/database/database_activity_info.h +++ b/components/brave_rewards/core/database/database_activity_info.h @@ -16,7 +16,7 @@ namespace database { class DatabaseActivityInfo : public DatabaseTable { public: - explicit DatabaseActivityInfo(LedgerImpl& ledger); + explicit DatabaseActivityInfo(RewardsEngineImpl& engine); ~DatabaseActivityInfo() override; void InsertOrUpdate(mojom::PublisherInfoPtr info, diff --git a/components/brave_rewards/core/database/database_activity_info_unittest.cc b/components/brave_rewards/core/database/database_activity_info_unittest.cc index 3846e5fe3b2..6aa2528f669 100644 --- a/components/brave_rewards/core/database/database_activity_info_unittest.cc +++ b/components/brave_rewards/core/database/database_activity_info_unittest.cc @@ -10,8 +10,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/database/database_activity_info.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" // npm run test -- brave_unit_tests --filter=DatabaseActivityInfoTest.* @@ -24,12 +24,12 @@ namespace database { class DatabaseActivityInfoTest : public ::testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - DatabaseActivityInfo activity_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + DatabaseActivityInfo activity_{mock_engine_impl_}; }; TEST_F(DatabaseActivityInfoTest, InsertOrUpdateNull) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .Times(0); MockFunction callback; @@ -40,7 +40,7 @@ TEST_F(DatabaseActivityInfoTest, InsertOrUpdateNull) { } TEST_F(DatabaseActivityInfoTest, InsertOrUpdateOk) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .Times(1) .WillOnce([](mojom::DBTransactionPtr transaction, auto callback) { ASSERT_TRUE(transaction); @@ -72,7 +72,7 @@ TEST_F(DatabaseActivityInfoTest, InsertOrUpdateOk) { } TEST_F(DatabaseActivityInfoTest, GetRecordsListNull) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .Times(0); MockFunction callback; @@ -83,7 +83,7 @@ TEST_F(DatabaseActivityInfoTest, GetRecordsListNull) { } TEST_F(DatabaseActivityInfoTest, GetRecordsListEmpty) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .Times(1) .WillOnce([](mojom::DBTransactionPtr transaction, auto callback) { ASSERT_TRUE(transaction); @@ -116,7 +116,7 @@ TEST_F(DatabaseActivityInfoTest, GetRecordsListEmpty) { } TEST_F(DatabaseActivityInfoTest, GetRecordsListOk) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .Times(1) .WillOnce([](mojom::DBTransactionPtr transaction, auto callback) { ASSERT_TRUE(transaction); @@ -151,7 +151,7 @@ TEST_F(DatabaseActivityInfoTest, GetRecordsListOk) { } TEST_F(DatabaseActivityInfoTest, DeleteRecordEmpty) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .Times(0); MockFunction callback; @@ -162,13 +162,13 @@ TEST_F(DatabaseActivityInfoTest, DeleteRecordEmpty) { } TEST_F(DatabaseActivityInfoTest, DeleteRecordOk) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), GetUint64State(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), GetUint64State(_, _)) .Times(1) .WillOnce([](const std::string&, auto callback) { std::move(callback).Run(1597744617); }); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .Times(1) .WillOnce([](mojom::DBTransactionPtr transaction, auto callback) { ASSERT_TRUE(transaction); diff --git a/components/brave_rewards/core/database/database_balance_report.cc b/components/brave_rewards/core/database/database_balance_report.cc index 0c907e72f28..06e6f0ef3c6 100644 --- a/components/brave_rewards/core/database/database_balance_report.cc +++ b/components/brave_rewards/core/database/database_balance_report.cc @@ -10,7 +10,7 @@ #include "brave/components/brave_rewards/core/database/database_balance_report.h" #include "brave/components/brave_rewards/core/database/database_util.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -48,8 +48,8 @@ std::string GetTypeColumn(mojom::ReportType type) { namespace database { -DatabaseBalanceReport::DatabaseBalanceReport(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabaseBalanceReport::DatabaseBalanceReport(RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabaseBalanceReport::~DatabaseBalanceReport() = default; @@ -57,7 +57,7 @@ void DatabaseBalanceReport::InsertOrUpdate(mojom::BalanceReportInfoPtr info, LegacyResultCallback callback) { if (!info || info->id.empty()) { BLOG(1, "Id is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -85,7 +85,7 @@ void DatabaseBalanceReport::InsertOrUpdate(mojom::BalanceReportInfoPtr info, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseBalanceReport::InsertOrUpdateList( @@ -93,7 +93,7 @@ void DatabaseBalanceReport::InsertOrUpdateList( LegacyResultCallback callback) { if (list.empty()) { BLOG(1, "List is empty"); - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); return; } @@ -123,7 +123,7 @@ void DatabaseBalanceReport::InsertOrUpdateList( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseBalanceReport::SetAmount(mojom::ActivityMonth month, @@ -133,7 +133,7 @@ void DatabaseBalanceReport::SetAmount(mojom::ActivityMonth month, LegacyResultCallback callback) { if (month == mojom::ActivityMonth::ANY || year == 0) { BLOG(1, "Record size is not correct " << month << "/" << year); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } auto transaction = mojom::DBTransaction::New(); @@ -166,7 +166,7 @@ void DatabaseBalanceReport::SetAmount(mojom::ActivityMonth month, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseBalanceReport::GetRecord(mojom::ActivityMonth month, @@ -174,7 +174,7 @@ void DatabaseBalanceReport::GetRecord(mojom::ActivityMonth month, GetBalanceReportCallback callback) { if (month == mojom::ActivityMonth::ANY || year == 0) { BLOG(1, "Record size is not correct " << month << "/" << year); - callback(mojom::Result::LEDGER_ERROR, {}); + callback(mojom::Result::FAILED, {}); return; } @@ -218,21 +218,21 @@ void DatabaseBalanceReport::GetRecord(mojom::ActivityMonth month, auto transaction_callback = std::bind(&DatabaseBalanceReport::OnGetRecord, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseBalanceReport::OnGetRecord(mojom::DBCommandResponsePtr response, GetBalanceReportCallback callback) { if (!response || response->status != mojom::DBCommandResponse::Status::RESPONSE_OK) { BLOG(0, "Response is wrong"); - callback(mojom::Result::LEDGER_ERROR, {}); + callback(mojom::Result::FAILED, {}); return; } if (response->result->get_records().size() != 1) { BLOG(1, "Record size is not correct: " << response->result->get_records().size()); - callback(mojom::Result::LEDGER_ERROR, {}); + callback(mojom::Result::FAILED, {}); return; } @@ -246,7 +246,7 @@ void DatabaseBalanceReport::OnGetRecord(mojom::DBCommandResponsePtr response, info->recurring_donation = GetDoubleColumn(record, 4); info->one_time_donation = GetDoubleColumn(record, 5); - callback(mojom::Result::LEDGER_OK, std::move(info)); + callback(mojom::Result::OK, std::move(info)); } void DatabaseBalanceReport::GetAllRecords( @@ -275,7 +275,7 @@ void DatabaseBalanceReport::GetAllRecords( auto transaction_callback = std::bind(&DatabaseBalanceReport::OnGetAllRecords, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseBalanceReport::OnGetAllRecords( @@ -319,7 +319,7 @@ void DatabaseBalanceReport::DeleteAllRecords(LegacyResultCallback callback) { auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } } // namespace database diff --git a/components/brave_rewards/core/database/database_balance_report.h b/components/brave_rewards/core/database/database_balance_report.h index a947edb2b0b..5fb69e4526c 100644 --- a/components/brave_rewards/core/database/database_balance_report.h +++ b/components/brave_rewards/core/database/database_balance_report.h @@ -16,7 +16,7 @@ namespace database { class DatabaseBalanceReport : public DatabaseTable { public: - explicit DatabaseBalanceReport(LedgerImpl& ledger); + explicit DatabaseBalanceReport(RewardsEngineImpl& engine); ~DatabaseBalanceReport() override; void InsertOrUpdate(mojom::BalanceReportInfoPtr info, diff --git a/components/brave_rewards/core/database/database_balance_report_info_unittest.cc b/components/brave_rewards/core/database/database_balance_report_info_unittest.cc index 3b64d3d7171..d16abefb790 100644 --- a/components/brave_rewards/core/database/database_balance_report_info_unittest.cc +++ b/components/brave_rewards/core/database/database_balance_report_info_unittest.cc @@ -10,8 +10,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/database/database_balance_report.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" // npm run test -- brave_unit_tests --filter=DatabaseBalanceReportTest.* @@ -24,12 +24,12 @@ namespace database { class DatabaseBalanceReportTest : public ::testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - DatabaseBalanceReport balance_report_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + DatabaseBalanceReport balance_report_{mock_engine_impl_}; }; TEST_F(DatabaseBalanceReportTest, InsertOrUpdateOk) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .Times(1) .WillOnce([](mojom::DBTransactionPtr transaction, auto callback) { ASSERT_TRUE(transaction); @@ -61,7 +61,7 @@ TEST_F(DatabaseBalanceReportTest, InsertOrUpdateOk) { } TEST_F(DatabaseBalanceReportTest, GetAllRecordsOk) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .Times(1) .WillOnce([](mojom::DBTransactionPtr transaction, auto callback) { ASSERT_TRUE(transaction); @@ -85,7 +85,7 @@ TEST_F(DatabaseBalanceReportTest, GetAllRecordsOk) { } TEST_F(DatabaseBalanceReportTest, GetRecordOk) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .Times(1) .WillOnce([](mojom::DBTransactionPtr transaction, auto callback) { ASSERT_TRUE(transaction); @@ -111,7 +111,7 @@ TEST_F(DatabaseBalanceReportTest, GetRecordOk) { } TEST_F(DatabaseBalanceReportTest, DeleteAllRecordsOk) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .Times(1) .WillOnce([](mojom::DBTransactionPtr transaction, auto callback) { ASSERT_TRUE(transaction); diff --git a/components/brave_rewards/core/database/database_contribution_info.cc b/components/brave_rewards/core/database/database_contribution_info.cc index f67ce2a1da1..2571a4720c4 100644 --- a/components/brave_rewards/core/database/database_contribution_info.cc +++ b/components/brave_rewards/core/database/database_contribution_info.cc @@ -11,7 +11,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_contribution_info.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -44,8 +44,8 @@ mojom::ReportType ConvertRewardsTypeToReportType( } // namespace -DatabaseContributionInfo::DatabaseContributionInfo(LedgerImpl& ledger) - : DatabaseTable(ledger), publishers_(ledger) {} +DatabaseContributionInfo::DatabaseContributionInfo(RewardsEngineImpl& engine) + : DatabaseTable(engine), publishers_(engine) {} DatabaseContributionInfo::~DatabaseContributionInfo() = default; @@ -53,7 +53,7 @@ void DatabaseContributionInfo::InsertOrUpdate(mojom::ContributionInfoPtr info, LegacyResultCallback callback) { if (!info) { BLOG(1, "Info is null"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -89,7 +89,7 @@ void DatabaseContributionInfo::InsertOrUpdate(mojom::ContributionInfoPtr info, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionInfo::GetRecord(const std::string& contribution_id, @@ -122,7 +122,7 @@ void DatabaseContributionInfo::GetRecord(const std::string& contribution_id, auto transaction_callback = std::bind(&DatabaseContributionInfo::OnGetRecord, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionInfo::OnGetRecord( @@ -204,7 +204,7 @@ void DatabaseContributionInfo::GetAllRecords( auto transaction_callback = std::bind(&DatabaseContributionInfo::OnGetList, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionInfo::GetOneTimeTips(const mojom::ActivityMonth month, @@ -259,7 +259,7 @@ void DatabaseContributionInfo::GetOneTimeTips(const mojom::ActivityMonth month, auto transaction_callback = std::bind( &DatabaseContributionInfo::OnGetOneTimeTips, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionInfo::OnGetOneTimeTips( @@ -335,7 +335,7 @@ void DatabaseContributionInfo::GetContributionReport( auto transaction_callback = std::bind( &DatabaseContributionInfo::OnGetContributionReport, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionInfo::OnGetContributionReport( @@ -456,7 +456,7 @@ void DatabaseContributionInfo::GetNotCompletedRecords( auto transaction_callback = std::bind(&DatabaseContributionInfo::OnGetList, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionInfo::OnGetList( @@ -527,7 +527,7 @@ void DatabaseContributionInfo::UpdateStep(const std::string& contribution_id, LegacyResultCallback callback) { if (contribution_id.empty()) { BLOG(1, "Contribution id is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -548,7 +548,7 @@ void DatabaseContributionInfo::UpdateStep(const std::string& contribution_id, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionInfo::UpdateStepAndCount( @@ -558,7 +558,7 @@ void DatabaseContributionInfo::UpdateStepAndCount( LegacyResultCallback callback) { if (contribution_id.empty()) { BLOG(1, "Contribution id is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -580,7 +580,7 @@ void DatabaseContributionInfo::UpdateStepAndCount( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionInfo::UpdateContributedAmount( @@ -607,7 +607,7 @@ void DatabaseContributionInfo::FinishAllInProgressRecords( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } } // namespace database diff --git a/components/brave_rewards/core/database/database_contribution_info.h b/components/brave_rewards/core/database/database_contribution_info.h index 42193e978e1..add65586510 100644 --- a/components/brave_rewards/core/database/database_contribution_info.h +++ b/components/brave_rewards/core/database/database_contribution_info.h @@ -21,7 +21,7 @@ using GetContributionInfoCallback = class DatabaseContributionInfo : public DatabaseTable { public: - explicit DatabaseContributionInfo(LedgerImpl& ledger); + explicit DatabaseContributionInfo(RewardsEngineImpl& engine); ~DatabaseContributionInfo() override; void InsertOrUpdate(mojom::ContributionInfoPtr info, diff --git a/components/brave_rewards/core/database/database_contribution_info_publishers.cc b/components/brave_rewards/core/database/database_contribution_info_publishers.cc index 8745149264a..f2ac64ece1a 100644 --- a/components/brave_rewards/core/database/database_contribution_info_publishers.cc +++ b/components/brave_rewards/core/database/database_contribution_info_publishers.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_contribution_info_publishers.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -23,8 +23,8 @@ const char kTableName[] = "contribution_info_publishers"; } // namespace DatabaseContributionInfoPublishers::DatabaseContributionInfoPublishers( - LedgerImpl& ledger) - : DatabaseTable(ledger) {} + RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabaseContributionInfoPublishers::~DatabaseContributionInfoPublishers() = default; @@ -89,7 +89,7 @@ void DatabaseContributionInfoPublishers::GetRecordByContributionList( &DatabaseContributionInfoPublishers::OnGetRecordByContributionList, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionInfoPublishers::OnGetRecordByContributionList( @@ -159,7 +159,7 @@ void DatabaseContributionInfoPublishers::GetContributionPublisherPairList( &DatabaseContributionInfoPublishers::OnGetContributionPublisherInfoMap, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionInfoPublishers::OnGetContributionPublisherInfoMap( @@ -200,7 +200,7 @@ void DatabaseContributionInfoPublishers::UpdateContributedAmount( LegacyResultCallback callback) { if (contribution_id.empty() || publisher_key.empty()) { BLOG(1, "Data is empty " << contribution_id << "/" << publisher_key); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -225,7 +225,7 @@ void DatabaseContributionInfoPublishers::UpdateContributedAmount( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } } // namespace database diff --git a/components/brave_rewards/core/database/database_contribution_info_publishers.h b/components/brave_rewards/core/database/database_contribution_info_publishers.h index 688e412efe3..0e054d92fd1 100644 --- a/components/brave_rewards/core/database/database_contribution_info_publishers.h +++ b/components/brave_rewards/core/database/database_contribution_info_publishers.h @@ -16,7 +16,7 @@ namespace database { class DatabaseContributionInfoPublishers : public DatabaseTable { public: - explicit DatabaseContributionInfoPublishers(LedgerImpl& ledger); + explicit DatabaseContributionInfoPublishers(RewardsEngineImpl& engine); ~DatabaseContributionInfoPublishers() override; void InsertOrUpdate(mojom::DBTransaction* transaction, diff --git a/components/brave_rewards/core/database/database_contribution_queue.cc b/components/brave_rewards/core/database/database_contribution_queue.cc index a83a52b297c..563c318a55f 100644 --- a/components/brave_rewards/core/database/database_contribution_queue.cc +++ b/components/brave_rewards/core/database/database_contribution_queue.cc @@ -11,7 +11,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_contribution_queue.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -24,8 +24,8 @@ const char kTableName[] = "contribution_queue"; } // namespace -DatabaseContributionQueue::DatabaseContributionQueue(LedgerImpl& ledger) - : DatabaseTable(ledger), publishers_(ledger) {} +DatabaseContributionQueue::DatabaseContributionQueue(RewardsEngineImpl& engine) + : DatabaseTable(engine), publishers_(engine) {} DatabaseContributionQueue::~DatabaseContributionQueue() = default; @@ -33,13 +33,13 @@ void DatabaseContributionQueue::InsertOrUpdate(mojom::ContributionQueuePtr info, LegacyResultCallback callback) { if (!info) { BLOG(0, "Queue is null"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } if (info->id.empty()) { BLOG(0, "Queue id is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -69,7 +69,7 @@ void DatabaseContributionQueue::InsertOrUpdate(mojom::ContributionQueuePtr info, std::bind(&DatabaseContributionQueue::OnInsertOrUpdate, this, _1, shared_info, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionQueue::OnInsertOrUpdate( @@ -79,13 +79,13 @@ void DatabaseContributionQueue::OnInsertOrUpdate( if (!response || response->status != mojom::DBCommandResponse::Status::RESPONSE_OK) { BLOG(0, "Response is not ok"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } if (!shared_queue) { BLOG(0, "Queue is null"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -117,7 +117,7 @@ void DatabaseContributionQueue::GetFirstRecord( auto transaction_callback = std::bind( &DatabaseContributionQueue::OnGetFirstRecord, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionQueue::OnGetFirstRecord( @@ -172,7 +172,7 @@ void DatabaseContributionQueue::MarkRecordAsComplete( LegacyResultCallback callback) { if (id.empty()) { BLOG(1, "Id is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -193,7 +193,7 @@ void DatabaseContributionQueue::MarkRecordAsComplete( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } } // namespace database diff --git a/components/brave_rewards/core/database/database_contribution_queue.h b/components/brave_rewards/core/database/database_contribution_queue.h index 79914c83c4d..34b469b20c6 100644 --- a/components/brave_rewards/core/database/database_contribution_queue.h +++ b/components/brave_rewards/core/database/database_contribution_queue.h @@ -21,7 +21,7 @@ using GetFirstContributionQueueCallback = class DatabaseContributionQueue : public DatabaseTable { public: - explicit DatabaseContributionQueue(LedgerImpl& ledger); + explicit DatabaseContributionQueue(RewardsEngineImpl& engine); ~DatabaseContributionQueue() override; void InsertOrUpdate(mojom::ContributionQueuePtr info, diff --git a/components/brave_rewards/core/database/database_contribution_queue_publishers.cc b/components/brave_rewards/core/database/database_contribution_queue_publishers.cc index 20dc5d446d2..9b1ab2adcec 100644 --- a/components/brave_rewards/core/database/database_contribution_queue_publishers.cc +++ b/components/brave_rewards/core/database/database_contribution_queue_publishers.cc @@ -10,7 +10,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_contribution_queue_publishers.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -24,8 +24,8 @@ const char kTableName[] = "contribution_queue_publishers"; } // namespace DatabaseContributionQueuePublishers::DatabaseContributionQueuePublishers( - LedgerImpl& ledger) - : DatabaseTable(ledger) {} + RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabaseContributionQueuePublishers::~DatabaseContributionQueuePublishers() = default; @@ -36,7 +36,7 @@ void DatabaseContributionQueuePublishers::InsertOrUpdate( LegacyResultCallback callback) { if (id.empty() || list.empty()) { BLOG(1, "Empty data"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -61,7 +61,7 @@ void DatabaseContributionQueuePublishers::InsertOrUpdate( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionQueuePublishers::GetRecordsByQueueId( @@ -95,7 +95,7 @@ void DatabaseContributionQueuePublishers::GetRecordsByQueueId( std::bind(&DatabaseContributionQueuePublishers::OnGetRecordsByQueueId, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseContributionQueuePublishers::OnGetRecordsByQueueId( diff --git a/components/brave_rewards/core/database/database_contribution_queue_publishers.h b/components/brave_rewards/core/database/database_contribution_queue_publishers.h index 5d7ec6e5175..8a001f4960a 100644 --- a/components/brave_rewards/core/database/database_contribution_queue_publishers.h +++ b/components/brave_rewards/core/database/database_contribution_queue_publishers.h @@ -16,7 +16,7 @@ namespace database { class DatabaseContributionQueuePublishers : public DatabaseTable { public: - explicit DatabaseContributionQueuePublishers(LedgerImpl& ledger); + explicit DatabaseContributionQueuePublishers(RewardsEngineImpl& engine); ~DatabaseContributionQueuePublishers() override; void InsertOrUpdate(const std::string& id, diff --git a/components/brave_rewards/core/database/database_creds_batch.cc b/components/brave_rewards/core/database/database_creds_batch.cc index 5e01e6333fc..4aae508a4b4 100644 --- a/components/brave_rewards/core/database/database_creds_batch.cc +++ b/components/brave_rewards/core/database/database_creds_batch.cc @@ -8,7 +8,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_creds_batch.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -21,8 +21,8 @@ const char kTableName[] = "creds_batch"; } // namespace -DatabaseCredsBatch::DatabaseCredsBatch(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabaseCredsBatch::DatabaseCredsBatch(RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabaseCredsBatch::~DatabaseCredsBatch() = default; @@ -30,7 +30,7 @@ void DatabaseCredsBatch::InsertOrUpdate(mojom::CredsBatchPtr creds, LegacyResultCallback callback) { if (!creds) { BLOG(1, "Creds is null"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -61,7 +61,7 @@ void DatabaseCredsBatch::InsertOrUpdate(mojom::CredsBatchPtr creds, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseCredsBatch::GetRecordByTrigger( @@ -99,7 +99,7 @@ void DatabaseCredsBatch::GetRecordByTrigger( auto transaction_callback = std::bind(&DatabaseCredsBatch::OnGetRecordByTrigger, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseCredsBatch::OnGetRecordByTrigger( @@ -140,7 +140,7 @@ void DatabaseCredsBatch::SaveSignedCreds(mojom::CredsBatchPtr creds, LegacyResultCallback callback) { if (!creds) { BLOG(1, "Creds is null"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -166,7 +166,7 @@ void DatabaseCredsBatch::SaveSignedCreds(mojom::CredsBatchPtr creds, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseCredsBatch::GetAllRecords(GetCredsBatchListCallback callback) { @@ -196,7 +196,7 @@ void DatabaseCredsBatch::GetAllRecords(GetCredsBatchListCallback callback) { auto transaction_callback = std::bind(&DatabaseCredsBatch::OnGetRecords, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseCredsBatch::OnGetRecords(mojom::DBCommandResponsePtr response, @@ -237,7 +237,7 @@ void DatabaseCredsBatch::UpdateStatus(const std::string& trigger_id, LegacyResultCallback callback) { if (trigger_id.empty()) { BLOG(0, "Trigger id is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -259,7 +259,7 @@ void DatabaseCredsBatch::UpdateStatus(const std::string& trigger_id, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseCredsBatch::UpdateRecordsStatus( @@ -269,7 +269,7 @@ void DatabaseCredsBatch::UpdateRecordsStatus( LegacyResultCallback callback) { if (trigger_ids.empty()) { BLOG(0, "Trigger id is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -290,7 +290,7 @@ void DatabaseCredsBatch::UpdateRecordsStatus( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseCredsBatch::GetRecordsByTriggers( @@ -323,7 +323,7 @@ void DatabaseCredsBatch::GetRecordsByTriggers( auto transaction_callback = std::bind(&DatabaseCredsBatch::OnGetRecords, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } } // namespace database diff --git a/components/brave_rewards/core/database/database_creds_batch.h b/components/brave_rewards/core/database/database_creds_batch.h index 4a0bceb7a6e..1818ecfd21a 100644 --- a/components/brave_rewards/core/database/database_creds_batch.h +++ b/components/brave_rewards/core/database/database_creds_batch.h @@ -20,7 +20,7 @@ using GetCredsBatchListCallback = class DatabaseCredsBatch : public DatabaseTable { public: - explicit DatabaseCredsBatch(LedgerImpl& ledger); + explicit DatabaseCredsBatch(RewardsEngineImpl& engine); ~DatabaseCredsBatch() override; void InsertOrUpdate(mojom::CredsBatchPtr creds, diff --git a/components/brave_rewards/core/database/database_event_log.cc b/components/brave_rewards/core/database/database_event_log.cc index c989d4aca57..5f039e5a986 100644 --- a/components/brave_rewards/core/database/database_event_log.cc +++ b/components/brave_rewards/core/database/database_event_log.cc @@ -11,7 +11,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_event_log.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -24,8 +24,8 @@ const char kTableName[] = "event_log"; } // namespace -DatabaseEventLog::DatabaseEventLog(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabaseEventLog::DatabaseEventLog(RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabaseEventLog::~DatabaseEventLog() = default; @@ -55,7 +55,7 @@ void DatabaseEventLog::Insert(const std::string& key, transaction->commands.push_back(std::move(command)); - ledger_->RunDBTransaction(std::move(transaction), + engine_->RunDBTransaction(std::move(transaction), [](mojom::DBCommandResponsePtr response) {}); } @@ -92,7 +92,7 @@ void DatabaseEventLog::InsertRecords( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseEventLog::GetLastRecords(GetEventLogsCallback callback) { @@ -119,7 +119,7 @@ void DatabaseEventLog::GetLastRecords(GetEventLogsCallback callback) { auto transaction_callback = std::bind(&DatabaseEventLog::OnGetAllRecords, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseEventLog::OnGetAllRecords(mojom::DBCommandResponsePtr response, diff --git a/components/brave_rewards/core/database/database_event_log.h b/components/brave_rewards/core/database/database_event_log.h index 1407a6e312d..b1efa72855b 100644 --- a/components/brave_rewards/core/database/database_event_log.h +++ b/components/brave_rewards/core/database/database_event_log.h @@ -16,7 +16,7 @@ namespace database { class DatabaseEventLog : public DatabaseTable { public: - explicit DatabaseEventLog(LedgerImpl& ledger); + explicit DatabaseEventLog(RewardsEngineImpl& engine); ~DatabaseEventLog() override; void Insert(const std::string& key, const std::string& value); diff --git a/components/brave_rewards/core/database/database_external_transactions.cc b/components/brave_rewards/core/database/database_external_transactions.cc index b6301ac40db..8756b34cffc 100644 --- a/components/brave_rewards/core/database/database_external_transactions.cc +++ b/components/brave_rewards/core/database/database_external_transactions.cc @@ -9,14 +9,15 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_external_transactions.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal::database { constexpr char kTableName[] = "external_transactions"; -DatabaseExternalTransactions::DatabaseExternalTransactions(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabaseExternalTransactions::DatabaseExternalTransactions( + RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabaseExternalTransactions::~DatabaseExternalTransactions() = default; @@ -25,7 +26,7 @@ void DatabaseExternalTransactions::Insert( ResultCallback callback) { if (!external_transaction) { BLOG(0, "external_transaction is null!"); - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + return std::move(callback).Run(mojom::Result::FAILED); } auto command = mojom::DBCommand::New(); @@ -44,7 +45,7 @@ void DatabaseExternalTransactions::Insert( auto transaction = mojom::DBTransaction::New(); transaction->commands.push_back(std::move(command)); - ledger_->RunDBTransaction( + engine_->RunDBTransaction( std::move(transaction), base::BindOnce(&DatabaseExternalTransactions::OnInsert, base::Unretained(this), std::move(callback))); @@ -56,8 +57,8 @@ void DatabaseExternalTransactions::OnInsert( std::move(callback).Run( response && response->status == mojom::DBCommandResponse::Status::RESPONSE_OK - ? mojom::Result::LEDGER_OK - : mojom::Result::LEDGER_ERROR); + ? mojom::Result::OK + : mojom::Result::FAILED); } void DatabaseExternalTransactions::GetTransaction( @@ -83,7 +84,7 @@ void DatabaseExternalTransactions::GetTransaction( auto transaction = mojom::DBTransaction::New(); transaction->commands.push_back(std::move(command)); - ledger_->RunDBTransaction( + engine_->RunDBTransaction( std::move(transaction), base::BindOnce(&DatabaseExternalTransactions::OnGetTransaction, base::Unretained(this), std::move(callback))); diff --git a/components/brave_rewards/core/database/database_external_transactions.h b/components/brave_rewards/core/database/database_external_transactions.h index 07de6143163..d21f9a46c62 100644 --- a/components/brave_rewards/core/database/database_external_transactions.h +++ b/components/brave_rewards/core/database/database_external_transactions.h @@ -21,7 +21,7 @@ using GetExternalTransactionCallback = class DatabaseExternalTransactions : public DatabaseTable { public: - explicit DatabaseExternalTransactions(LedgerImpl& ledger); + explicit DatabaseExternalTransactions(RewardsEngineImpl& engine); ~DatabaseExternalTransactions() override; void Insert(mojom::ExternalTransactionPtr, ResultCallback); diff --git a/components/brave_rewards/core/database/database_initialize.cc b/components/brave_rewards/core/database/database_initialize.cc index 0f73cff5250..329b7793e6f 100644 --- a/components/brave_rewards/core/database/database_initialize.cc +++ b/components/brave_rewards/core/database/database_initialize.cc @@ -7,7 +7,7 @@ #include "brave/components/brave_rewards/core/database/database_initialize.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" using std::placeholders::_1; @@ -16,8 +16,8 @@ using std::placeholders::_2; namespace brave_rewards::internal { namespace database { -DatabaseInitialize::DatabaseInitialize(LedgerImpl& ledger) - : ledger_(ledger), migration_(ledger) {} +DatabaseInitialize::DatabaseInitialize(RewardsEngineImpl& engine) + : engine_(engine), migration_(engine) {} DatabaseInitialize::~DatabaseInitialize() = default; @@ -29,7 +29,7 @@ void DatabaseInitialize::Start(LegacyResultCallback callback) { command->type = mojom::DBCommand::Type::INITIALIZE; transaction->commands.push_back(std::move(command)); - ledger_->RunDBTransaction( + engine_->RunDBTransaction( std::move(transaction), std::bind(&DatabaseInitialize::OnInitialize, this, _1, callback)); } diff --git a/components/brave_rewards/core/database/database_initialize.h b/components/brave_rewards/core/database/database_initialize.h index 19e4c00871d..d180b2f6f5b 100644 --- a/components/brave_rewards/core/database/database_initialize.h +++ b/components/brave_rewards/core/database/database_initialize.h @@ -8,16 +8,16 @@ #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/database/database_migration.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace database { class DatabaseInitialize { public: - explicit DatabaseInitialize(LedgerImpl& ledger); + explicit DatabaseInitialize(RewardsEngineImpl& engine); ~DatabaseInitialize(); void Start(LegacyResultCallback callback); @@ -26,7 +26,7 @@ class DatabaseInitialize { void OnInitialize(mojom::DBCommandResponsePtr response, LegacyResultCallback callback); - const raw_ref ledger_; + const raw_ref engine_; DatabaseMigration migration_; }; diff --git a/components/brave_rewards/core/database/database_media_publisher_info.cc b/components/brave_rewards/core/database/database_media_publisher_info.cc index 57d8ec5fe7e..ed0c62df046 100644 --- a/components/brave_rewards/core/database/database_media_publisher_info.cc +++ b/components/brave_rewards/core/database/database_media_publisher_info.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_media_publisher_info.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -22,8 +22,9 @@ const char kTableName[] = "media_publisher_info"; } // namespace -DatabaseMediaPublisherInfo::DatabaseMediaPublisherInfo(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabaseMediaPublisherInfo::DatabaseMediaPublisherInfo( + RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabaseMediaPublisherInfo::~DatabaseMediaPublisherInfo() = default; @@ -33,7 +34,7 @@ void DatabaseMediaPublisherInfo::InsertOrUpdate( LegacyResultCallback callback) { if (media_key.empty() || publisher_key.empty()) { BLOG(1, "Data is empty " << media_key << "/" << publisher_key); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -54,14 +55,14 @@ void DatabaseMediaPublisherInfo::InsertOrUpdate( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseMediaPublisherInfo::GetRecord(const std::string& media_key, PublisherInfoCallback callback) { if (media_key.empty()) { BLOG(1, "Media key is empty"); - return callback(mojom::Result::LEDGER_ERROR, {}); + return callback(mojom::Result::FAILED, {}); } auto transaction = mojom::DBTransaction::New(); @@ -96,7 +97,7 @@ void DatabaseMediaPublisherInfo::GetRecord(const std::string& media_key, auto transaction_callback = std::bind(&DatabaseMediaPublisherInfo::OnGetRecord, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseMediaPublisherInfo::OnGetRecord( @@ -105,7 +106,7 @@ void DatabaseMediaPublisherInfo::OnGetRecord( if (!response || response->status != mojom::DBCommandResponse::Status::RESPONSE_OK) { BLOG(1, "Response is wrong"); - callback(mojom::Result::LEDGER_ERROR, {}); + callback(mojom::Result::FAILED, {}); return; } @@ -129,7 +130,7 @@ void DatabaseMediaPublisherInfo::OnGetRecord( info->excluded = static_cast(GetIntColumn(record, 7)); - callback(mojom::Result::LEDGER_OK, std::move(info)); + callback(mojom::Result::OK, std::move(info)); } } // namespace database diff --git a/components/brave_rewards/core/database/database_media_publisher_info.h b/components/brave_rewards/core/database/database_media_publisher_info.h index 1dcfb39eafd..798f8642eab 100644 --- a/components/brave_rewards/core/database/database_media_publisher_info.h +++ b/components/brave_rewards/core/database/database_media_publisher_info.h @@ -15,7 +15,7 @@ namespace database { class DatabaseMediaPublisherInfo : public DatabaseTable { public: - explicit DatabaseMediaPublisherInfo(LedgerImpl& ledger); + explicit DatabaseMediaPublisherInfo(RewardsEngineImpl& engine); ~DatabaseMediaPublisherInfo() override; void InsertOrUpdate(const std::string& media_key, diff --git a/components/brave_rewards/core/database/database_migration.cc b/components/brave_rewards/core/database/database_migration.cc index b10b01d4470..091ebb8b877 100644 --- a/components/brave_rewards/core/database/database_migration.cc +++ b/components/brave_rewards/core/database/database_migration.cc @@ -51,8 +51,8 @@ #include "brave/components/brave_rewards/core/database/migration/migration_v7.h" #include "brave/components/brave_rewards/core/database/migration/migration_v8.h" #include "brave/components/brave_rewards/core/database/migration/migration_v9.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "third_party/re2/src/re2/re2.h" // NOTICE!! @@ -66,7 +66,8 @@ namespace database { uint32_t DatabaseMigration::test_target_version_ = 0; -DatabaseMigration::DatabaseMigration(LedgerImpl& ledger) : ledger_(ledger) {} +DatabaseMigration::DatabaseMigration(RewardsEngineImpl& engine) + : engine_(engine) {} DatabaseMigration::~DatabaseMigration() = default; @@ -82,7 +83,7 @@ void DatabaseMigration::Start(uint32_t table_version, : database::GetCurrentVersion(); if (target_version == table_version) { - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); return; } @@ -94,7 +95,7 @@ void DatabaseMigration::Start(uint32_t table_version, // order to prevent display of BAP historical information in monthly reports. std::string migration_v30 = ""; std::string migration_v32 = ""; - if (ledger_->IsBitFlyerRegion()) { + if (engine_->IsBitFlyerRegion()) { migration_v30 = migration::v30; migration_v32 = migration::v32; } @@ -166,20 +167,20 @@ void DatabaseMigration::Start(uint32_t table_version, const std::string message = base::StringPrintf("%d->%d", start_version, migrated_version); - ledger_->RunDBTransaction( + engine_->RunDBTransaction( std::move(transaction), [this, callback, message, migrated_version]( mojom::DBCommandResponsePtr response) { if (response && response->status == mojom::DBCommandResponse::Status::RESPONSE_OK) { // The event_log table was introduced in v29. if (migrated_version >= 29) { - ledger_->database()->SaveEventLog(log::kDatabaseMigrated, message); + engine_->database()->SaveEventLog(log::kDatabaseMigrated, message); } - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); return; } - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); }); } diff --git a/components/brave_rewards/core/database/database_migration.h b/components/brave_rewards/core/database/database_migration.h index 1b2b961e149..7dd409d6641 100644 --- a/components/brave_rewards/core/database/database_migration.h +++ b/components/brave_rewards/core/database/database_migration.h @@ -10,16 +10,16 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace database { class DatabaseMigration { public: - explicit DatabaseMigration(LedgerImpl& ledger); + explicit DatabaseMigration(RewardsEngineImpl& engine); ~DatabaseMigration(); void Start(uint32_t table_version, LegacyResultCallback callback); @@ -30,7 +30,7 @@ class DatabaseMigration { void GenerateCommand(mojom::DBTransaction* transaction, const std::string& query); - const raw_ref ledger_; + const raw_ref engine_; static uint32_t test_target_version_; }; diff --git a/components/brave_rewards/core/database/database_migration_unittest.cc b/components/brave_rewards/core/database/database_migration_unittest.cc index 0b0851104b2..7adbacc43be 100644 --- a/components/brave_rewards/core/database/database_migration_unittest.cc +++ b/components/brave_rewards/core/database/database_migration_unittest.cc @@ -14,30 +14,30 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/database/database_migration.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" -#include "brave/components/brave_rewards/core/test/bat_ledger_test.h" -#include "brave/components/brave_rewards/core/test/test_ledger_client.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/test/rewards_engine_test.h" +#include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" #include "build/build_config.h" #include "sql/statement.h" #include "testing/gtest/include/gtest/gtest.h" -// npm run test -- brave_unit_tests --filter=LedgerDatabaseMigrationTest.* +// npm run test -- brave_unit_tests --filter=RewardsDatabaseMigrationTest.* namespace brave_rewards::internal { using database::DatabaseMigration; -class LedgerDatabaseMigrationTest : public BATLedgerTest { +class RewardsDatabaseMigrationTest : public RewardsEngineTest { public: - LedgerDatabaseMigrationTest() { is_testing = true; } + RewardsDatabaseMigrationTest() { is_testing = true; } - ~LedgerDatabaseMigrationTest() override { + ~RewardsDatabaseMigrationTest() override { DatabaseMigration::SetTargetVersionForTesting(0); is_testing = false; } protected: sql::Database* GetDB() { - return GetTestLedgerClient()->database()->GetInternalDatabaseForTesting(); + return GetTestClient()->database()->GetInternalDatabaseForTesting(); } std::string GetExpectedSchema() { @@ -95,18 +95,18 @@ class LedgerDatabaseMigrationTest : public BATLedgerTest { } }; -TEST_F(LedgerDatabaseMigrationTest, SchemaCheck) { +TEST_F(RewardsDatabaseMigrationTest, SchemaCheck) { DatabaseMigration::SetTargetVersionForTesting(database::GetCurrentVersion()); - InitializeLedger(); + InitializeEngine(); std::string expected_schema = GetExpectedSchema(); EXPECT_FALSE(expected_schema.empty()); EXPECT_EQ(GetDB()->GetSchema(), expected_schema); } -TEST_F(LedgerDatabaseMigrationTest, Migration_4_ActivityInfo) { +TEST_F(RewardsDatabaseMigrationTest, Migration_4_ActivityInfo) { DatabaseMigration::SetTargetVersionForTesting(4); InitializeDatabaseAtVersion(3); - InitializeLedger(); + InitializeEngine(); sql::Statement info_sql(GetDB()->GetUniqueStatement(R"sql( SELECT publisher_id, visits FROM activity_info @@ -126,10 +126,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_4_ActivityInfo) { EXPECT_EQ(list.at(1)->visits, 5u); } -TEST_F(LedgerDatabaseMigrationTest, Migration_5_ActivityInfo) { +TEST_F(RewardsDatabaseMigrationTest, Migration_5_ActivityInfo) { DatabaseMigration::SetTargetVersionForTesting(5); InitializeDatabaseAtVersion(4); - InitializeLedger(); + InitializeEngine(); sql::Statement info_sql(GetDB()->GetUniqueStatement(R"sql( SELECT publisher_id, visits FROM activity_info @@ -152,10 +152,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_5_ActivityInfo) { EXPECT_EQ(list.at(2)->visits, 3u); } -TEST_F(LedgerDatabaseMigrationTest, Migration_6_ActivityInfo) { +TEST_F(RewardsDatabaseMigrationTest, Migration_6_ActivityInfo) { DatabaseMigration::SetTargetVersionForTesting(6); InitializeDatabaseAtVersion(5); - InitializeLedger(); + InitializeEngine(); sql::Statement info_sql(GetDB()->GetUniqueStatement(R"sql( SELECT publisher_id, visits, duration, score, percent, weight, @@ -202,10 +202,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_6_ActivityInfo) { EXPECT_EQ(list.at(2)->reconcile_stamp, 1553423066u); } -TEST_F(LedgerDatabaseMigrationTest, Migration_8_PendingContribution) { +TEST_F(RewardsDatabaseMigrationTest, Migration_8_PendingContribution) { DatabaseMigration::SetTargetVersionForTesting(8); InitializeDatabaseAtVersion(7); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("pending_contribution"), 1); @@ -225,10 +225,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_8_PendingContribution) { static_cast(mojom::RewardsType::ONE_TIME_TIP)); } -TEST_F(LedgerDatabaseMigrationTest, Migration_11_ContributionInfo) { +TEST_F(RewardsDatabaseMigrationTest, Migration_11_ContributionInfo) { DatabaseMigration::SetTargetVersionForTesting(11); InitializeDatabaseAtVersion(10); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("contribution_info"), 5); EXPECT_EQ(CountTableRows("contribution_info_publishers"), 4); @@ -269,10 +269,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_11_ContributionInfo) { EXPECT_EQ(ac_sql.ColumnDouble(6), 0.0); } -TEST_F(LedgerDatabaseMigrationTest, Migration_12_ContributionInfo) { +TEST_F(RewardsDatabaseMigrationTest, Migration_12_ContributionInfo) { DatabaseMigration::SetTargetVersionForTesting(12); InitializeDatabaseAtVersion(11); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("pending_contribution"), 4); @@ -296,17 +296,17 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_12_ContributionInfo) { EXPECT_FALSE(info_sql.Step()); } -TEST_F(LedgerDatabaseMigrationTest, Migration_13_Promotion) { +TEST_F(RewardsDatabaseMigrationTest, Migration_13_Promotion) { DatabaseMigration::SetTargetVersionForTesting(13); InitializeDatabaseAtVersion(12); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("promotion"), 1); } -TEST_F(LedgerDatabaseMigrationTest, Migration_14_UnblindedToken) { +TEST_F(RewardsDatabaseMigrationTest, Migration_14_UnblindedToken) { DatabaseMigration::SetTargetVersionForTesting(14); InitializeDatabaseAtVersion(13); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("unblinded_tokens"), 5); @@ -338,10 +338,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_14_UnblindedToken) { EXPECT_EQ(promotion_sql.ColumnDouble(0), 1.25); } -TEST_F(LedgerDatabaseMigrationTest, Migration_16_ContributionInfo) { +TEST_F(RewardsDatabaseMigrationTest, Migration_16_ContributionInfo) { DatabaseMigration::SetTargetVersionForTesting(16); InitializeDatabaseAtVersion(15); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("contribution_info"), 5); @@ -361,10 +361,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_16_ContributionInfo) { EXPECT_EQ(list.at(4), 1583310925); } -TEST_F(LedgerDatabaseMigrationTest, Migration_18_Promotion) { +TEST_F(RewardsDatabaseMigrationTest, Migration_18_Promotion) { DatabaseMigration::SetTargetVersionForTesting(18); InitializeDatabaseAtVersion(17); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("promotion"), 2); @@ -390,10 +390,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_18_Promotion) { EXPECT_EQ(status.at(1), 4); } -TEST_F(LedgerDatabaseMigrationTest, Migration_18_CredsBatch) { +TEST_F(RewardsDatabaseMigrationTest, Migration_18_CredsBatch) { DatabaseMigration::SetTargetVersionForTesting(18); InitializeDatabaseAtVersion(17); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("creds_batch"), 2); @@ -442,10 +442,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_18_CredsBatch) { EXPECT_EQ(static_cast(creds_database.status), 2); } -TEST_F(LedgerDatabaseMigrationTest, Migration_18_UnblindedToken) { +TEST_F(RewardsDatabaseMigrationTest, Migration_18_UnblindedToken) { DatabaseMigration::SetTargetVersionForTesting(18); InitializeDatabaseAtVersion(17); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("unblinded_tokens"), 80); @@ -468,10 +468,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_18_UnblindedToken) { EXPECT_EQ(expires_at, 1640995200ul); } -TEST_F(LedgerDatabaseMigrationTest, Migration_21_ContributionInfoPublishers) { +TEST_F(RewardsDatabaseMigrationTest, Migration_21_ContributionInfoPublishers) { DatabaseMigration::SetTargetVersionForTesting(21); InitializeDatabaseAtVersion(20); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("contribution_info_publishers"), 4); @@ -510,10 +510,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_21_ContributionInfoPublishers) { EXPECT_EQ(list.at(3)->contributed_amount, 1.0); } -TEST_F(LedgerDatabaseMigrationTest, Migration_23_ContributionQueue) { +TEST_F(RewardsDatabaseMigrationTest, Migration_23_ContributionQueue) { DatabaseMigration::SetTargetVersionForTesting(23); InitializeDatabaseAtVersion(22); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("contribution_queue"), 1); @@ -555,10 +555,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_23_ContributionQueue) { EXPECT_EQ(queue_publisher.amount_percent, 456.0); } -TEST_F(LedgerDatabaseMigrationTest, Migration_24_ContributionQueue) { +TEST_F(RewardsDatabaseMigrationTest, Migration_24_ContributionQueue) { DatabaseMigration::SetTargetVersionForTesting(24); InitializeDatabaseAtVersion(23); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("contribution_queue"), 1); @@ -585,10 +585,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_24_ContributionQueue) { EXPECT_EQ(contribution_queue.completed_at, 0u); } -TEST_F(LedgerDatabaseMigrationTest, Migration_26_UnblindedTokens) { +TEST_F(RewardsDatabaseMigrationTest, Migration_26_UnblindedTokens) { DatabaseMigration::SetTargetVersionForTesting(26); InitializeDatabaseAtVersion(25); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("unblinded_tokens"), 10); @@ -664,10 +664,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_26_UnblindedTokens) { EXPECT_EQ(token->redeem_type, mojom::RewardsType::ONE_TIME_TIP); } -TEST_F(LedgerDatabaseMigrationTest, Migration_27_UnblindedTokens) { +TEST_F(RewardsDatabaseMigrationTest, Migration_27_UnblindedTokens) { DatabaseMigration::SetTargetVersionForTesting(27); InitializeDatabaseAtVersion(26); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("unblinded_tokens"), 1); @@ -698,10 +698,10 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_27_UnblindedTokens) { EXPECT_EQ(reserved_at, 0ul); } -TEST_F(LedgerDatabaseMigrationTest, Migration_28_ServerPublisherInfoCleared) { +TEST_F(RewardsDatabaseMigrationTest, Migration_28_ServerPublisherInfoCleared) { DatabaseMigration::SetTargetVersionForTesting(28); InitializeDatabaseAtVersion(27); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("server_publisher_info"), 1); EXPECT_EQ(CountTableRows("server_publisher_banner"), 1); @@ -721,69 +721,69 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_28_ServerPublisherInfoCleared) { } } -TEST_F(LedgerDatabaseMigrationTest, Migration_30_NotBitflyerRegion) { +TEST_F(RewardsDatabaseMigrationTest, Migration_30_NotBitflyerRegion) { DatabaseMigration::SetTargetVersionForTesting(30); InitializeDatabaseAtVersion(29); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("unblinded_tokens"), 1); } -TEST_F(LedgerDatabaseMigrationTest, Migration_30_BitflyerRegion) { +TEST_F(RewardsDatabaseMigrationTest, Migration_30_BitflyerRegion) { DatabaseMigration::SetTargetVersionForTesting(30); InitializeDatabaseAtVersion(29); - GetTestLedgerClient()->SetIsBitFlyerRegionForTesting(true); - InitializeLedger(); + GetTestClient()->SetIsBitFlyerRegionForTesting(true); + InitializeEngine(); EXPECT_EQ(CountTableRows("unblinded_tokens"), 0); EXPECT_EQ(CountTableRows("unblinded_tokens_bap"), 1); } -TEST_F(LedgerDatabaseMigrationTest, Migration_31) { +TEST_F(RewardsDatabaseMigrationTest, Migration_31) { DatabaseMigration::SetTargetVersionForTesting(31); InitializeDatabaseAtVersion(30); - InitializeLedger(); + InitializeEngine(); EXPECT_TRUE(GetDB()->DoesColumnExist("pending_contribution", "processor")); } -TEST_F(LedgerDatabaseMigrationTest, Migration_32_NotBitflyerRegion) { +TEST_F(RewardsDatabaseMigrationTest, Migration_32_NotBitflyerRegion) { DatabaseMigration::SetTargetVersionForTesting(32); InitializeDatabaseAtVersion(30); - InitializeLedger(); + InitializeEngine(); EXPECT_EQ(CountTableRows("balance_report_info"), 1); } -TEST_F(LedgerDatabaseMigrationTest, Migration_32_BitflyerRegion) { +TEST_F(RewardsDatabaseMigrationTest, Migration_32_BitflyerRegion) { DatabaseMigration::SetTargetVersionForTesting(32); InitializeDatabaseAtVersion(30); - GetTestLedgerClient()->SetIsBitFlyerRegionForTesting(true); - InitializeLedger(); + GetTestClient()->SetIsBitFlyerRegionForTesting(true); + InitializeEngine(); EXPECT_EQ(CountTableRows("balance_report_info"), 0); } -TEST_F(LedgerDatabaseMigrationTest, Migration_33) { +TEST_F(RewardsDatabaseMigrationTest, Migration_33) { DatabaseMigration::SetTargetVersionForTesting(33); InitializeDatabaseAtVersion(32); - InitializeLedger(); + InitializeEngine(); EXPECT_FALSE(GetDB()->DoesColumnExist("pending_contribution", "processor")); } -TEST_F(LedgerDatabaseMigrationTest, Migration_34) { +TEST_F(RewardsDatabaseMigrationTest, Migration_34) { DatabaseMigration::SetTargetVersionForTesting(34); InitializeDatabaseAtVersion(33); - InitializeLedger(); + InitializeEngine(); EXPECT_TRUE(GetDB()->DoesColumnExist("promotion", "claimable_until")); } -TEST_F(LedgerDatabaseMigrationTest, Migration_35) { +TEST_F(RewardsDatabaseMigrationTest, Migration_35) { DatabaseMigration::SetTargetVersionForTesting(35); InitializeDatabaseAtVersion(34); - InitializeLedger(); + InitializeEngine(); EXPECT_FALSE(GetDB()->DoesTableExist("server_publisher_amounts")); } -TEST_F(LedgerDatabaseMigrationTest, Migration_36) { +TEST_F(RewardsDatabaseMigrationTest, Migration_36) { DatabaseMigration::SetTargetVersionForTesting(36); InitializeDatabaseAtVersion(35); - InitializeLedger(); + InitializeEngine(); sql::Statement sql(GetDB()->GetUniqueStatement(R"sql( SELECT status FROM server_publisher_info )sql")); @@ -791,32 +791,32 @@ TEST_F(LedgerDatabaseMigrationTest, Migration_36) { EXPECT_EQ(sql.ColumnInt64(0), 0); } -TEST_F(LedgerDatabaseMigrationTest, Migration_37) { +TEST_F(RewardsDatabaseMigrationTest, Migration_37) { DatabaseMigration::SetTargetVersionForTesting(37); InitializeDatabaseAtVersion(36); - InitializeLedger(); + InitializeEngine(); EXPECT_TRUE(GetDB()->DoesTableExist("external_transactions")); } -TEST_F(LedgerDatabaseMigrationTest, Migration_38) { +TEST_F(RewardsDatabaseMigrationTest, Migration_38) { DatabaseMigration::SetTargetVersionForTesting(38); InitializeDatabaseAtVersion(37); - InitializeLedger(); + InitializeEngine(); EXPECT_TRUE( GetDB()->DoesColumnExist("recurring_donation", "next_contribution_at")); } -TEST_F(LedgerDatabaseMigrationTest, Migration_39) { +TEST_F(RewardsDatabaseMigrationTest, Migration_39) { DatabaseMigration::SetTargetVersionForTesting(39); InitializeDatabaseAtVersion(38); - InitializeLedger(); + InitializeEngine(); EXPECT_TRUE(GetDB()->DoesColumnExist("server_publisher_banner", "web3_url")); } -TEST_F(LedgerDatabaseMigrationTest, Migration_40) { +TEST_F(RewardsDatabaseMigrationTest, Migration_40) { DatabaseMigration::SetTargetVersionForTesting(40); InitializeDatabaseAtVersion(39); - InitializeLedger(); + InitializeEngine(); EXPECT_FALSE(GetDB()->DoesTableExist("pending_contribution")); EXPECT_FALSE(GetDB()->DoesTableExist("processed_publisher")); } diff --git a/components/brave_rewards/core/database/database_mock.cc b/components/brave_rewards/core/database/database_mock.cc index 252a35bcd32..e163ca9ff94 100644 --- a/components/brave_rewards/core/database/database_mock.cc +++ b/components/brave_rewards/core/database/database_mock.cc @@ -8,7 +8,7 @@ namespace brave_rewards::internal { namespace database { -MockDatabase::MockDatabase(LedgerImpl& ledger) : Database(ledger) {} +MockDatabase::MockDatabase(RewardsEngineImpl& engine) : Database(engine) {} MockDatabase::~MockDatabase() = default; diff --git a/components/brave_rewards/core/database/database_mock.h b/components/brave_rewards/core/database/database_mock.h index 882d7071313..3a4ee001228 100644 --- a/components/brave_rewards/core/database/database_mock.h +++ b/components/brave_rewards/core/database/database_mock.h @@ -10,7 +10,7 @@ #include #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "testing/gmock/include/gmock/gmock.h" namespace brave_rewards::internal { @@ -18,7 +18,7 @@ namespace database { class MockDatabase : public Database { public: - explicit MockDatabase(LedgerImpl& ledger); + explicit MockDatabase(RewardsEngineImpl& engine); ~MockDatabase() override; diff --git a/components/brave_rewards/core/database/database_multi_tables.cc b/components/brave_rewards/core/database/database_multi_tables.cc index a39233fc89b..e60f6fceb57 100644 --- a/components/brave_rewards/core/database/database_multi_tables.cc +++ b/components/brave_rewards/core/database/database_multi_tables.cc @@ -9,16 +9,16 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/database/database_multi_tables.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/promotion/promotion_util.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; namespace brave_rewards::internal { namespace database { -DatabaseMultiTables::DatabaseMultiTables(LedgerImpl& ledger) - : ledger_(ledger) {} +DatabaseMultiTables::DatabaseMultiTables(RewardsEngineImpl& engine) + : engine_(engine) {} DatabaseMultiTables::~DatabaseMultiTables() = default; @@ -29,7 +29,7 @@ void DatabaseMultiTables::GetTransactionReport( auto promotion_callback = std::bind(&DatabaseMultiTables::OnGetTransactionReportPromotion, this, _1, month, year, callback); - ledger_->database()->GetAllPromotions(promotion_callback); + engine_->database()->GetAllPromotions(promotion_callback); } void DatabaseMultiTables::OnGetTransactionReportPromotion( diff --git a/components/brave_rewards/core/database/database_multi_tables.h b/components/brave_rewards/core/database/database_multi_tables.h index dec2992ddd1..542f9941755 100644 --- a/components/brave_rewards/core/database/database_multi_tables.h +++ b/components/brave_rewards/core/database/database_multi_tables.h @@ -10,16 +10,16 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace database { class DatabaseMultiTables { public: - explicit DatabaseMultiTables(LedgerImpl& ledger); + explicit DatabaseMultiTables(RewardsEngineImpl& engine); ~DatabaseMultiTables(); void GetTransactionReport(const mojom::ActivityMonth month, @@ -33,7 +33,7 @@ class DatabaseMultiTables { const int year, GetTransactionReportCallback callback); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace database diff --git a/components/brave_rewards/core/database/database_promotion.cc b/components/brave_rewards/core/database/database_promotion.cc index 014ed3eb7e8..96ed6b227c7 100644 --- a/components/brave_rewards/core/database/database_promotion.cc +++ b/components/brave_rewards/core/database/database_promotion.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_promotion.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -26,8 +26,8 @@ const char kTableName[] = "promotion"; } // namespace -DatabasePromotion::DatabasePromotion(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabasePromotion::DatabasePromotion(RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabasePromotion::~DatabasePromotion() = default; @@ -35,7 +35,7 @@ void DatabasePromotion::InsertOrUpdate(mojom::PromotionPtr info, LegacyResultCallback callback) { if (!info) { BLOG(1, "Info is null"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -70,7 +70,7 @@ void DatabasePromotion::InsertOrUpdate(mojom::PromotionPtr info, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabasePromotion::GetRecord(const std::string& id, @@ -114,7 +114,7 @@ void DatabasePromotion::GetRecord(const std::string& id, auto transaction_callback = std::bind(&DatabasePromotion::OnGetRecord, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabasePromotion::OnGetRecord(mojom::DBCommandResponsePtr response, @@ -186,7 +186,7 @@ void DatabasePromotion::GetAllRecords(GetAllPromotionsCallback callback) { auto transaction_callback = std::bind(&DatabasePromotion::OnGetAllRecords, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabasePromotion::OnGetAllRecords(mojom::DBCommandResponsePtr response, @@ -230,7 +230,7 @@ void DatabasePromotion::SaveClaimId(const std::string& promotion_id, LegacyResultCallback callback) { if (promotion_id.empty() || claim_id.empty()) { BLOG(1, "Data is empty " << promotion_id << "/" << claim_id); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -249,7 +249,7 @@ void DatabasePromotion::SaveClaimId(const std::string& promotion_id, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabasePromotion::UpdateStatus(const std::string& promotion_id, @@ -257,7 +257,7 @@ void DatabasePromotion::UpdateStatus(const std::string& promotion_id, LegacyResultCallback callback) { if (promotion_id.empty()) { BLOG(0, "Promotion id is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -276,7 +276,7 @@ void DatabasePromotion::UpdateStatus(const std::string& promotion_id, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabasePromotion::UpdateRecordsStatus(const std::vector& ids, @@ -284,7 +284,7 @@ void DatabasePromotion::UpdateRecordsStatus(const std::vector& ids, LegacyResultCallback callback) { if (ids.empty()) { BLOG(1, "List of ids is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -303,14 +303,14 @@ void DatabasePromotion::UpdateRecordsStatus(const std::vector& ids, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabasePromotion::CredentialCompleted(const std::string& promotion_id, LegacyResultCallback callback) { if (promotion_id.empty()) { BLOG(1, "Promotion id is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -333,7 +333,7 @@ void DatabasePromotion::CredentialCompleted(const std::string& promotion_id, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabasePromotion::GetRecords(const std::vector& ids, @@ -377,7 +377,7 @@ void DatabasePromotion::GetRecords(const std::vector& ids, auto transaction_callback = std::bind(&DatabasePromotion::OnGetRecords, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabasePromotion::OnGetRecords(mojom::DBCommandResponsePtr response, @@ -422,7 +422,7 @@ void DatabasePromotion::UpdateRecordsBlankPublicKey( LegacyResultCallback callback) { if (ids.empty()) { BLOG(1, "List of ids is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -440,7 +440,7 @@ void DatabasePromotion::UpdateRecordsBlankPublicKey( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } } // namespace database diff --git a/components/brave_rewards/core/database/database_promotion.h b/components/brave_rewards/core/database/database_promotion.h index 080d217ef8e..31a07f72059 100644 --- a/components/brave_rewards/core/database/database_promotion.h +++ b/components/brave_rewards/core/database/database_promotion.h @@ -22,7 +22,7 @@ using GetPromotionListCallback = class DatabasePromotion : public DatabaseTable { public: - explicit DatabasePromotion(LedgerImpl& ledger); + explicit DatabasePromotion(RewardsEngineImpl& engine); ~DatabasePromotion() override; void InsertOrUpdate(mojom::PromotionPtr info, LegacyResultCallback callback); diff --git a/components/brave_rewards/core/database/database_publisher_info.cc b/components/brave_rewards/core/database/database_publisher_info.cc index a3b1924bb93..75d94a53dc7 100644 --- a/components/brave_rewards/core/database/database_publisher_info.cc +++ b/components/brave_rewards/core/database/database_publisher_info.cc @@ -12,8 +12,8 @@ #include "brave/components/brave_rewards/core/database/database_publisher_info.h" #include "brave/components/brave_rewards/core/database/database_util.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -26,8 +26,8 @@ const char kTableName[] = "publisher_info"; namespace brave_rewards::internal { namespace database { -DatabasePublisherInfo::DatabasePublisherInfo(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabasePublisherInfo::DatabasePublisherInfo(RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabasePublisherInfo::~DatabasePublisherInfo() = default; @@ -35,7 +35,7 @@ void DatabasePublisherInfo::InsertOrUpdate(mojom::PublisherInfoPtr info, LegacyResultCallback callback) { if (!info || info->id.empty()) { BLOG(1, "Info is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -84,14 +84,14 @@ void DatabasePublisherInfo::InsertOrUpdate(mojom::PublisherInfoPtr info, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabasePublisherInfo::GetRecord(const std::string& publisher_key, GetPublisherInfoCallback callback) { if (publisher_key.empty()) { BLOG(1, "Publisher key is empty"); - callback(mojom::Result::LEDGER_ERROR, {}); + callback(mojom::Result::FAILED, {}); return; } @@ -126,7 +126,7 @@ void DatabasePublisherInfo::GetRecord(const std::string& publisher_key, auto transaction_callback = std::bind(&DatabasePublisherInfo::OnGetRecord, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabasePublisherInfo::OnGetRecord(mojom::DBCommandResponsePtr response, @@ -134,7 +134,7 @@ void DatabasePublisherInfo::OnGetRecord(mojom::DBCommandResponsePtr response, if (!response || response->status != mojom::DBCommandResponse::Status::RESPONSE_OK) { BLOG(0, "Response is wrong"); - callback(mojom::Result::LEDGER_ERROR, {}); + callback(mojom::Result::FAILED, {}); return; } @@ -156,7 +156,7 @@ void DatabasePublisherInfo::OnGetRecord(mojom::DBCommandResponsePtr response, info->excluded = static_cast(GetIntColumn(record, 7)); - callback(mojom::Result::LEDGER_OK, std::move(info)); + callback(mojom::Result::OK, std::move(info)); } void DatabasePublisherInfo::GetPanelRecord( @@ -164,7 +164,7 @@ void DatabasePublisherInfo::GetPanelRecord( GetPublisherPanelInfoCallback callback) { if (!filter || filter->id.empty()) { BLOG(1, "Filter is empty"); - callback(mojom::Result::LEDGER_ERROR, {}); + callback(mojom::Result::FAILED, {}); return; } @@ -205,7 +205,7 @@ void DatabasePublisherInfo::GetPanelRecord( auto transaction_callback = std::bind(&DatabasePublisherInfo::OnGetPanelRecord, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabasePublisherInfo::OnGetPanelRecord( @@ -214,7 +214,7 @@ void DatabasePublisherInfo::OnGetPanelRecord( if (!response || response->status != mojom::DBCommandResponse::Status::RESPONSE_OK) { BLOG(0, "Response is wrong"); - callback(mojom::Result::LEDGER_ERROR, {}); + callback(mojom::Result::FAILED, {}); return; } @@ -236,7 +236,7 @@ void DatabasePublisherInfo::OnGetPanelRecord( static_cast(GetIntColumn(record, 6)); info->percent = GetIntColumn(record, 7); - callback(mojom::Result::LEDGER_OK, std::move(info)); + callback(mojom::Result::OK, std::move(info)); } void DatabasePublisherInfo::RestorePublishers(ResultCallback callback) { @@ -254,7 +254,7 @@ void DatabasePublisherInfo::RestorePublishers(ResultCallback callback) { transaction->commands.push_back(std::move(command)); - ledger_->RunDBTransaction( + engine_->RunDBTransaction( std::move(transaction), base::BindOnce(&DatabasePublisherInfo::OnRestorePublishers, base::Unretained(this), std::move(callback))); @@ -265,11 +265,11 @@ void DatabasePublisherInfo::OnRestorePublishers( mojom::DBCommandResponsePtr response) { if (!response || response->status != mojom::DBCommandResponse::Status::RESPONSE_OK) { - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } - ledger_->publisher()->OnRestorePublishers(mojom::Result::LEDGER_OK, + engine_->publisher()->OnRestorePublishers(mojom::Result::OK, std::move(callback)); } @@ -300,7 +300,7 @@ void DatabasePublisherInfo::GetExcludedList(GetExcludedListCallback callback) { auto transaction_callback = std::bind(&DatabasePublisherInfo::OnGetExcludedList, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabasePublisherInfo::OnGetExcludedList( diff --git a/components/brave_rewards/core/database/database_publisher_info.h b/components/brave_rewards/core/database/database_publisher_info.h index 74b1777f7cb..f07f44f2893 100644 --- a/components/brave_rewards/core/database/database_publisher_info.h +++ b/components/brave_rewards/core/database/database_publisher_info.h @@ -15,7 +15,7 @@ namespace database { class DatabasePublisherInfo : public DatabaseTable { public: - explicit DatabasePublisherInfo(LedgerImpl& ledger); + explicit DatabasePublisherInfo(RewardsEngineImpl& engine); ~DatabasePublisherInfo() override; void InsertOrUpdate(mojom::PublisherInfoPtr info, diff --git a/components/brave_rewards/core/database/database_publisher_prefix_list.cc b/components/brave_rewards/core/database/database_publisher_prefix_list.cc index 1709db3ea27..ec0fe237cfc 100644 --- a/components/brave_rewards/core/database/database_publisher_prefix_list.cc +++ b/components/brave_rewards/core/database/database_publisher_prefix_list.cc @@ -11,8 +11,8 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/publisher/prefix_util.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { @@ -48,8 +48,9 @@ std::tuple GetPrefixInsertList( namespace database { -DatabasePublisherPrefixList::DatabasePublisherPrefixList(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabasePublisherPrefixList::DatabasePublisherPrefixList( + RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabasePublisherPrefixList::~DatabasePublisherPrefixList() = default; @@ -70,7 +71,7 @@ void DatabasePublisherPrefixList::Search( auto transaction = mojom::DBTransaction::New(); transaction->commands.push_back(std::move(command)); - ledger_->RunDBTransaction( + engine_->RunDBTransaction( std::move(transaction), [callback](mojom::DBCommandResponsePtr response) { if (!response || !response->result || response->status != mojom::DBCommandResponse::Status::RESPONSE_OK || @@ -89,12 +90,12 @@ void DatabasePublisherPrefixList::Reset(publisher::PrefixListReader reader, LegacyResultCallback callback) { if (reader_) { BLOG(1, "Publisher prefix list batch insert in progress"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } if (reader.empty()) { BLOG(0, "Cannot reset with an empty publisher prefix list"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } reader_ = std::move(reader); @@ -130,19 +131,19 @@ void DatabasePublisherPrefixList::InsertNext(publisher::PrefixIterator begin, auto iter = std::get(insert_tuple); - ledger_->RunDBTransaction( + engine_->RunDBTransaction( std::move(transaction), [this, iter, callback](mojom::DBCommandResponsePtr response) { if (!response || response->status != mojom::DBCommandResponse::Status::RESPONSE_OK) { reader_ = absl::nullopt; - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } if (iter == reader_->end()) { reader_ = absl::nullopt; - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); return; } diff --git a/components/brave_rewards/core/database/database_publisher_prefix_list.h b/components/brave_rewards/core/database/database_publisher_prefix_list.h index d7ef156b8bf..f6b6a0275ed 100644 --- a/components/brave_rewards/core/database/database_publisher_prefix_list.h +++ b/components/brave_rewards/core/database/database_publisher_prefix_list.h @@ -19,7 +19,7 @@ using SearchPublisherPrefixListCallback = std::function; class DatabasePublisherPrefixList : public DatabaseTable { public: - explicit DatabasePublisherPrefixList(LedgerImpl& ledger); + explicit DatabasePublisherPrefixList(RewardsEngineImpl& engine); ~DatabasePublisherPrefixList() override; void Reset(publisher::PrefixListReader reader, LegacyResultCallback callback); diff --git a/components/brave_rewards/core/database/database_publisher_prefix_list_unittest.cc b/components/brave_rewards/core/database/database_publisher_prefix_list_unittest.cc index 61ebaeba903..9f356d95b9f 100644 --- a/components/brave_rewards/core/database/database_publisher_prefix_list_unittest.cc +++ b/components/brave_rewards/core/database/database_publisher_prefix_list_unittest.cc @@ -11,9 +11,9 @@ #include "base/strings/string_piece.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/database/database_publisher_prefix_list.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" #include "brave/components/brave_rewards/core/publisher/protos/publisher_prefix_list.pb.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" // npm run test -- brave_unit_tests --filter=DatabasePublisherPrefixListTest.* @@ -51,12 +51,12 @@ class DatabasePublisherPrefixListTest : public ::testing::Test { } base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - DatabasePublisherPrefixList database_prefix_list_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + DatabasePublisherPrefixList database_prefix_list_{mock_engine_impl_}; }; TEST_F(DatabasePublisherPrefixListTest, Reset) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .Times(2) .WillOnce([](mojom::DBTransactionPtr transaction, auto callback) { EXPECT_TRUE(transaction); diff --git a/components/brave_rewards/core/database/database_recurring_tip.cc b/components/brave_rewards/core/database/database_recurring_tip.cc index 349d7329c52..1799a8e6056 100644 --- a/components/brave_rewards/core/database/database_recurring_tip.cc +++ b/components/brave_rewards/core/database/database_recurring_tip.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/constants.h" #include "brave/components/brave_rewards/core/database/database_recurring_tip.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" using std::placeholders::_1; @@ -35,8 +35,8 @@ void MapDatabaseResultToSuccess(base::OnceCallback callback, } // namespace -DatabaseRecurringTip::DatabaseRecurringTip(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabaseRecurringTip::DatabaseRecurringTip(RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabaseRecurringTip::~DatabaseRecurringTip() = default; @@ -44,7 +44,7 @@ void DatabaseRecurringTip::InsertOrUpdate(mojom::RecurringTipPtr info, LegacyResultCallback callback) { if (!info || info->publisher_key.empty()) { BLOG(1, "Publisher key is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -68,7 +68,7 @@ void DatabaseRecurringTip::InsertOrUpdate(mojom::RecurringTipPtr info, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseRecurringTip::InsertOrUpdate( @@ -107,7 +107,7 @@ void DatabaseRecurringTip::InsertOrUpdate( transaction->commands.push_back(std::move(command)); - ledger_->RunDBTransaction( + engine_->RunDBTransaction( std::move(transaction), base::BindOnce(MapDatabaseResultToSuccess, std::move(callback))); } @@ -138,7 +138,7 @@ void DatabaseRecurringTip::AdvanceMonthlyContributionDates( return; } - ledger_->RunDBTransaction( + engine_->RunDBTransaction( std::move(transaction), base::BindOnce(MapDatabaseResultToSuccess, std::move(callback))); } @@ -153,7 +153,7 @@ void DatabaseRecurringTip::GetNextMonthlyContributionTime( "UPDATE %s SET next_contribution_at = ? " "WHERE next_contribution_at IS NULL", kTableName); - BindInt64(command.get(), 0, ledger_->state()->GetReconcileStamp()); + BindInt64(command.get(), 0, engine_->state()->GetReconcileStamp()); transaction->commands.push_back(std::move(command)); command = mojom::DBCommand::New(); @@ -182,7 +182,7 @@ void DatabaseRecurringTip::GetNextMonthlyContributionTime( std::move(callback).Run(absl::nullopt); }; - ledger_->RunDBTransaction(std::move(transaction), + engine_->RunDBTransaction(std::move(transaction), base::BindOnce(on_completed, std::move(callback))); } @@ -218,7 +218,7 @@ void DatabaseRecurringTip::GetAllRecords(GetRecurringTipsCallback callback) { auto transaction_callback = std::bind(&DatabaseRecurringTip::OnGetAllRecords, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseRecurringTip::OnGetAllRecords(mojom::DBCommandResponsePtr response, @@ -249,7 +249,7 @@ void DatabaseRecurringTip::OnGetAllRecords(mojom::DBCommandResponsePtr response, // If a monthly contribution record does not have a valid "next contribution // date", then use the next auto-contribution date instead. if (!info->reconcile_stamp) { - info->reconcile_stamp = ledger_->state()->GetReconcileStamp(); + info->reconcile_stamp = engine_->state()->GetReconcileStamp(); } list.push_back(std::move(info)); @@ -262,7 +262,7 @@ void DatabaseRecurringTip::DeleteRecord(const std::string& publisher_key, LegacyResultCallback callback) { if (publisher_key.empty()) { BLOG(1, "Publisher key is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -281,7 +281,7 @@ void DatabaseRecurringTip::DeleteRecord(const std::string& publisher_key, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } } // namespace database diff --git a/components/brave_rewards/core/database/database_recurring_tip.h b/components/brave_rewards/core/database/database_recurring_tip.h index 5623b6ab0bc..413f11cef4d 100644 --- a/components/brave_rewards/core/database/database_recurring_tip.h +++ b/components/brave_rewards/core/database/database_recurring_tip.h @@ -18,7 +18,7 @@ namespace database { class DatabaseRecurringTip : public DatabaseTable { public: - explicit DatabaseRecurringTip(LedgerImpl& ledger); + explicit DatabaseRecurringTip(RewardsEngineImpl& engine); ~DatabaseRecurringTip() override; // DEPRECATED diff --git a/components/brave_rewards/core/database/database_server_publisher_banner.cc b/components/brave_rewards/core/database/database_server_publisher_banner.cc index 5fa6a01320c..5766a96c773 100644 --- a/components/brave_rewards/core/database/database_server_publisher_banner.cc +++ b/components/brave_rewards/core/database/database_server_publisher_banner.cc @@ -8,7 +8,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_server_publisher_banner.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -21,8 +21,9 @@ const char kTableName[] = "server_publisher_banner"; namespace brave_rewards::internal { namespace database { -DatabaseServerPublisherBanner::DatabaseServerPublisherBanner(LedgerImpl& ledger) - : DatabaseTable(ledger), links_(ledger) {} +DatabaseServerPublisherBanner::DatabaseServerPublisherBanner( + RewardsEngineImpl& engine) + : DatabaseTable(engine), links_(engine) {} DatabaseServerPublisherBanner::~DatabaseServerPublisherBanner() = default; @@ -112,7 +113,7 @@ void DatabaseServerPublisherBanner::GetRecord( std::bind(&DatabaseServerPublisherBanner::OnGetRecord, this, _1, publisher_key, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseServerPublisherBanner::OnGetRecord( diff --git a/components/brave_rewards/core/database/database_server_publisher_banner.h b/components/brave_rewards/core/database/database_server_publisher_banner.h index 639cd1f2782..2bfe39c1d99 100644 --- a/components/brave_rewards/core/database/database_server_publisher_banner.h +++ b/components/brave_rewards/core/database/database_server_publisher_banner.h @@ -18,7 +18,7 @@ namespace database { class DatabaseServerPublisherBanner : public DatabaseTable { public: - explicit DatabaseServerPublisherBanner(LedgerImpl& ledger); + explicit DatabaseServerPublisherBanner(RewardsEngineImpl& engine); ~DatabaseServerPublisherBanner() override; void InsertOrUpdate(mojom::DBTransaction* transaction, diff --git a/components/brave_rewards/core/database/database_server_publisher_info.cc b/components/brave_rewards/core/database/database_server_publisher_info.cc index c0b000421ef..c89215b7910 100644 --- a/components/brave_rewards/core/database/database_server_publisher_info.cc +++ b/components/brave_rewards/core/database/database_server_publisher_info.cc @@ -9,7 +9,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_server_publisher_info.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -23,8 +23,9 @@ namespace brave_rewards::internal { namespace database { -DatabaseServerPublisherInfo::DatabaseServerPublisherInfo(LedgerImpl& ledger) - : DatabaseTable(ledger), banner_(ledger) {} +DatabaseServerPublisherInfo::DatabaseServerPublisherInfo( + RewardsEngineImpl& engine) + : DatabaseTable(engine), banner_(engine) {} DatabaseServerPublisherInfo::~DatabaseServerPublisherInfo() = default; @@ -33,7 +34,7 @@ void DatabaseServerPublisherInfo::InsertOrUpdate( LegacyResultCallback callback) { if (server_info.publisher_key.empty()) { BLOG(0, "Publisher key is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -55,7 +56,7 @@ void DatabaseServerPublisherInfo::InsertOrUpdate( transaction->commands.push_back(std::move(command)); banner_.InsertOrUpdate(transaction.get(), server_info); - ledger_->RunDBTransaction(std::move(transaction), + engine_->RunDBTransaction(std::move(transaction), std::bind(&OnResultCallback, _1, callback)); } @@ -106,7 +107,7 @@ void DatabaseServerPublisherInfo::OnGetRecordBanner( std::bind(&DatabaseServerPublisherInfo::OnGetRecord, this, _1, publisher_key, *banner, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseServerPublisherInfo::OnGetRecord( @@ -160,7 +161,7 @@ void DatabaseServerPublisherInfo::DeleteExpiredRecords( std::bind(&DatabaseServerPublisherInfo::OnExpiredRecordsSelected, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), select_callback); + engine_->RunDBTransaction(std::move(transaction), select_callback); } void DatabaseServerPublisherInfo::OnExpiredRecordsSelected( @@ -169,7 +170,7 @@ void DatabaseServerPublisherInfo::OnExpiredRecordsSelected( if (!response || response->status != mojom::DBCommandResponse::Status::RESPONSE_OK) { BLOG(0, "Unable to query for expired records"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -180,7 +181,7 @@ void DatabaseServerPublisherInfo::OnExpiredRecordsSelected( // Exit if there are no records to delete. if (publisher_keys.empty()) { - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); return; } @@ -200,7 +201,7 @@ void DatabaseServerPublisherInfo::OnExpiredRecordsSelected( transaction->commands.push_back(std::move(command)); - ledger_->RunDBTransaction(std::move(transaction), + engine_->RunDBTransaction(std::move(transaction), std::bind(&OnResultCallback, _1, callback)); } diff --git a/components/brave_rewards/core/database/database_server_publisher_info.h b/components/brave_rewards/core/database/database_server_publisher_info.h index 89f62604ae2..0fbe3bc634d 100644 --- a/components/brave_rewards/core/database/database_server_publisher_info.h +++ b/components/brave_rewards/core/database/database_server_publisher_info.h @@ -20,7 +20,7 @@ using GetServerPublisherInfoCallback = class DatabaseServerPublisherInfo : public DatabaseTable { public: - explicit DatabaseServerPublisherInfo(LedgerImpl& ledger); + explicit DatabaseServerPublisherInfo(RewardsEngineImpl& engine); ~DatabaseServerPublisherInfo() override; void InsertOrUpdate(const mojom::ServerPublisherInfo& server_info, diff --git a/components/brave_rewards/core/database/database_server_publisher_links.cc b/components/brave_rewards/core/database/database_server_publisher_links.cc index 2cd6b11ab8d..444ee00f802 100644 --- a/components/brave_rewards/core/database/database_server_publisher_links.cc +++ b/components/brave_rewards/core/database/database_server_publisher_links.cc @@ -8,7 +8,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_server_publisher_links.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -21,8 +21,9 @@ const char kTableName[] = "server_publisher_links"; namespace brave_rewards::internal { namespace database { -DatabaseServerPublisherLinks::DatabaseServerPublisherLinks(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabaseServerPublisherLinks::DatabaseServerPublisherLinks( + RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabaseServerPublisherLinks::~DatabaseServerPublisherLinks() = default; @@ -99,7 +100,7 @@ void DatabaseServerPublisherLinks::GetRecord( auto transaction_callback = std::bind(&DatabaseServerPublisherLinks::OnGetRecord, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseServerPublisherLinks::OnGetRecord( diff --git a/components/brave_rewards/core/database/database_server_publisher_links.h b/components/brave_rewards/core/database/database_server_publisher_links.h index 7ff035ec572..5f009d96172 100644 --- a/components/brave_rewards/core/database/database_server_publisher_links.h +++ b/components/brave_rewards/core/database/database_server_publisher_links.h @@ -17,7 +17,7 @@ namespace database { class DatabaseServerPublisherLinks : public DatabaseTable { public: - explicit DatabaseServerPublisherLinks(LedgerImpl& ledger); + explicit DatabaseServerPublisherLinks(RewardsEngineImpl& engine); ~DatabaseServerPublisherLinks() override; void InsertOrUpdate(mojom::DBTransaction* transaction, diff --git a/components/brave_rewards/core/database/database_sku_order.cc b/components/brave_rewards/core/database/database_sku_order.cc index d74769232dd..0468e5838b7 100644 --- a/components/brave_rewards/core/database/database_sku_order.cc +++ b/components/brave_rewards/core/database/database_sku_order.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_sku_order.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -22,8 +22,8 @@ const char kTableName[] = "sku_order"; } // namespace -DatabaseSKUOrder::DatabaseSKUOrder(LedgerImpl& ledger) - : DatabaseTable(ledger), items_(ledger) {} +DatabaseSKUOrder::DatabaseSKUOrder(RewardsEngineImpl& engine) + : DatabaseTable(engine), items_(engine) {} DatabaseSKUOrder::~DatabaseSKUOrder() = default; @@ -31,7 +31,7 @@ void DatabaseSKUOrder::InsertOrUpdate(mojom::SKUOrderPtr order, LegacyResultCallback callback) { if (!order) { BLOG(1, "Order is null"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -61,7 +61,7 @@ void DatabaseSKUOrder::InsertOrUpdate(mojom::SKUOrderPtr order, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseSKUOrder::UpdateStatus(const std::string& order_id, @@ -69,7 +69,7 @@ void DatabaseSKUOrder::UpdateStatus(const std::string& order_id, LegacyResultCallback callback) { if (order_id.empty()) { BLOG(1, "Order id is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -89,7 +89,7 @@ void DatabaseSKUOrder::UpdateStatus(const std::string& order_id, auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseSKUOrder::GetRecord(const std::string& order_id, @@ -126,7 +126,7 @@ void DatabaseSKUOrder::GetRecord(const std::string& order_id, auto transaction_callback = std::bind(&DatabaseSKUOrder::OnGetRecord, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseSKUOrder::OnGetRecord(mojom::DBCommandResponsePtr response, @@ -209,7 +209,7 @@ void DatabaseSKUOrder::GetRecordByContributionId( auto transaction_callback = std::bind(&DatabaseSKUOrder::OnGetRecord, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseSKUOrder::SaveContributionIdForSKUOrder( @@ -219,7 +219,7 @@ void DatabaseSKUOrder::SaveContributionIdForSKUOrder( if (order_id.empty() || contribution_id.empty()) { BLOG(1, "Order/contribution id is empty " << order_id << "/" << contribution_id); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -239,7 +239,7 @@ void DatabaseSKUOrder::SaveContributionIdForSKUOrder( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } } // namespace database diff --git a/components/brave_rewards/core/database/database_sku_order.h b/components/brave_rewards/core/database/database_sku_order.h index 39f34c09386..9743053a7ce 100644 --- a/components/brave_rewards/core/database/database_sku_order.h +++ b/components/brave_rewards/core/database/database_sku_order.h @@ -20,7 +20,7 @@ using GetSKUOrderCallback = std::function; class DatabaseSKUOrder : public DatabaseTable { public: - explicit DatabaseSKUOrder(LedgerImpl& ledger); + explicit DatabaseSKUOrder(RewardsEngineImpl& engine); ~DatabaseSKUOrder() override; void InsertOrUpdate(mojom::SKUOrderPtr info, LegacyResultCallback callback); diff --git a/components/brave_rewards/core/database/database_sku_order_items.cc b/components/brave_rewards/core/database/database_sku_order_items.cc index e08a5d519b7..c0e2b293ef1 100644 --- a/components/brave_rewards/core/database/database_sku_order_items.cc +++ b/components/brave_rewards/core/database/database_sku_order_items.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_sku_order_items.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -22,8 +22,8 @@ const char kTableName[] = "sku_order_items"; } // namespace -DatabaseSKUOrderItems::DatabaseSKUOrderItems(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabaseSKUOrderItems::DatabaseSKUOrderItems(RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabaseSKUOrderItems::~DatabaseSKUOrderItems() = default; @@ -99,7 +99,7 @@ void DatabaseSKUOrderItems::GetRecordsByOrderId( auto transaction_callback = std::bind( &DatabaseSKUOrderItems::OnGetRecordsByOrderId, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseSKUOrderItems::OnGetRecordsByOrderId( diff --git a/components/brave_rewards/core/database/database_sku_order_items.h b/components/brave_rewards/core/database/database_sku_order_items.h index b7652cd7d0c..315f53a9cde 100644 --- a/components/brave_rewards/core/database/database_sku_order_items.h +++ b/components/brave_rewards/core/database/database_sku_order_items.h @@ -20,7 +20,7 @@ using GetSKUOrderItemsCallback = class DatabaseSKUOrderItems : public DatabaseTable { public: - explicit DatabaseSKUOrderItems(LedgerImpl& ledger); + explicit DatabaseSKUOrderItems(RewardsEngineImpl& engine); ~DatabaseSKUOrderItems() override; void InsertOrUpdateList(mojom::DBTransaction* transaction, diff --git a/components/brave_rewards/core/database/database_sku_transaction.cc b/components/brave_rewards/core/database/database_sku_transaction.cc index 3807770936b..15d42452467 100644 --- a/components/brave_rewards/core/database/database_sku_transaction.cc +++ b/components/brave_rewards/core/database/database_sku_transaction.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_sku_transaction.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -22,8 +22,8 @@ const char kTableName[] = "sku_transaction"; } // namespace -DatabaseSKUTransaction::DatabaseSKUTransaction(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabaseSKUTransaction::DatabaseSKUTransaction(RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabaseSKUTransaction::~DatabaseSKUTransaction() = default; @@ -32,7 +32,7 @@ void DatabaseSKUTransaction::InsertOrUpdate( LegacyResultCallback callback) { if (!transaction) { BLOG(1, "Transcation is null"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -60,7 +60,7 @@ void DatabaseSKUTransaction::InsertOrUpdate( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(db_transaction), transaction_callback); + engine_->RunDBTransaction(std::move(db_transaction), transaction_callback); } void DatabaseSKUTransaction::SaveExternalTransaction( @@ -70,7 +70,7 @@ void DatabaseSKUTransaction::SaveExternalTransaction( if (transaction_id.empty() || external_transaction_id.empty()) { BLOG(1, "Data is empty " << transaction_id << "/" << external_transaction_id); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -93,7 +93,7 @@ void DatabaseSKUTransaction::SaveExternalTransaction( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseSKUTransaction::GetRecordByOrderId( @@ -129,7 +129,7 @@ void DatabaseSKUTransaction::GetRecordByOrderId( auto transaction_callback = std::bind(&DatabaseSKUTransaction::OnGetRecord, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseSKUTransaction::OnGetRecord(mojom::DBCommandResponsePtr response, diff --git a/components/brave_rewards/core/database/database_sku_transaction.h b/components/brave_rewards/core/database/database_sku_transaction.h index 8218f1807a4..33a8b8401be 100644 --- a/components/brave_rewards/core/database/database_sku_transaction.h +++ b/components/brave_rewards/core/database/database_sku_transaction.h @@ -21,7 +21,7 @@ using GetSKUTransactionCallback = std::function #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace database { @@ -39,11 +39,11 @@ using ContributionPublisherPairListCallback = class DatabaseTable { public: - explicit DatabaseTable(LedgerImpl& ledger); + explicit DatabaseTable(RewardsEngineImpl& engine); virtual ~DatabaseTable(); protected: - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace database diff --git a/components/brave_rewards/core/database/database_unblinded_token.cc b/components/brave_rewards/core/database/database_unblinded_token.cc index f97fd7d5d52..76396e788ab 100644 --- a/components/brave_rewards/core/database/database_unblinded_token.cc +++ b/components/brave_rewards/core/database/database_unblinded_token.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_unblinded_token.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; @@ -26,8 +26,8 @@ const char kTableName[] = "unblinded_tokens"; } // namespace -DatabaseUnblindedToken::DatabaseUnblindedToken(LedgerImpl& ledger) - : DatabaseTable(ledger) {} +DatabaseUnblindedToken::DatabaseUnblindedToken(RewardsEngineImpl& engine) + : DatabaseTable(engine) {} DatabaseUnblindedToken::~DatabaseUnblindedToken() = default; @@ -36,7 +36,7 @@ void DatabaseUnblindedToken::InsertOrUpdateList( LegacyResultCallback callback) { if (list.empty()) { BLOG(1, "List is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -70,7 +70,7 @@ void DatabaseUnblindedToken::InsertOrUpdateList( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseUnblindedToken::OnGetRecords( @@ -132,7 +132,7 @@ void DatabaseUnblindedToken::GetSpendableRecords( auto transaction = mojom::DBTransaction::New(); transaction->commands.push_back(std::move(command)); - ledger_->RunDBTransaction(std::move(transaction), + engine_->RunDBTransaction(std::move(transaction), std::bind(&DatabaseUnblindedToken::OnGetRecords, this, _1, std::move(callback))); } @@ -144,7 +144,7 @@ void DatabaseUnblindedToken::MarkRecordListAsSpent( LegacyResultCallback callback) { if (ids.empty()) { BLOG(1, "List of ids is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -167,7 +167,7 @@ void DatabaseUnblindedToken::MarkRecordListAsSpent( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseUnblindedToken::MarkRecordListAsReserved( @@ -176,7 +176,7 @@ void DatabaseUnblindedToken::MarkRecordListAsReserved( LegacyResultCallback callback) { if (ids.empty()) { BLOG(1, "List of ids is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -231,7 +231,7 @@ void DatabaseUnblindedToken::MarkRecordListAsReserved( std::bind(&DatabaseUnblindedToken::OnMarkRecordListAsReserved, this, _1, ids.size(), callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseUnblindedToken::OnMarkRecordListAsReserved( @@ -241,17 +241,17 @@ void DatabaseUnblindedToken::OnMarkRecordListAsReserved( if (!response || response->status != mojom::DBCommandResponse::Status::RESPONSE_OK) { BLOG(0, "Response is wrong"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } if (response->result->get_records().size() != expected_row_count) { BLOG(0, "Records size doesn't match"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } void DatabaseUnblindedToken::MarkRecordListAsSpendable( @@ -259,7 +259,7 @@ void DatabaseUnblindedToken::MarkRecordListAsSpendable( LegacyResultCallback callback) { if (redeem_id.empty()) { BLOG(1, "Redeem id is empty"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -280,7 +280,7 @@ void DatabaseUnblindedToken::MarkRecordListAsSpendable( auto transaction_callback = std::bind(&OnResultCallback, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseUnblindedToken::GetReservedRecordList( @@ -318,7 +318,7 @@ void DatabaseUnblindedToken::GetReservedRecordList( auto transaction_callback = std::bind(&DatabaseUnblindedToken::OnGetRecords, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } void DatabaseUnblindedToken::GetSpendableRecordListByBatchTypes( @@ -363,7 +363,7 @@ void DatabaseUnblindedToken::GetSpendableRecordListByBatchTypes( auto transaction_callback = std::bind(&DatabaseUnblindedToken::OnGetRecords, this, _1, callback); - ledger_->RunDBTransaction(std::move(transaction), transaction_callback); + engine_->RunDBTransaction(std::move(transaction), transaction_callback); } } // namespace database diff --git a/components/brave_rewards/core/database/database_unblinded_token.h b/components/brave_rewards/core/database/database_unblinded_token.h index f9d80dfe23c..dbe64831711 100644 --- a/components/brave_rewards/core/database/database_unblinded_token.h +++ b/components/brave_rewards/core/database/database_unblinded_token.h @@ -19,7 +19,7 @@ using GetUnblindedTokenListCallback = class DatabaseUnblindedToken : public DatabaseTable { public: - explicit DatabaseUnblindedToken(LedgerImpl& ledger); + explicit DatabaseUnblindedToken(RewardsEngineImpl& engine); ~DatabaseUnblindedToken() override; void InsertOrUpdateList(std::vector list, diff --git a/components/brave_rewards/core/database/database_util.cc b/components/brave_rewards/core/database/database_util.cc index 07bdcf23200..6d058b0d34f 100644 --- a/components/brave_rewards/core/database/database_util.cc +++ b/components/brave_rewards/core/database/database_util.cc @@ -103,11 +103,11 @@ void OnResultCallback(mojom::DBCommandResponsePtr response, LegacyResultCallback callback) { if (!response || response->status != mojom::DBCommandResponse::Status::RESPONSE_OK) { - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } int GetIntColumn(mojom::DBRecord* record, const int index) { diff --git a/components/brave_rewards/core/database/database_util.h b/components/brave_rewards/core/database/database_util.h index 2dfd4d86aa1..ed7be9fcda4 100644 --- a/components/brave_rewards/core/database/database_util.h +++ b/components/brave_rewards/core/database/database_util.h @@ -10,7 +10,7 @@ #include #include -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "sql/database.h" namespace brave_rewards::internal { diff --git a/components/brave_rewards/core/endpoint/api/api_util.cc b/components/brave_rewards/core/endpoint/api/api_util.cc index 2187401701d..e5fdc701041 100644 --- a/components/brave_rewards/core/endpoint/api/api_util.cc +++ b/components/brave_rewards/core/endpoint/api/api_util.cc @@ -4,7 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/api/api_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace endpoint { diff --git a/components/brave_rewards/core/endpoint/api/api_util_unittest.cc b/components/brave_rewards/core/endpoint/api/api_util_unittest.cc index fefd9202dc5..1ba44f320ec 100644 --- a/components/brave_rewards/core/endpoint/api/api_util_unittest.cc +++ b/components/brave_rewards/core/endpoint/api/api_util_unittest.cc @@ -5,7 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/api/api_util.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "testing/gtest/include/gtest/gtest.h" // npm run test -- brave_unit_tests --filter=APIUtilTest.* diff --git a/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.cc b/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.cc index a592eab5684..6ccbc2f6fa3 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.cc +++ b/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.cc @@ -5,13 +5,13 @@ #include "brave/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace endpoint { -BitflyerServer::BitflyerServer(LedgerImpl& ledger) - : get_balance_(ledger), post_oauth_(ledger) {} +BitflyerServer::BitflyerServer(RewardsEngineImpl& engine) + : get_balance_(engine), post_oauth_(engine) {} BitflyerServer::~BitflyerServer() = default; diff --git a/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.h b/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.h index 36fbb9abea9..72ec2bd0af0 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.h +++ b/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.h @@ -8,16 +8,16 @@ #include "brave/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.h" #include "brave/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { class BitflyerServer { public: - explicit BitflyerServer(LedgerImpl& ledger); + explicit BitflyerServer(RewardsEngineImpl& engine); ~BitflyerServer(); bitflyer::GetBalance& get_balance() { return get_balance_; } diff --git a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.cc b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.cc index 33cc42dc65f..bb882938697 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.cc +++ b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.cc @@ -11,7 +11,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/bitflyer/bitflyer_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" using std::placeholders::_1; @@ -20,7 +20,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace bitflyer { -GetBalance::GetBalance(LedgerImpl& ledger) : ledger_(ledger) {} +GetBalance::GetBalance(RewardsEngineImpl& engine) : engine_(engine) {} GetBalance::~GetBalance() = default; @@ -38,10 +38,10 @@ mojom::Result GetBalance::CheckStatusCode(const int status_code) { if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result GetBalance::ParseBody(const std::string& body, @@ -51,14 +51,14 @@ mojom::Result GetBalance::ParseBody(const std::string& body, absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* inventory = dict.FindList("inventory"); if (!inventory) { BLOG(0, "Missing inventory"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } for (const auto& item : *inventory) { @@ -75,16 +75,16 @@ mojom::Result GetBalance::ParseBody(const std::string& body, const auto available_value = dict_value->FindDouble("available"); if (!available_value) { BLOG(0, "Missing available"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } *available = available_value.value(); - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } BLOG(0, "Missing BAT in inventory"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } void GetBalance::Request(const std::string& token, @@ -94,7 +94,7 @@ void GetBalance::Request(const std::string& token, auto request = mojom::UrlRequest::New(); request->url = GetUrl(); request->headers = RequestAuthorization(token); - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void GetBalance::OnRequest(GetBalanceCallback callback, @@ -104,7 +104,7 @@ void GetBalance::OnRequest(GetBalanceCallback callback, mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, 0.0); return; } diff --git a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.h b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.h index 0aa7145bad2..730aee0e73b 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.h +++ b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.h @@ -10,7 +10,7 @@ #include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // GET https://bitflyer.com/api/link/v1/account/inventory // @@ -43,7 +43,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace bitflyer { @@ -53,7 +53,7 @@ using GetBalanceCallback = base::OnceCallback ledger_; + const raw_ref engine_; }; } // namespace bitflyer diff --git a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer_unittest.cc b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer_unittest.cc index 4723d007e03..eebd7653cd2 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer_unittest.cc +++ b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace bitflyer { class GetBalanceTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - GetBalance balance_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + GetBalance balance_{mock_engine_impl_}; }; TEST_F(GetBalanceTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -112,14 +112,14 @@ TEST_F(GetBalanceTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK, 4.0)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::OK, 4.0)).Times(1); balance_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); task_environment_.RunUntilIdle(); } TEST_F(GetBalanceTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -137,7 +137,7 @@ TEST_F(GetBalanceTest, ServerError401) { } TEST_F(GetBalanceTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -148,7 +148,7 @@ TEST_F(GetBalanceTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, 0.0)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, 0.0)).Times(1); balance_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.cc b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.cc index df3820e49f1..be91e379658 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.cc +++ b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.cc @@ -12,12 +12,12 @@ #include "base/strings/stringprintf.h" #include "base/uuid.h" #include "brave/components/brave_rewards/core/bitflyer/bitflyer_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoint::bitflyer { -PostOauth::PostOauth(LedgerImpl& ledger) : ledger_(ledger) {} +PostOauth::PostOauth(RewardsEngineImpl& engine) : engine_(engine) {} PostOauth::~PostOauth() = default; @@ -53,10 +53,10 @@ std::string PostOauth::GeneratePayload(const std::string& external_account_id, mojom::Result PostOauth::CheckStatusCode(int status_code) { if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result PostOauth::ParseBody(const std::string& body, @@ -70,33 +70,33 @@ mojom::Result PostOauth::ParseBody(const std::string& body, absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* access_token = dict.FindString("access_token"); if (!access_token) { BLOG(0, "Missing access token"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const auto* deposit_id = dict.FindString("deposit_id"); if (!deposit_id) { BLOG(0, "Missing deposit id"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const auto* linking_information = dict.FindString("linking_info"); if (!linking_information) { BLOG(0, "Missing linking info"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } *token = *access_token; *address = *deposit_id; *linking_info = *linking_information; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostOauth::Request(const std::string& external_account_id, @@ -111,7 +111,7 @@ void PostOauth::Request(const std::string& external_account_id, request->method = mojom::UrlMethod::POST; request->skip_log = true; - ledger_->LoadURL(std::move(request), + engine_->LoadURL(std::move(request), base::BindOnce(&PostOauth::OnRequest, base::Unretained(this), std::move(callback))); } @@ -122,7 +122,7 @@ void PostOauth::OnRequest(PostOauthCallback callback, LogUrlResponse(__func__, *response, true); mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { return std::move(callback).Run(result, "", "", ""); } diff --git a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.h b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.h index a2d4a62ca2b..80a4945836f 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.h +++ b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST https://bitflyer.com/api/link/v1/token // @@ -44,7 +44,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint::bitflyer { @@ -55,7 +55,7 @@ using PostOauthCallback = base::OnceCallback ledger_; + const raw_ref engine_; }; } // namespace endpoint::bitflyer diff --git a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer_unittest.cc b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer_unittest.cc index 1f64b84b6e9..cdb8ef82350 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer_unittest.cc +++ b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer_unittest.cc @@ -11,9 +11,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -28,12 +28,12 @@ namespace bitflyer { class BitflyerPostOauthTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostOauth oauth_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostOauth oauth_{mock_engine_impl_}; }; TEST_F(BitflyerPostOauthTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -53,10 +53,9 @@ TEST_F(BitflyerPostOauthTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, - Run(mojom::Result::LEDGER_OK, std::string("mock_access_token"), - std::string("339dc5ff-1167-4d69-8dd8-aa77ccb12d74"), - std::string("mock_linking_info"))) + EXPECT_CALL(callback, Run(mojom::Result::OK, std::string("mock_access_token"), + std::string("339dc5ff-1167-4d69-8dd8-aa77ccb12d74"), + std::string("mock_linking_info"))) .Times(1); oauth_.Request( "46553A9E3D57D70F960EA26D95183D8CBB026283D92CBC7C54665408DA7DF398", @@ -66,7 +65,7 @@ TEST_F(BitflyerPostOauthTest, ServerOK) { } TEST_F(BitflyerPostOauthTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -77,7 +76,7 @@ TEST_F(BitflyerPostOauthTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, std::string(), _, _)) + EXPECT_CALL(callback, Run(mojom::Result::FAILED, std::string(), _, _)) .Times(1); oauth_.Request( "46553A9E3D57D70F960EA26D95183D8CBB026283D92CBC7C54665408DA7DF398", diff --git a/components/brave_rewards/core/endpoint/gemini/gemini_server.cc b/components/brave_rewards/core/endpoint/gemini/gemini_server.cc index 07dc77af486..1b591076eda 100644 --- a/components/brave_rewards/core/endpoint/gemini/gemini_server.cc +++ b/components/brave_rewards/core/endpoint/gemini/gemini_server.cc @@ -5,16 +5,16 @@ #include "brave/components/brave_rewards/core/endpoint/gemini/gemini_server.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace endpoint { -GeminiServer::GeminiServer(LedgerImpl& ledger) - : post_account_(ledger), - post_balance_(ledger), - post_oauth_(ledger), - post_recipient_id_(ledger) {} +GeminiServer::GeminiServer(RewardsEngineImpl& engine) + : post_account_(engine), + post_balance_(engine), + post_oauth_(engine), + post_recipient_id_(engine) {} GeminiServer::~GeminiServer() = default; diff --git a/components/brave_rewards/core/endpoint/gemini/gemini_server.h b/components/brave_rewards/core/endpoint/gemini/gemini_server.h index 540b77c4b06..b327704413b 100644 --- a/components/brave_rewards/core/endpoint/gemini/gemini_server.h +++ b/components/brave_rewards/core/endpoint/gemini/gemini_server.h @@ -10,16 +10,16 @@ #include "brave/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.h" #include "brave/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.h" #include "brave/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { class GeminiServer { public: - explicit GeminiServer(LedgerImpl& ledger); + explicit GeminiServer(RewardsEngineImpl& engine); ~GeminiServer(); gemini::PostAccount& post_account() { return post_account_; } diff --git a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.cc b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.cc index 1d12f46362b..fe347116651 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.cc @@ -11,13 +11,13 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal::endpoint::gemini { -PostAccount::PostAccount(LedgerImpl& ledger) : ledger_(ledger) {} +PostAccount::PostAccount(RewardsEngineImpl& engine) : engine_(engine) {} PostAccount::~PostAccount() = default; @@ -34,43 +34,43 @@ mojom::Result PostAccount::ParseBody(const std::string& body, absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const base::Value::Dict* account = dict.FindDict("account"); if (!account) { BLOG(0, "Missing account info"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const auto* linking_information = account->FindString("verificationToken"); if (!linking_info) { BLOG(0, "Missing linking info"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const auto* users = dict.FindList("users"); if (!users) { BLOG(0, "Missing users"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (users->size() == 0) { BLOG(0, "No users associated with this token"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const auto* name = (*users)[0].GetDict().FindString("name"); if (!name) { BLOG(0, "Missing user name"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } *linking_info = *linking_information; *user_name = *name; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostAccount::Request(const std::string& token, @@ -80,7 +80,7 @@ void PostAccount::Request(const std::string& token, request->headers = RequestAuthorization(token); request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), + engine_->LoadURL(std::move(request), base::BindOnce(&PostAccount::OnRequest, base::Unretained(this), std::move(callback))); } @@ -91,7 +91,7 @@ void PostAccount::OnRequest(PostAccountCallback callback, LogUrlResponse(__func__, *response); mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { return std::move(callback).Run(result, "", ""); } diff --git a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.h b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.h index 1cc379bd739..b1e4cb03582 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.h +++ b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST https://api.sandbox.gemini.com/v1/account // @@ -39,7 +39,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint::gemini { @@ -48,7 +48,7 @@ using PostAccountCallback = base::OnceCallback< class PostAccount { public: - explicit PostAccount(LedgerImpl& ledger); + explicit PostAccount(RewardsEngineImpl& engine); ~PostAccount(); void Request(const std::string& token, PostAccountCallback); @@ -62,7 +62,7 @@ class PostAccount { void OnRequest(PostAccountCallback, mojom::UrlResponsePtr); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace endpoint::gemini diff --git a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini_unittest.cc b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini_unittest.cc index c3c43c3b70e..a4eacc8395f 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini_unittest.cc @@ -9,9 +9,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,12 +26,12 @@ namespace gemini { class GeminiPostAccountTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostAccount post_account_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostAccount post_account_{mock_engine_impl_}; }; TEST_F(GeminiPostAccountTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -58,7 +58,7 @@ TEST_F(GeminiPostAccountTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK, std::string("mocktoken"), + EXPECT_CALL(callback, Run(mojom::Result::OK, std::string("mocktoken"), std::string("Test"))) .Times(1); post_account_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", @@ -68,7 +68,7 @@ TEST_F(GeminiPostAccountTest, ServerOK) { } TEST_F(GeminiPostAccountTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -89,7 +89,7 @@ TEST_F(GeminiPostAccountTest, ServerError401) { } TEST_F(GeminiPostAccountTest, ServerError403) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -110,7 +110,7 @@ TEST_F(GeminiPostAccountTest, ServerError403) { } TEST_F(GeminiPostAccountTest, ServerError404) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -131,7 +131,7 @@ TEST_F(GeminiPostAccountTest, ServerError404) { } TEST_F(GeminiPostAccountTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -143,7 +143,7 @@ TEST_F(GeminiPostAccountTest, ServerErrorRandom) { base::MockCallback callback; EXPECT_CALL(callback, - Run(mojom::Result::LEDGER_ERROR, std::string(), std::string())) + Run(mojom::Result::FAILED, std::string(), std::string())) .Times(1); post_account_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); diff --git a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.cc b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.cc index 98193dc74f5..5bb750bfd74 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.cc @@ -11,7 +11,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "third_party/abseil-cpp/absl/types/optional.h" using std::placeholders::_1; @@ -20,7 +20,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace gemini { -PostBalance::PostBalance(LedgerImpl& ledger) : ledger_(ledger) {} +PostBalance::PostBalance(RewardsEngineImpl& engine) : engine_(engine) {} PostBalance::~PostBalance() = default; @@ -35,7 +35,7 @@ mojom::Result PostBalance::ParseBody(const std::string& body, absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_list()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } auto& balances = value->GetList(); @@ -50,22 +50,22 @@ mojom::Result PostBalance::ParseBody(const std::string& body, const auto* available_value = balance.FindString("available"); if (!available_value) { BLOG(0, "Missing available"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const bool result = base::StringToDouble(base::StringPiece(*available_value), available); if (!result) { BLOG(0, "Invalid balance"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } // If BAT is not found in the list, BAT balance for gemini is 0 *available = 0; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostBalance::Request(const std::string& token, @@ -76,7 +76,7 @@ void PostBalance::Request(const std::string& token, request->url = GetUrl(); request->method = mojom::UrlMethod::POST; request->headers = RequestAuthorization(token); - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void PostBalance::OnRequest(PostBalanceCallback callback, @@ -86,7 +86,7 @@ void PostBalance::OnRequest(PostBalanceCallback callback, mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, 0.0); return; } diff --git a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.h b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.h index 8b5cf4ba3f0..e85150e6173 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.h +++ b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.h @@ -10,7 +10,7 @@ #include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // GET https://gemini.jp/api/link/v1/account/inventory // @@ -43,7 +43,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace gemini { @@ -53,7 +53,7 @@ using PostBalanceCallback = base::OnceCallback ledger_; + const raw_ref engine_; }; } // namespace gemini diff --git a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini_unittest.cc b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini_unittest.cc index 100e7c75527..a33fa3b11e0 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini_unittest.cc @@ -9,9 +9,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,12 +26,12 @@ namespace gemini { class GeminiPostBalanceTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostBalance balance_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostBalance balance_{mock_engine_impl_}; }; TEST_F(GeminiPostBalanceTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -71,14 +71,14 @@ TEST_F(GeminiPostBalanceTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK, 5000.0)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::OK, 5000.0)).Times(1); balance_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); task_environment_.RunUntilIdle(); } TEST_F(GeminiPostBalanceTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -96,7 +96,7 @@ TEST_F(GeminiPostBalanceTest, ServerError401) { } TEST_F(GeminiPostBalanceTest, ServerError403) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -114,7 +114,7 @@ TEST_F(GeminiPostBalanceTest, ServerError403) { } TEST_F(GeminiPostBalanceTest, ServerError404) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -132,7 +132,7 @@ TEST_F(GeminiPostBalanceTest, ServerError404) { } TEST_F(GeminiPostBalanceTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -143,7 +143,7 @@ TEST_F(GeminiPostBalanceTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, 0.0)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, 0.0)).Times(1); balance_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.cc b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.cc index 6007abb8cf9..e09aa670d5a 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.cc @@ -12,12 +12,12 @@ #include "base/strings/stringprintf.h" #include "base/uuid.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal::endpoint::gemini { -PostOauth::PostOauth(LedgerImpl& ledger) : ledger_(ledger) {} +PostOauth::PostOauth(RewardsEngineImpl& engine) : engine_(engine) {} PostOauth::~PostOauth() = default; @@ -51,18 +51,18 @@ mojom::Result PostOauth::ParseBody(const std::string& body, absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* access_token = dict.FindString("access_token"); if (!access_token) { BLOG(0, "Missing access token"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } *token = *access_token; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostOauth::Request(const std::string& external_account_id, @@ -74,7 +74,7 @@ void PostOauth::Request(const std::string& external_account_id, request->content_type = "application/json"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), + engine_->LoadURL(std::move(request), base::BindOnce(&PostOauth::OnRequest, base::Unretained(this), std::move(callback))); } @@ -85,7 +85,7 @@ void PostOauth::OnRequest(PostOauthCallback callback, LogUrlResponse(__func__, *response, true); mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { return std::move(callback).Run(result, ""); } diff --git a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.h b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.h index 9687cf82465..1ffdf483138 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.h +++ b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST https://exchange.sandbox.gemini.com/auth/token // @@ -39,7 +39,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint::gemini { @@ -48,7 +48,7 @@ using PostOauthCallback = class PostOauth { public: - explicit PostOauth(LedgerImpl& ledger); + explicit PostOauth(RewardsEngineImpl& engine); ~PostOauth(); void Request(const std::string& external_account_id, @@ -65,7 +65,7 @@ class PostOauth { void OnRequest(PostOauthCallback, mojom::UrlResponsePtr); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace endpoint::gemini diff --git a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini_unittest.cc b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini_unittest.cc index e21c0f85cd8..d3b960cfabf 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini_unittest.cc @@ -9,9 +9,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,12 +26,12 @@ namespace gemini { class GeminiPostOauthTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostOauth oauth_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostOauth oauth_{mock_engine_impl_}; }; TEST_F(GeminiPostOauthTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -48,8 +48,7 @@ TEST_F(GeminiPostOauthTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK, std::string("aaaaa"))) - .Times(1); + EXPECT_CALL(callback, Run(mojom::Result::OK, std::string("aaaaa"))).Times(1); oauth_.Request( "46553A9E3D57D70F960EA26D95183D8CBB026283D92CBC7C54665408DA7DF398", "1234567890", callback.Get()); @@ -58,7 +57,7 @@ TEST_F(GeminiPostOauthTest, ServerOK) { } TEST_F(GeminiPostOauthTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -79,7 +78,7 @@ TEST_F(GeminiPostOauthTest, ServerError401) { } TEST_F(GeminiPostOauthTest, ServerError403) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -100,7 +99,7 @@ TEST_F(GeminiPostOauthTest, ServerError403) { } TEST_F(GeminiPostOauthTest, ServerError404) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -120,7 +119,7 @@ TEST_F(GeminiPostOauthTest, ServerError404) { } TEST_F(GeminiPostOauthTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -131,8 +130,7 @@ TEST_F(GeminiPostOauthTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, std::string())) - .Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, std::string())).Times(1); oauth_.Request( "46553A9E3D57D70F960EA26D95183D8CBB026283D92CBC7C54665408DA7DF398", "1234567890", callback.Get()); diff --git a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.cc b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.cc index 64432e244f0..4b2f52ba4a3 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.cc @@ -12,12 +12,12 @@ #include "base/json/json_writer.h" #include "base/uuid.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal::endpoint::gemini { -PostRecipientId::PostRecipientId(LedgerImpl& ledger) : ledger_(ledger) {} +PostRecipientId::PostRecipientId(RewardsEngineImpl& engine) : engine_(engine) {} PostRecipientId::~PostRecipientId() = default; @@ -32,24 +32,24 @@ mojom::Result PostRecipientId::ParseBody(const std::string& body, absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* result = dict.FindString("result"); if (!result || *result != "OK") { BLOG(0, "Failed creating recipient_id"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const auto* id = dict.FindString("recipient_id"); if (!id) { BLOG(0, "Response missing a recipient_id"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } *recipient_id = *id; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } std::string PostRecipientId::GeneratePayload() { @@ -72,7 +72,7 @@ void PostRecipientId::Request(const std::string& token, request->headers = RequestAuthorization(token); request->headers.push_back("X-GEMINI-PAYLOAD: " + GeneratePayload()); - ledger_->LoadURL(std::move(request), + engine_->LoadURL(std::move(request), base::BindOnce(&PostRecipientId::OnRequest, base::Unretained(this), std::move(callback))); } @@ -91,7 +91,7 @@ void PostRecipientId::OnRequest(PostRecipientIdCallback callback, } mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { return std::move(callback).Run(result, ""); } diff --git a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h index dec68410bba..0e497488fb5 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h +++ b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST https://api.gemini.com/v1/payments/recipientIds // Payload: @@ -39,7 +39,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint::gemini { @@ -48,7 +48,7 @@ using PostRecipientIdCallback = class PostRecipientId { public: - explicit PostRecipientId(LedgerImpl& ledger); + explicit PostRecipientId(RewardsEngineImpl& engine); ~PostRecipientId(); void Request(const std::string& token, PostRecipientIdCallback); @@ -61,7 +61,7 @@ class PostRecipientId { void OnRequest(PostRecipientIdCallback, mojom::UrlResponsePtr); std::string GeneratePayload(); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace endpoint::gemini diff --git a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini_unittest.cc b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini_unittest.cc index 8d5b3e1536e..edb5adc6a9a 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini_unittest.cc @@ -9,9 +9,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,12 +26,12 @@ namespace gemini { class GeminiPostRecipientIdTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostRecipientId post_recipient_id_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostRecipientId post_recipient_id_{mock_engine_impl_}; }; TEST_F(GeminiPostRecipientIdTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -47,7 +47,7 @@ TEST_F(GeminiPostRecipientIdTest, ServerOK) { base::MockCallback callback; EXPECT_CALL(callback, - Run(mojom::Result::LEDGER_OK, + Run(mojom::Result::OK, std::string("60f9be89-ada7-486d-9cef-f6d3a10886d7"))) .Times(1); post_recipient_id_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", @@ -57,7 +57,7 @@ TEST_F(GeminiPostRecipientIdTest, ServerOK) { } TEST_F(GeminiPostRecipientIdTest, ServerOK_Unverified) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -82,7 +82,7 @@ TEST_F(GeminiPostRecipientIdTest, ServerOK_Unverified) { } TEST_F(GeminiPostRecipientIdTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -102,7 +102,7 @@ TEST_F(GeminiPostRecipientIdTest, ServerError401) { } TEST_F(GeminiPostRecipientIdTest, ServerError403) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -122,7 +122,7 @@ TEST_F(GeminiPostRecipientIdTest, ServerError403) { } TEST_F(GeminiPostRecipientIdTest, ServerError404) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -141,7 +141,7 @@ TEST_F(GeminiPostRecipientIdTest, ServerError404) { } TEST_F(GeminiPostRecipientIdTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -152,8 +152,7 @@ TEST_F(GeminiPostRecipientIdTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, std::string())) - .Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, std::string())).Times(1); post_recipient_id_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); diff --git a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.cc b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.cc index 72dd05f1bbb..c3a3082e2ff 100644 --- a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.cc +++ b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.cc @@ -11,14 +11,14 @@ #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/payment/payment_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace payment { -GetCredentials::GetCredentials(LedgerImpl& ledger) : ledger_(ledger) {} +GetCredentials::GetCredentials(RewardsEngineImpl& engine) : engine_(engine) {} GetCredentials::~GetCredentials() = default; @@ -55,7 +55,7 @@ mojom::Result GetCredentials::CheckStatusCode(const int status_code) { return mojom::Result::RETRY; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result GetCredentials::ParseBody(const std::string& body, @@ -90,7 +90,7 @@ mojom::Result GetCredentials::ParseBody(const std::string& body, batch->batch_proof = *batch_proof; base::JSONWriter::Write(*signed_creds, &batch->signed_creds); - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void GetCredentials::Request(const std::string& order_id, @@ -101,7 +101,7 @@ void GetCredentials::Request(const std::string& order_id, auto request = mojom::UrlRequest::New(); request->url = GetUrl(order_id, item_id); - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void GetCredentials::OnRequest(GetCredentialsCallback callback, @@ -110,7 +110,7 @@ void GetCredentials::OnRequest(GetCredentialsCallback callback, LogUrlResponse(__func__, *response); mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, nullptr); return; } diff --git a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.h b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.h index 91b80988635..859f6466859 100644 --- a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.h +++ b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.h @@ -10,7 +10,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // GET /v1/promotions/{promotion_id}/claims/{claim_id} // @@ -45,7 +45,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace payment { @@ -55,7 +55,7 @@ using GetCredentialsCallback = class GetCredentials { public: - explicit GetCredentials(LedgerImpl& ledger); + explicit GetCredentials(RewardsEngineImpl& engine); ~GetCredentials(); void Request(const std::string& order_id, @@ -72,7 +72,7 @@ class GetCredentials { void OnRequest(GetCredentialsCallback callback, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace payment diff --git a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials_unittest.cc b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials_unittest.cc index 50b1c5788cb..d417bf8510d 100644 --- a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials_unittest.cc +++ b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace payment { class GetCredentialsTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - GetCredentials creds_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + GetCredentials creds_{mock_engine_impl_}; }; TEST_F(GetCredentialsTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -64,7 +64,7 @@ TEST_F(GetCredentialsTest, ServerOK) { expected_batch.signed_creds = R"(["ijSZoLLG+EnRN916RUQcjiV6c4Wb6ItbnxXBFhz81EQ=","dj6glCJ2roHYcTFcXF21IrKx1uT/ptM7SJEdiEE1fG8=","nCF9a4KuASICVC0zrx2wGnllgIUxBMnylpu5SA+oBjI="])"; // NOLINT - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); EXPECT_TRUE(expected_batch.Equals(*batch)); }); creds_.Request("pl2okf23-f2f02kf2fm2-msdkfsodkfds", @@ -74,7 +74,7 @@ TEST_F(GetCredentialsTest, ServerOK) { } TEST_F(GetCredentialsTest, ServerError202) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -93,7 +93,7 @@ TEST_F(GetCredentialsTest, ServerError202) { } TEST_F(GetCredentialsTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -112,7 +112,7 @@ TEST_F(GetCredentialsTest, ServerError400) { } TEST_F(GetCredentialsTest, ServerError404) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -131,7 +131,7 @@ TEST_F(GetCredentialsTest, ServerError404) { } TEST_F(GetCredentialsTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -150,7 +150,7 @@ TEST_F(GetCredentialsTest, ServerError500) { } TEST_F(GetCredentialsTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); diff --git a/components/brave_rewards/core/endpoint/payment/payment_server.cc b/components/brave_rewards/core/endpoint/payment/payment_server.cc index 196d44e9f67..96693e1b7a0 100644 --- a/components/brave_rewards/core/endpoint/payment/payment_server.cc +++ b/components/brave_rewards/core/endpoint/payment/payment_server.cc @@ -5,18 +5,18 @@ #include "brave/components/brave_rewards/core/endpoint/payment/payment_server.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace endpoint { -PaymentServer::PaymentServer(LedgerImpl& ledger) - : post_order_(ledger), - post_credentials_(ledger), - get_credentials_(ledger), - post_votes_(ledger), - post_transaction_gemini_(ledger), - post_transaction_uphold_(ledger) {} +PaymentServer::PaymentServer(RewardsEngineImpl& engine) + : post_order_(engine), + post_credentials_(engine), + get_credentials_(engine), + post_votes_(engine), + post_transaction_gemini_(engine), + post_transaction_uphold_(engine) {} PaymentServer::~PaymentServer() = default; diff --git a/components/brave_rewards/core/endpoint/payment/payment_server.h b/components/brave_rewards/core/endpoint/payment/payment_server.h index 2b7c1452ed1..e19a8ad52d8 100644 --- a/components/brave_rewards/core/endpoint/payment/payment_server.h +++ b/components/brave_rewards/core/endpoint/payment/payment_server.h @@ -12,16 +12,16 @@ #include "brave/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.h" #include "brave/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.h" #include "brave/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { class PaymentServer { public: - explicit PaymentServer(LedgerImpl& ledger); + explicit PaymentServer(RewardsEngineImpl& engine); ~PaymentServer(); payment::PostOrder& post_order() { return post_order_; } diff --git a/components/brave_rewards/core/endpoint/payment/payment_util.cc b/components/brave_rewards/core/endpoint/payment/payment_util.cc index 4d849ee0bcc..a45b5f97ee0 100644 --- a/components/brave_rewards/core/endpoint/payment/payment_util.cc +++ b/components/brave_rewards/core/endpoint/payment/payment_util.cc @@ -5,7 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/payment/payment_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace endpoint { diff --git a/components/brave_rewards/core/endpoint/payment/payment_util_unittest.cc b/components/brave_rewards/core/endpoint/payment/payment_util_unittest.cc index 9a82f092659..18da2c4a5eb 100644 --- a/components/brave_rewards/core/endpoint/payment/payment_util_unittest.cc +++ b/components/brave_rewards/core/endpoint/payment/payment_util_unittest.cc @@ -5,7 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/payment/payment_util.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "testing/gtest/include/gtest/gtest.h" // npm run test -- brave_unit_tests --filter=PaymentUtilTest.* diff --git a/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.cc b/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.cc index ffe177887a3..2baeccdc72b 100644 --- a/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.cc +++ b/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.cc @@ -10,14 +10,14 @@ #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/payment/payment_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace payment { -PostCredentials::PostCredentials(LedgerImpl& ledger) : ledger_(ledger) {} +PostCredentials::PostCredentials(RewardsEngineImpl& engine) : engine_(engine) {} PostCredentials::~PostCredentials() = default; @@ -46,25 +46,25 @@ std::string PostCredentials::GeneratePayload( mojom::Result PostCredentials::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid request"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_CONFLICT) { BLOG(0, "Credentials already exist for this order"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_INTERNAL_SERVER_ERROR) { BLOG(0, "Internal server error"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostCredentials::Request(const std::string& order_id, @@ -80,7 +80,7 @@ void PostCredentials::Request(const std::string& order_id, request->content = GeneratePayload(item_id, type, std::move(blinded_creds)); request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void PostCredentials::OnRequest(PostCredentialsCallback callback, diff --git a/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.h b/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.h index 66ce42fa103..de8e5e7a5f7 100644 --- a/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.h +++ b/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.h @@ -11,7 +11,7 @@ #include "base/memory/raw_ref.h" #include "base/values.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST /v1/orders/{order_id}/credentials // @@ -37,7 +37,7 @@ // {Empty} namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace payment { @@ -46,7 +46,7 @@ using PostCredentialsCallback = base::OnceCallback; class PostCredentials { public: - explicit PostCredentials(LedgerImpl& ledger); + explicit PostCredentials(RewardsEngineImpl& engine); ~PostCredentials(); void Request(const std::string& order_id, @@ -67,7 +67,7 @@ class PostCredentials { void OnRequest(PostCredentialsCallback callback, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace payment diff --git a/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials_unittest.cc b/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials_unittest.cc index 297b470fd42..467fbc33f82 100644 --- a/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials_unittest.cc +++ b/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace payment { class PostCredentialsTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostCredentials creds_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostCredentials creds_{mock_engine_impl_}; }; TEST_F(PostCredentialsTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -46,7 +46,7 @@ TEST_F(PostCredentialsTest, ServerOK) { blinded.Append(base::Value("asfeq4gerg34gl3g34lg34g")); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::OK)).Times(1); creds_.Request("pl2okf23-f2f02kf2fm2-msdkfsodkfds", "ff50981d-47de-4210-848d-995e186901a1", "single-use", std::move(blinded), callback.Get()); @@ -55,7 +55,7 @@ TEST_F(PostCredentialsTest, ServerOK) { } TEST_F(PostCredentialsTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -69,7 +69,7 @@ TEST_F(PostCredentialsTest, ServerError400) { blinded.Append(base::Value("asfeq4gerg34gl3g34lg34g")); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED)).Times(1); creds_.Request("pl2okf23-f2f02kf2fm2-msdkfsodkfds", "ff50981d-47de-4210-848d-995e186901a1", "single-use", std::move(blinded), callback.Get()); @@ -78,7 +78,7 @@ TEST_F(PostCredentialsTest, ServerError400) { } TEST_F(PostCredentialsTest, ServerError409) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -92,7 +92,7 @@ TEST_F(PostCredentialsTest, ServerError409) { blinded.Append(base::Value("asfeq4gerg34gl3g34lg34g")); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED)).Times(1); creds_.Request("pl2okf23-f2f02kf2fm2-msdkfsodkfds", "ff50981d-47de-4210-848d-995e186901a1", "single-use", std::move(blinded), callback.Get()); @@ -101,7 +101,7 @@ TEST_F(PostCredentialsTest, ServerError409) { } TEST_F(PostCredentialsTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -115,7 +115,7 @@ TEST_F(PostCredentialsTest, ServerError500) { blinded.Append(base::Value("asfeq4gerg34gl3g34lg34g")); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED)).Times(1); creds_.Request("pl2okf23-f2f02kf2fm2-msdkfsodkfds", "ff50981d-47de-4210-848d-995e186901a1", "single-use", std::move(blinded), callback.Get()); @@ -124,7 +124,7 @@ TEST_F(PostCredentialsTest, ServerError500) { } TEST_F(PostCredentialsTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -138,7 +138,7 @@ TEST_F(PostCredentialsTest, ServerErrorRandom) { blinded.Append(base::Value("asfeq4gerg34gl3g34lg34g")); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED)).Times(1); creds_.Request("pl2okf23-f2f02kf2fm2-msdkfsodkfds", "ff50981d-47de-4210-848d-995e186901a1", "single-use", std::move(blinded), callback.Get()); diff --git a/components/brave_rewards/core/endpoint/payment/post_order/post_order.cc b/components/brave_rewards/core/endpoint/payment/post_order/post_order.cc index 91192df270d..629b0d09cd4 100644 --- a/components/brave_rewards/core/endpoint/payment/post_order/post_order.cc +++ b/components/brave_rewards/core/endpoint/payment/post_order/post_order.cc @@ -12,7 +12,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/payment/payment_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" using std::placeholders::_1; @@ -21,7 +21,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace payment { -PostOrder::PostOrder(LedgerImpl& ledger) : ledger_(ledger) {} +PostOrder::PostOrder(RewardsEngineImpl& engine) : engine_(engine) {} PostOrder::~PostOrder() = default; @@ -61,10 +61,10 @@ mojom::Result PostOrder::CheckStatusCode(const int status_code) { if (status_code != net::HTTP_CREATED) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result PostOrder::ParseBody( @@ -76,7 +76,7 @@ mojom::Result PostOrder::ParseBody( absl::optional dictionary = base::JSONReader::Read(body); if (!dictionary || !dictionary->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = dictionary->GetDict(); @@ -88,7 +88,7 @@ mojom::Result PostOrder::ParseBody( if (order->order_id.empty()) { BLOG(0, "Order id empty"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const auto* total_amount = dict.FindString("totalPrice"); @@ -114,12 +114,12 @@ mojom::Result PostOrder::ParseBody( auto* items = dict.FindList("items"); if (!items) { - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } if (items->size() != order_items.size()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } int count = 0; @@ -163,7 +163,7 @@ mojom::Result PostOrder::ParseBody( count++; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostOrder::Request(const std::vector& items, @@ -176,7 +176,7 @@ void PostOrder::Request(const std::vector& items, request->content = GeneratePayload(items); request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), url_callback); + engine_->LoadURL(std::move(request), url_callback); } void PostOrder::OnRequest(mojom::UrlResponsePtr response, @@ -187,7 +187,7 @@ void PostOrder::OnRequest(mojom::UrlResponsePtr response, mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { callback(result, nullptr); return; } diff --git a/components/brave_rewards/core/endpoint/payment/post_order/post_order.h b/components/brave_rewards/core/endpoint/payment/post_order/post_order.h index 9b93d79a793..66e0b428375 100644 --- a/components/brave_rewards/core/endpoint/payment/post_order/post_order.h +++ b/components/brave_rewards/core/endpoint/payment/post_order/post_order.h @@ -10,7 +10,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST /v1/orders // @@ -58,7 +58,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace payment { @@ -68,7 +68,7 @@ using PostOrderCallback = class PostOrder { public: - explicit PostOrder(LedgerImpl& ledger); + explicit PostOrder(RewardsEngineImpl& engine); ~PostOrder(); void Request(const std::vector& items, @@ -89,7 +89,7 @@ class PostOrder { const std::vector& items, PostOrderCallback callback); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace payment diff --git a/components/brave_rewards/core/endpoint/payment/post_order/post_order_unittest.cc b/components/brave_rewards/core/endpoint/payment/post_order/post_order_unittest.cc index eb63dd6f4d4..354aa1c62aa 100644 --- a/components/brave_rewards/core/endpoint/payment/post_order/post_order_unittest.cc +++ b/components/brave_rewards/core/endpoint/payment/post_order/post_order_unittest.cc @@ -9,9 +9,9 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/payment/post_order/post_order.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -28,12 +28,12 @@ namespace payment { class PostOrderTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostOrder order_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostOrder order_{mock_engine_impl_}; }; TEST_F(PostOrderTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -94,7 +94,7 @@ TEST_F(PostOrderTest, ServerOK) { expected_order.status = mojom::SKUOrderStatus::PENDING; expected_order.items.push_back(std::move(expected_order_item)); - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); EXPECT_TRUE(expected_order.Equals(*order)); }); order_.Request(items, callback.AsStdFunction()); @@ -103,7 +103,7 @@ TEST_F(PostOrderTest, ServerOK) { } TEST_F(PostOrderTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -128,7 +128,7 @@ TEST_F(PostOrderTest, ServerError400) { } TEST_F(PostOrderTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -153,7 +153,7 @@ TEST_F(PostOrderTest, ServerError500) { } TEST_F(PostOrderTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -171,7 +171,7 @@ TEST_F(PostOrderTest, ServerErrorRandom) { items.push_back(item); MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR, IsFalse())).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED, IsFalse())).Times(1); order_.Request(items, callback.AsStdFunction()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.cc b/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.cc index 768fef34767..479fb50da2a 100644 --- a/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.cc +++ b/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.cc @@ -10,7 +10,7 @@ #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/payment/payment_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" using std::placeholders::_1; @@ -19,8 +19,8 @@ namespace brave_rewards::internal { namespace endpoint { namespace payment { -PostTransactionGemini::PostTransactionGemini(LedgerImpl& ledger) - : ledger_(ledger) {} +PostTransactionGemini::PostTransactionGemini(RewardsEngineImpl& engine) + : engine_(engine) {} PostTransactionGemini::~PostTransactionGemini() = default; @@ -45,7 +45,7 @@ std::string PostTransactionGemini::GeneratePayload( mojom::Result PostTransactionGemini::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid request"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_NOT_FOUND) { @@ -55,20 +55,20 @@ mojom::Result PostTransactionGemini::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_CONFLICT) { BLOG(0, "External transaction id already submitted"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_INTERNAL_SERVER_ERROR) { BLOG(0, "Internal server error"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_CREATED && status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostTransactionGemini::Request(const mojom::SKUTransaction& transaction, @@ -84,7 +84,7 @@ void PostTransactionGemini::Request(const mojom::SKUTransaction& transaction, BLOG(0, "External Transaction ID: " << transaction.external_transaction_id << " for " << transaction.amount); - ledger_->LoadURL(std::move(request), url_callback); + engine_->LoadURL(std::move(request), url_callback); } void PostTransactionGemini::OnRequest(mojom::UrlResponsePtr response, @@ -92,9 +92,9 @@ void PostTransactionGemini::OnRequest(mojom::UrlResponsePtr response, DCHECK(response); LogUrlResponse(__func__, *response); - BLOG_IF(0, CheckStatusCode(response->status_code) != mojom::Result::LEDGER_OK, + BLOG_IF(0, CheckStatusCode(response->status_code) != mojom::Result::OK, "Error creating gemini transaction on the payment server"); - BLOG_IF(0, CheckStatusCode(response->status_code) == mojom::Result::LEDGER_OK, + BLOG_IF(0, CheckStatusCode(response->status_code) == mojom::Result::OK, "Gemini transaction successful on the payment server"); callback(CheckStatusCode(response->status_code)); diff --git a/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.h b/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.h index d6179706bc7..429359c04d6 100644 --- a/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.h +++ b/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST /v1/orders/{order_id}/transactions/gemini // @@ -42,7 +42,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace payment { @@ -52,7 +52,7 @@ using PostTransactionGeminiCallback = class PostTransactionGemini { public: - explicit PostTransactionGemini(LedgerImpl& ledger); + explicit PostTransactionGemini(RewardsEngineImpl& engine); ~PostTransactionGemini(); void Request(const mojom::SKUTransaction& transaction, @@ -68,7 +68,7 @@ class PostTransactionGemini { void OnRequest(mojom::UrlResponsePtr response, PostTransactionGeminiCallback callback); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace payment diff --git a/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini_unittest.cc b/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini_unittest.cc index c4fbfbb504f..ae74ae2577a 100644 --- a/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini_unittest.cc @@ -9,9 +9,9 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace payment { class PostTransactionGeminiTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostTransactionGemini order_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostTransactionGemini order_{mock_engine_impl_}; }; TEST_F(PostTransactionGeminiTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -47,14 +47,14 @@ TEST_F(PostTransactionGeminiTest, ServerOK) { transaction.external_transaction_id = "d382d3ae-8462-4b2c-9b60-b669539f41b2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_OK)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::OK)).Times(1); order_.Request(transaction, callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostTransactionGeminiTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -69,14 +69,14 @@ TEST_F(PostTransactionGeminiTest, ServerError400) { transaction.external_transaction_id = "d382d3ae-8462-4b2c-9b60-b669539f41b2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); order_.Request(transaction, callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostTransactionGeminiTest, ServerError404) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -98,7 +98,7 @@ TEST_F(PostTransactionGeminiTest, ServerError404) { } TEST_F(PostTransactionGeminiTest, ServerError409) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -113,14 +113,14 @@ TEST_F(PostTransactionGeminiTest, ServerError409) { transaction.external_transaction_id = "d382d3ae-8462-4b2c-9b60-b669539f41b2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); order_.Request(transaction, callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostTransactionGeminiTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -135,14 +135,14 @@ TEST_F(PostTransactionGeminiTest, ServerError500) { transaction.external_transaction_id = "d382d3ae-8462-4b2c-9b60-b669539f41b2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); order_.Request(transaction, callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostTransactionGeminiTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -157,7 +157,7 @@ TEST_F(PostTransactionGeminiTest, ServerErrorRandom) { transaction.external_transaction_id = "d382d3ae-8462-4b2c-9b60-b669539f41b2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); order_.Request(transaction, callback.AsStdFunction()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.cc b/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.cc index dccff0828f6..135be749a0a 100644 --- a/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.cc +++ b/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.cc @@ -10,7 +10,7 @@ #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/payment/payment_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" using std::placeholders::_1; @@ -19,8 +19,8 @@ namespace brave_rewards::internal { namespace endpoint { namespace payment { -PostTransactionUphold::PostTransactionUphold(LedgerImpl& ledger) - : ledger_(ledger) {} +PostTransactionUphold::PostTransactionUphold(RewardsEngineImpl& engine) + : engine_(engine) {} PostTransactionUphold::~PostTransactionUphold() = default; @@ -45,7 +45,7 @@ std::string PostTransactionUphold::GeneratePayload( mojom::Result PostTransactionUphold::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid request"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_NOT_FOUND) { @@ -55,20 +55,20 @@ mojom::Result PostTransactionUphold::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_CONFLICT) { BLOG(0, "External transaction id already submitted"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_INTERNAL_SERVER_ERROR) { BLOG(0, "Internal server error"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_CREATED && status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostTransactionUphold::Request(const mojom::SKUTransaction& transaction, @@ -81,7 +81,7 @@ void PostTransactionUphold::Request(const mojom::SKUTransaction& transaction, request->content = GeneratePayload(transaction); request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), url_callback); + engine_->LoadURL(std::move(request), url_callback); } void PostTransactionUphold::OnRequest(mojom::UrlResponsePtr response, diff --git a/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.h b/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.h index 00f10a062c2..6caedf470fb 100644 --- a/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.h +++ b/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST /v1/orders/{order_id}/transactions/uphold // @@ -42,7 +42,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace payment { @@ -52,7 +52,7 @@ using PostTransactionUpholdCallback = class PostTransactionUphold { public: - explicit PostTransactionUphold(LedgerImpl& ledger); + explicit PostTransactionUphold(RewardsEngineImpl& engine); ~PostTransactionUphold(); void Request(const mojom::SKUTransaction& transaction, @@ -68,7 +68,7 @@ class PostTransactionUphold { void OnRequest(mojom::UrlResponsePtr response, PostTransactionUpholdCallback callback); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace payment diff --git a/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold_unittest.cc b/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold_unittest.cc index d4b835ae5ba..d53d4997042 100644 --- a/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold_unittest.cc +++ b/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold_unittest.cc @@ -9,9 +9,9 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace payment { class PostTransactionUpholdTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostTransactionUphold order_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostTransactionUphold order_{mock_engine_impl_}; }; TEST_F(PostTransactionUpholdTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -47,14 +47,14 @@ TEST_F(PostTransactionUpholdTest, ServerOK) { transaction.external_transaction_id = "d382d3ae-8462-4b2c-9b60-b669539f41b2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_OK)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::OK)).Times(1); order_.Request(transaction, callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostTransactionUpholdTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -69,14 +69,14 @@ TEST_F(PostTransactionUpholdTest, ServerError400) { transaction.external_transaction_id = "d382d3ae-8462-4b2c-9b60-b669539f41b2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); order_.Request(transaction, callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostTransactionUpholdTest, ServerError404) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -98,7 +98,7 @@ TEST_F(PostTransactionUpholdTest, ServerError404) { } TEST_F(PostTransactionUpholdTest, ServerError409) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -113,14 +113,14 @@ TEST_F(PostTransactionUpholdTest, ServerError409) { transaction.external_transaction_id = "d382d3ae-8462-4b2c-9b60-b669539f41b2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); order_.Request(transaction, callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostTransactionUpholdTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -135,14 +135,14 @@ TEST_F(PostTransactionUpholdTest, ServerError500) { transaction.external_transaction_id = "d382d3ae-8462-4b2c-9b60-b669539f41b2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); order_.Request(transaction, callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostTransactionUpholdTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -157,7 +157,7 @@ TEST_F(PostTransactionUpholdTest, ServerErrorRandom) { transaction.external_transaction_id = "d382d3ae-8462-4b2c-9b60-b669539f41b2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); order_.Request(transaction, callback.AsStdFunction()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.cc b/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.cc index 2b22d0a90f6..7dc67434c94 100644 --- a/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.cc +++ b/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.cc @@ -12,7 +12,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/credentials/credentials_util.h" #include "brave/components/brave_rewards/core/endpoint/payment/payment_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" using std::placeholders::_1; @@ -21,7 +21,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace payment { -PostVotes::PostVotes(LedgerImpl& ledger) : ledger_(ledger) {} +PostVotes::PostVotes(RewardsEngineImpl& engine) : engine_(engine) {} PostVotes::~PostVotes() = default; @@ -68,10 +68,10 @@ mojom::Result PostVotes::CheckStatusCode(const int status_code) { if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostVotes::Request(const credential::CredentialsRedeem& redeem, @@ -83,7 +83,7 @@ void PostVotes::Request(const credential::CredentialsRedeem& redeem, request->content = GeneratePayload(redeem); request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), url_callback); + engine_->LoadURL(std::move(request), url_callback); } void PostVotes::OnRequest(mojom::UrlResponsePtr response, diff --git a/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.h b/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.h index 9dfea6f32df..7457d1b65ae 100644 --- a/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.h +++ b/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.h @@ -10,7 +10,7 @@ #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/credentials/credentials_redeem.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST /v1/votes // @@ -37,7 +37,7 @@ // {Empty} namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace payment { @@ -46,7 +46,7 @@ using PostVotesCallback = std::function; class PostVotes { public: - explicit PostVotes(LedgerImpl& ledger); + explicit PostVotes(RewardsEngineImpl& engine); ~PostVotes(); void Request(const credential::CredentialsRedeem& redeem, @@ -61,7 +61,7 @@ class PostVotes { void OnRequest(mojom::UrlResponsePtr response, PostVotesCallback callback); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace payment diff --git a/components/brave_rewards/core/endpoint/payment/post_votes/post_votes_unittest.cc b/components/brave_rewards/core/endpoint/payment/post_votes/post_votes_unittest.cc index 74c8c0afa27..28f7dad3a05 100644 --- a/components/brave_rewards/core/endpoint/payment/post_votes/post_votes_unittest.cc +++ b/components/brave_rewards/core/endpoint/payment/post_votes/post_votes_unittest.cc @@ -9,9 +9,9 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace payment { class PostVotesTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostVotes votes_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostVotes votes_{mock_engine_impl_}; }; TEST_F(PostVotesTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -58,14 +58,14 @@ TEST_F(PostVotesTest, ServerOK) { redeem.contribution_id = "83b3b77b-e7c3-455b-adda-e476fa0656d2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_OK)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::OK)).Times(1); votes_.Request(redeem, callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostVotesTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -98,7 +98,7 @@ TEST_F(PostVotesTest, ServerError400) { } TEST_F(PostVotesTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -131,7 +131,7 @@ TEST_F(PostVotesTest, ServerError500) { } TEST_F(PostVotesTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -157,7 +157,7 @@ TEST_F(PostVotesTest, ServerErrorRandom) { redeem.contribution_id = "83b3b77b-e7c3-455b-adda-e476fa0656d2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); votes_.Request(redeem, callback.AsStdFunction()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.cc b/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.cc index f83b140cc52..7f7efe9a685 100644 --- a/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.cc +++ b/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.cc @@ -12,8 +12,8 @@ #include "brave/components/brave_rewards/core/common/brotli_util.h" #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/endpoint/private_cdn/private_cdn_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/publisher/protos/channel_response.pb.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/base/load_flags.h" #include "net/http/http_status_code.h" @@ -118,7 +118,7 @@ mojom::Result ServerPublisherInfoFromMessage( DCHECK(info); if (expected_key.empty()) { - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } for (const auto& entry : message.channel_responses()) { @@ -133,10 +133,10 @@ mojom::Result ServerPublisherInfoFromMessage( if (entry.has_site_banner_details()) { info->banner = GetPublisherBannerFromMessage(entry.site_banner_details()); } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } bool DecompressMessage(base::StringPiece payload, std::string* output) { @@ -149,7 +149,7 @@ bool DecompressMessage(base::StringPiece payload, std::string* output) { namespace endpoint { namespace private_cdn { -GetPublisher::GetPublisher(LedgerImpl& ledger) : ledger_(ledger) {} +GetPublisher::GetPublisher(RewardsEngineImpl& engine) : engine_(engine) {} GetPublisher::~GetPublisher() = default; @@ -167,10 +167,10 @@ mojom::Result GetPublisher::CheckStatusCode(const int status_code) { if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result GetPublisher::ParseBody(const std::string& body, @@ -180,13 +180,13 @@ mojom::Result GetPublisher::ParseBody(const std::string& body, if (body.empty()) { BLOG(0, "Publisher data empty"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } base::StringPiece body_payload(body.data(), body.size()); if (!brave::PrivateCdnHelper::GetInstance()->RemovePadding(&body_payload)) { BLOG(0, "Publisher data response has invalid padding"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } std::string message_string; @@ -200,15 +200,15 @@ mojom::Result GetPublisher::ParseBody(const std::string& body, publishers_pb::ChannelResponseList message; if (!message.ParseFromString(message_string)) { BLOG(0, "Error parsing publisher data protobuf message"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } auto result = ServerPublisherInfoFromMessage(message, publisher_key, info); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { GetServerInfoForEmptyResponse(publisher_key, info); } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void GetPublisher::Request(const std::string& publisher_key, @@ -220,7 +220,7 @@ void GetPublisher::Request(const std::string& publisher_key, auto request = mojom::UrlRequest::New(); request->url = GetUrl(hash_prefix); request->load_flags = net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE; - ledger_->LoadURL(std::move(request), url_callback); + engine_->LoadURL(std::move(request), url_callback); } void GetPublisher::OnRequest(mojom::UrlResponsePtr response, @@ -233,23 +233,23 @@ void GetPublisher::OnRequest(mojom::UrlResponsePtr response, auto info = mojom::ServerPublisherInfo::New(); if (result == mojom::Result::NOT_FOUND) { GetServerInfoForEmptyResponse(publisher_key, info.get()); - callback(mojom::Result::LEDGER_OK, std::move(info)); + callback(mojom::Result::OK, std::move(info)); return; } - if (result != mojom::Result::LEDGER_OK) { - callback(mojom::Result::LEDGER_ERROR, nullptr); + if (result != mojom::Result::OK) { + callback(mojom::Result::FAILED, nullptr); return; } result = ParseBody(response->body, publisher_key, info.get()); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { callback(result, nullptr); return; } - callback(mojom::Result::LEDGER_OK, std::move(info)); + callback(mojom::Result::OK, std::move(info)); } } // namespace private_cdn diff --git a/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.h b/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.h index 7e9fb3eb87d..73a2f7fb16e 100644 --- a/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.h +++ b/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // GET /publishers/prefixes/{prefix} // @@ -24,7 +24,7 @@ // https://github.com/brave/brave-core/blob/master/components/brave_rewards/core/publisher/protos/channel_response.proto namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace private_cdn { @@ -35,7 +35,7 @@ using GetPublisherCallback = class GetPublisher { public: - explicit GetPublisher(LedgerImpl& ledger); + explicit GetPublisher(RewardsEngineImpl& engine); ~GetPublisher(); void Request(const std::string& publisher_key, @@ -55,7 +55,7 @@ class GetPublisher { const std::string& publisher_key, GetPublisherCallback callback); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace private_cdn diff --git a/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher_unittest.cc b/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher_unittest.cc index 82ed1b69a37..075356f0ea0 100644 --- a/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher_unittest.cc +++ b/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher_unittest.cc @@ -10,7 +10,7 @@ #include "brave/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.h" #include "brave/components/brave_rewards/core/endpoint/private_cdn/private_cdn_util.h" #include "brave/components/brave_rewards/core/publisher/protos/channel_response.pb.h" -#include "brave/components/brave_rewards/core/test/bat_ledger_test.h" +#include "brave/components/brave_rewards/core/test/rewards_engine_test.h" #include "net/http/http_status_code.h" // npm run test -- brave_unit_tests --filter=GetPublisherTest.* @@ -19,7 +19,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace private_cdn { -class GetPublisherTest : public BATLedgerTest { +class GetPublisherTest : public RewardsEngineTest { protected: mojom::Result Request(const std::string& id, const std::string& prefix, @@ -28,7 +28,7 @@ class GetPublisherTest : public BATLedgerTest { base::RunLoop run_loop; mojom::Result result; - GetPublisher(*GetLedgerImpl()) + GetPublisher(*GetEngineImpl()) .Request(id, prefix, [&run_loop, &result, info]( mojom::Result request_result, @@ -66,7 +66,7 @@ TEST_F(GetPublisherTest, ServerError404) { mojom::ServerPublisherInfoPtr info; result = Request("brave.com", "ce55", &info); - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); ASSERT_TRUE(info); EXPECT_EQ(info->publisher_key, "brave.com"); EXPECT_EQ(info->status, mojom::PublisherStatus::NOT_VERIFIED); @@ -92,7 +92,7 @@ TEST_F(GetPublisherTest, UpholdVerified) { mojom::ServerPublisherInfoPtr info; result = Request("brave.com", "ce55", &info); - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); ASSERT_TRUE(info); EXPECT_EQ(info->publisher_key, "brave.com"); EXPECT_EQ(info->status, mojom::PublisherStatus::UPHOLD_VERIFIED); @@ -119,7 +119,7 @@ TEST_F(GetPublisherTest, EmptyWalletAddress) { mojom::ServerPublisherInfoPtr info; result = Request("brave.com", "ce55", &info); - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); ASSERT_TRUE(info); EXPECT_EQ(info->publisher_key, "brave.com"); EXPECT_EQ(info->status, mojom::PublisherStatus::NOT_VERIFIED); diff --git a/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.cc b/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.cc index bbfb54425ec..7a89c65bcbb 100644 --- a/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.cc +++ b/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.cc @@ -4,13 +4,13 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace endpoint { -PrivateCDNServer::PrivateCDNServer(LedgerImpl& ledger) - : get_publisher_(ledger) {} +PrivateCDNServer::PrivateCDNServer(RewardsEngineImpl& engine) + : get_publisher_(engine) {} PrivateCDNServer::~PrivateCDNServer() = default; diff --git a/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.h b/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.h index 84f36af1c64..19496938dd3 100644 --- a/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.h +++ b/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.h @@ -7,16 +7,16 @@ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINT_PRIVATE_CDN_PRIVATE_CDN_SERVER_H_ #include "brave/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { class PrivateCDNServer { public: - explicit PrivateCDNServer(LedgerImpl& ledger); + explicit PrivateCDNServer(RewardsEngineImpl& engine); ~PrivateCDNServer(); private_cdn::GetPublisher& get_publisher() { return get_publisher_; } diff --git a/components/brave_rewards/core/endpoint/private_cdn/private_cdn_util.cc b/components/brave_rewards/core/endpoint/private_cdn/private_cdn_util.cc index ac20d51d608..2237ccccd1b 100644 --- a/components/brave_rewards/core/endpoint/private_cdn/private_cdn_util.cc +++ b/components/brave_rewards/core/endpoint/private_cdn/private_cdn_util.cc @@ -4,7 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/private_cdn/private_cdn_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace endpoint { diff --git a/components/brave_rewards/core/endpoint/private_cdn/private_cdn_util_unittest.cc b/components/brave_rewards/core/endpoint/private_cdn/private_cdn_util_unittest.cc index a39c93f73b2..718784c2215 100644 --- a/components/brave_rewards/core/endpoint/private_cdn/private_cdn_util_unittest.cc +++ b/components/brave_rewards/core/endpoint/private_cdn/private_cdn_util_unittest.cc @@ -5,7 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/private_cdn/private_cdn_util.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "testing/gtest/include/gtest/gtest.h" // npm run test -- brave_unit_tests --filter=PrivateCDNTest.* diff --git a/components/brave_rewards/core/endpoint/promotion/get_available/get_available.cc b/components/brave_rewards/core/endpoint/promotion/get_available/get_available.cc index 06efcfc1361..4687495411d 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_available/get_available.cc +++ b/components/brave_rewards/core/endpoint/promotion/get_available/get_available.cc @@ -11,8 +11,8 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/promotion/promotion_util.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -22,12 +22,12 @@ namespace brave_rewards::internal { namespace endpoint { namespace promotion { -GetAvailable::GetAvailable(LedgerImpl& ledger) : ledger_(ledger) {} +GetAvailable::GetAvailable(RewardsEngineImpl& engine) : engine_(engine) {} GetAvailable::~GetAvailable() = default; std::string GetAvailable::GetUrl(const std::string& platform) { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); std::string payment_id; if (wallet) { payment_id = @@ -46,7 +46,7 @@ std::string GetAvailable::GetUrl(const std::string& platform) { mojom::Result GetAvailable::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid paymentId or platform in request"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_NOT_FOUND) { @@ -56,15 +56,15 @@ mojom::Result GetAvailable::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_INTERNAL_SERVER_ERROR) { BLOG(0, "Internal server error"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result GetAvailable::ParseBody( @@ -76,13 +76,13 @@ mojom::Result GetAvailable::ParseBody( absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* promotions = dict.FindList("promotions"); if (!promotions) { - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } const auto promotion_size = promotions->size(); @@ -195,7 +195,7 @@ mojom::Result GetAvailable::ParseBody( return mojom::Result::CORRUPTED_DATA; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void GetAvailable::Request(const std::string& platform, @@ -205,7 +205,7 @@ void GetAvailable::Request(const std::string& platform, auto request = mojom::UrlRequest::New(); request->url = GetUrl(platform); - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void GetAvailable::OnRequest(GetAvailableCallback callback, @@ -217,7 +217,7 @@ void GetAvailable::OnRequest(GetAvailableCallback callback, std::vector corrupted_promotions; mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, std::move(list), corrupted_promotions); return; } diff --git a/components/brave_rewards/core/endpoint/promotion/get_available/get_available.h b/components/brave_rewards/core/endpoint/promotion/get_available/get_available.h index 02faf2e9c79..eafa0903505 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_available/get_available.h +++ b/components/brave_rewards/core/endpoint/promotion/get_available/get_available.h @@ -10,7 +10,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // GET /v1/promotions?migrate=true&paymentId={payment_id}&platform={platform} // @@ -45,7 +45,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -57,7 +57,7 @@ using GetAvailableCallback = base::OnceCallback ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/get_available/get_available_unittest.cc b/components/brave_rewards/core/endpoint/promotion/get_available/get_available_unittest.cc index 3b95dc11a80..9fe37cd82d2 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_available/get_available_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/get_available/get_available_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -28,12 +28,12 @@ namespace promotion { class GetAvailableTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - GetAvailable available_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + GetAvailable available_{mock_engine_impl_}; }; TEST_F(GetAvailableTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -78,7 +78,7 @@ TEST_F(GetAvailableTest, ServerOK) { "[\"dvpysTSiJdZUPihius7pvGOfngRWfDiIbrowykgMi1I=\"]"; expected_promotion.legacy_claimed = false; - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); EXPECT_TRUE(corrupted_promotions.empty()); EXPECT_EQ(list.size(), 1ul); EXPECT_TRUE(expected_promotion.Equals(*list[0])); @@ -89,7 +89,7 @@ TEST_F(GetAvailableTest, ServerOK) { } TEST_F(GetAvailableTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -100,7 +100,7 @@ TEST_F(GetAvailableTest, ServerError400) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, IsEmpty(), IsEmpty())) + EXPECT_CALL(callback, Run(mojom::Result::FAILED, IsEmpty(), IsEmpty())) .Times(1); available_.Request("macos", callback.Get()); @@ -108,7 +108,7 @@ TEST_F(GetAvailableTest, ServerError400) { } TEST_F(GetAvailableTest, ServerError404) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -127,7 +127,7 @@ TEST_F(GetAvailableTest, ServerError404) { } TEST_F(GetAvailableTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -138,7 +138,7 @@ TEST_F(GetAvailableTest, ServerError500) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, IsEmpty(), IsEmpty())) + EXPECT_CALL(callback, Run(mojom::Result::FAILED, IsEmpty(), IsEmpty())) .Times(1); available_.Request("macos", callback.Get()); @@ -146,7 +146,7 @@ TEST_F(GetAvailableTest, ServerError500) { } TEST_F(GetAvailableTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -157,7 +157,7 @@ TEST_F(GetAvailableTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, IsEmpty(), IsEmpty())) + EXPECT_CALL(callback, Run(mojom::Result::FAILED, IsEmpty(), IsEmpty())) .Times(1); available_.Request("macos", callback.Get()); @@ -165,7 +165,7 @@ TEST_F(GetAvailableTest, ServerErrorRandom) { } TEST_F(GetAvailableTest, ServerWrongResponse) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); diff --git a/components/brave_rewards/core/endpoint/promotion/get_captcha/get_captcha.cc b/components/brave_rewards/core/endpoint/promotion/get_captcha/get_captcha.cc index 6f565020568..367dda98816 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_captcha/get_captcha.cc +++ b/components/brave_rewards/core/endpoint/promotion/get_captcha/get_captcha.cc @@ -9,7 +9,7 @@ #include "base/base64.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" using std::placeholders::_1; @@ -18,7 +18,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace promotion { -GetCaptcha::GetCaptcha(LedgerImpl& ledger) : ledger_(ledger) {} +GetCaptcha::GetCaptcha(RewardsEngineImpl& engine) : engine_(engine) {} GetCaptcha::~GetCaptcha() = default; @@ -32,7 +32,7 @@ std::string GetCaptcha::GetUrl(const std::string& captcha_id) { mojom::Result GetCaptcha::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid captcha id"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_NOT_FOUND) { @@ -42,15 +42,15 @@ mojom::Result GetCaptcha::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_INTERNAL_SERVER_ERROR) { BLOG(0, "Failed to generate the captcha image"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result GetCaptcha::ParseBody(const std::string& body, @@ -62,7 +62,7 @@ mojom::Result GetCaptcha::ParseBody(const std::string& body, *image = base::StringPrintf("data:image/jpeg;base64,%s", encoded_image.c_str()); - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void GetCaptcha::Request(const std::string& captcha_id, @@ -72,7 +72,7 @@ void GetCaptcha::Request(const std::string& captcha_id, auto request = mojom::UrlRequest::New(); request->url = GetUrl(captcha_id); - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void GetCaptcha::OnRequest(GetCaptchaCallback callback, @@ -83,7 +83,7 @@ void GetCaptcha::OnRequest(GetCaptchaCallback callback, std::string image; mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, image); return; } diff --git a/components/brave_rewards/core/endpoint/promotion/get_captcha/get_captcha.h b/components/brave_rewards/core/endpoint/promotion/get_captcha/get_captcha.h index f38e1c05128..e900b4a187b 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_captcha/get_captcha.h +++ b/components/brave_rewards/core/endpoint/promotion/get_captcha/get_captcha.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // GET /v1/captchas/{captcha_id}.png // @@ -25,7 +25,7 @@ // {PNG data} namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -35,7 +35,7 @@ using GetCaptchaCallback = class GetCaptcha { public: - explicit GetCaptcha(LedgerImpl& ledger); + explicit GetCaptcha(RewardsEngineImpl& engine); ~GetCaptcha(); void Request(const std::string& captcha_id, GetCaptchaCallback callback); @@ -49,7 +49,7 @@ class GetCaptcha { void OnRequest(GetCaptchaCallback callback, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/get_captcha/get_captcha_unittest.cc b/components/brave_rewards/core/endpoint/promotion/get_captcha/get_captcha_unittest.cc index 8fef2fdd7ce..52003b6e552 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_captcha/get_captcha_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/get_captcha/get_captcha_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace promotion { class GetCaptchaTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - GetCaptcha captcha_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + GetCaptcha captcha_{mock_engine_impl_}; }; TEST_F(GetCaptchaTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -44,7 +44,7 @@ TEST_F(GetCaptchaTest, ServerOK) { base::MockCallback callback; EXPECT_CALL(callback, - Run(mojom::Result::LEDGER_OK, + Run(mojom::Result::OK, "data:image/jpeg;base64,YVdwaGFYTnFaR1p2YVdGemFtWnZjMkZwYW" "1admMybGhaR3BtYjJsa2MycG1idz09")) .Times(1); @@ -54,7 +54,7 @@ TEST_F(GetCaptchaTest, ServerOK) { } TEST_F(GetCaptchaTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -65,14 +65,14 @@ TEST_F(GetCaptchaTest, ServerError400) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, _)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, _)).Times(1); captcha_.Request("d155d2d2-2627-425b-9be8-44ae9f541762", callback.Get()); task_environment_.RunUntilIdle(); } TEST_F(GetCaptchaTest, ServerError404) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -90,7 +90,7 @@ TEST_F(GetCaptchaTest, ServerError404) { } TEST_F(GetCaptchaTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -101,14 +101,14 @@ TEST_F(GetCaptchaTest, ServerError500) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, "")).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, "")).Times(1); captcha_.Request("d155d2d2-2627-425b-9be8-44ae9f541762", callback.Get()); task_environment_.RunUntilIdle(); } TEST_F(GetCaptchaTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -119,7 +119,7 @@ TEST_F(GetCaptchaTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, "")).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, "")).Times(1); captcha_.Request("d155d2d2-2627-425b-9be8-44ae9f541762", callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds.cc b/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds.cc index d7ea1940500..f48e7cc1d4b 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds.cc +++ b/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds.cc @@ -10,14 +10,14 @@ #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace promotion { -GetSignedCreds::GetSignedCreds(LedgerImpl& ledger) : ledger_(ledger) {} +GetSignedCreds::GetSignedCreds(RewardsEngineImpl& engine) : engine_(engine) {} GetSignedCreds::~GetSignedCreds() = default; @@ -36,7 +36,7 @@ mojom::Result GetSignedCreds::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid request"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_NOT_FOUND) { @@ -46,15 +46,15 @@ mojom::Result GetSignedCreds::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_INTERNAL_SERVER_ERROR) { BLOG(0, "Internal server error"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result GetSignedCreds::ParseBody(const std::string& body, @@ -64,33 +64,33 @@ mojom::Result GetSignedCreds::ParseBody(const std::string& body, absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* batch_proof = dict.FindString("batchProof"); if (!batch_proof) { BLOG(0, "Missing batch proof"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } auto* signed_creds = dict.FindList("signedCreds"); if (!signed_creds) { BLOG(0, "Missing signed creds"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } auto* public_key = dict.FindString("publicKey"); if (!public_key) { BLOG(0, "Missing public key"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } base::JSONWriter::Write(*signed_creds, &batch->signed_creds); batch->public_key = *public_key; batch->batch_proof = *batch_proof; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void GetSignedCreds::Request(const std::string& promotion_id, @@ -101,7 +101,7 @@ void GetSignedCreds::Request(const std::string& promotion_id, auto request = mojom::UrlRequest::New(); request->url = GetUrl(promotion_id, claim_id); - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void GetSignedCreds::OnRequest(GetSignedCredsCallback callback, @@ -111,7 +111,7 @@ void GetSignedCreds::OnRequest(GetSignedCredsCallback callback, mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, nullptr); return; } diff --git a/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds.h b/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds.h index cefaa3639ea..03ecf37a006 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds.h +++ b/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // GET /v1/promotions/{promotion_id}/claims/{claim_id} // @@ -44,7 +44,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -54,7 +54,7 @@ using GetSignedCredsCallback = class GetSignedCreds { public: - explicit GetSignedCreds(LedgerImpl& ledger); + explicit GetSignedCreds(RewardsEngineImpl& engine); ~GetSignedCreds(); void Request(const std::string& promotion_id, @@ -72,7 +72,7 @@ class GetSignedCreds { void OnRequest(GetSignedCredsCallback callback, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds_unittest.cc b/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds_unittest.cc index ab6ae45847a..ffcfe13ea7c 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/get_signed_creds/get_signed_creds_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -28,12 +28,12 @@ namespace promotion { class GetSignedCredsTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - GetSignedCreds creds_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + GetSignedCreds creds_{mock_engine_impl_}; }; TEST_F(GetSignedCredsTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -65,7 +65,7 @@ TEST_F(GetSignedCredsTest, ServerOK) { expected_batch.signed_creds = R"(["ijSZoLLG+EnRN916RUQcjiV6c4Wb6ItbnxXBFhz81EQ=","dj6glCJ2roHYcTFcXF21IrKx1uT/ptM7SJEdiEE1fG8=","nCF9a4KuASICVC0zrx2wGnllgIUxBMnylpu5SA+oBjI="])"; // NOLINT - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); EXPECT_TRUE(expected_batch.Equals(*batch)); }); creds_.Request("ff50981d-47de-4210-848d-995e186901a1", "848d-995e186901a1", @@ -75,7 +75,7 @@ TEST_F(GetSignedCredsTest, ServerOK) { } TEST_F(GetSignedCredsTest, ServerError202) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -94,7 +94,7 @@ TEST_F(GetSignedCredsTest, ServerError202) { } TEST_F(GetSignedCredsTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -105,7 +105,7 @@ TEST_F(GetSignedCredsTest, ServerError400) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, IsFalse())).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, IsFalse())).Times(1); creds_.Request("ff50981d-47de-4210-848d-995e186901a1", "848d-995e186901a1", callback.Get()); @@ -113,7 +113,7 @@ TEST_F(GetSignedCredsTest, ServerError400) { } TEST_F(GetSignedCredsTest, ServerError404) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -132,7 +132,7 @@ TEST_F(GetSignedCredsTest, ServerError404) { } TEST_F(GetSignedCredsTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -143,7 +143,7 @@ TEST_F(GetSignedCredsTest, ServerError500) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, IsFalse())).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, IsFalse())).Times(1); creds_.Request("ff50981d-47de-4210-848d-995e186901a1", "848d-995e186901a1", callback.Get()); @@ -151,7 +151,7 @@ TEST_F(GetSignedCredsTest, ServerError500) { } TEST_F(GetSignedCredsTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -162,7 +162,7 @@ TEST_F(GetSignedCredsTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, IsFalse())).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, IsFalse())).Times(1); creds_.Request("ff50981d-47de-4210-848d-995e186901a1", "848d-995e186901a1", callback.Get()); diff --git a/components/brave_rewards/core/endpoint/promotion/get_wallet/get_wallet.cc b/components/brave_rewards/core/endpoint/promotion/get_wallet/get_wallet.cc index 24c9bd8a2db..95e573fd15c 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_wallet/get_wallet.cc +++ b/components/brave_rewards/core/endpoint/promotion/get_wallet/get_wallet.cc @@ -9,7 +9,7 @@ #include "base/json/json_reader.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -19,19 +19,19 @@ namespace brave_rewards::internal { namespace endpoint { namespace promotion { -GetWallet::GetWallet(LedgerImpl& ledger) : ledger_{ledger} {} +GetWallet::GetWallet(RewardsEngineImpl& engine) : engine_{engine} {} GetWallet::~GetWallet() = default; void GetWallet::Request(GetWalletCallback callback) const { auto request = mojom::UrlRequest::New(); request->url = GetUrl(); - ledger_->LoadURL(std::move(request), + engine_->LoadURL(std::move(request), std::bind(&GetWallet::OnRequest, this, _1, callback)); } std::string GetWallet::GetUrl() const { - const auto rewards_wallet = ledger_->wallet()->GetWallet(); + const auto rewards_wallet = engine_->wallet()->GetWallet(); if (!rewards_wallet) { BLOG(0, "Rewards wallet is null!"); return ""; @@ -46,7 +46,7 @@ void GetWallet::OnRequest(mojom::UrlResponsePtr response, LogUrlResponse(__func__, *response); mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { return callback(result, std::string{}, false); } @@ -59,20 +59,20 @@ void GetWallet::OnRequest(mojom::UrlResponsePtr response, mojom::Result GetWallet::CheckStatusCode(int status_code) const { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid payment id"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_NOT_FOUND) { BLOG(0, "Unrecognized payment id"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result GetWallet::ParseBody(const std::string& body, @@ -86,7 +86,7 @@ mojom::Result GetWallet::ParseBody(const std::string& body, absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); @@ -98,14 +98,14 @@ mojom::Result GetWallet::ParseBody(const std::string& body, deposit_account_provider->FindString("linkingId"); if (!name || !id || !linking_id) { - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } *custodian = *name; *linked = !id->empty() && !linking_id->empty(); } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/get_wallet/get_wallet.h b/components/brave_rewards/core/endpoint/promotion/get_wallet/get_wallet.h index dbe4e3d5304..aefacba3b17 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_wallet/get_wallet.h +++ b/components/brave_rewards/core/endpoint/promotion/get_wallet/get_wallet.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // GET /v3/wallet/{payment_id} // @@ -38,7 +38,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -48,7 +48,7 @@ using GetWalletCallback = std::function< class GetWallet { public: - explicit GetWallet(LedgerImpl& ledger); + explicit GetWallet(RewardsEngineImpl& engine); ~GetWallet(); void Request(GetWalletCallback callback) const; @@ -65,7 +65,7 @@ class GetWallet { std::string* custodian, bool* linked) const; - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/get_wallet/get_wallet_unittest.cc b/components/brave_rewards/core/endpoint/promotion/get_wallet/get_wallet_unittest.cc index 04c33251da1..e25ebd01de8 100644 --- a/components/brave_rewards/core/endpoint/promotion/get_wallet/get_wallet_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/get_wallet/get_wallet_unittest.cc @@ -11,8 +11,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -45,8 +45,8 @@ using GetWalletParamType = std::tuple< struct GetWalletTest : TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - GetWallet get_wallet_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + GetWallet get_wallet_{mock_engine_impl_}; }; INSTANTIATE_TEST_SUITE_P( @@ -62,7 +62,7 @@ INSTANTIATE_TEST_SUITE_P( {}, {} }, - mojom::Result::LEDGER_ERROR, + mojom::Result::FAILED, "", false }, @@ -75,7 +75,7 @@ INSTANTIATE_TEST_SUITE_P( {}, {} }, - mojom::Result::LEDGER_ERROR, + mojom::Result::FAILED, "", false }, @@ -98,7 +98,7 @@ INSTANTIATE_TEST_SUITE_P( )", {} }, - mojom::Result::LEDGER_OK, + mojom::Result::OK, "", false }, @@ -126,7 +126,7 @@ INSTANTIATE_TEST_SUITE_P( )", {} }, - mojom::Result::LEDGER_OK, + mojom::Result::OK, constant::kWalletUphold, false }, @@ -154,7 +154,7 @@ INSTANTIATE_TEST_SUITE_P( )", {} }, - mojom::Result::LEDGER_OK, + mojom::Result::OK, constant::kWalletUphold, true }), @@ -169,7 +169,7 @@ TEST_P(GetWalletTest, Paths) { const auto& expected_custodian = std::get<3>(params); const auto expected_linked = std::get<4>(params); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([&](mojom::UrlRequestPtr, auto callback) { std::move(callback).Run( diff --git a/components/brave_rewards/core/endpoint/promotion/post_bat_loss/post_bat_loss.cc b/components/brave_rewards/core/endpoint/promotion/post_bat_loss/post_bat_loss.cc index f3247e63b3c..86c916e4b50 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_bat_loss/post_bat_loss.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_bat_loss/post_bat_loss.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/common/request_util.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -19,12 +19,12 @@ namespace brave_rewards::internal { namespace endpoint { namespace promotion { -PostBatLoss::PostBatLoss(LedgerImpl& ledger) : ledger_(ledger) {} +PostBatLoss::PostBatLoss(RewardsEngineImpl& engine) : engine_(engine) {} PostBatLoss::~PostBatLoss() = default; std::string PostBatLoss::GetUrl(const int32_t version) { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Wallet is null"); return ""; @@ -43,23 +43,23 @@ std::string PostBatLoss::GeneratePayload(const double amount) { mojom::Result PostBatLoss::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_INTERNAL_SERVER_ERROR) { BLOG(0, "Internal server error"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostBatLoss::Request(const double amount, const int32_t version, PostBatLossCallback callback) { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -80,7 +80,7 @@ void PostBatLoss::Request(const double amount, request->headers = headers; request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), url_callback); + engine_->LoadURL(std::move(request), url_callback); } void PostBatLoss::OnRequest(mojom::UrlResponsePtr response, diff --git a/components/brave_rewards/core/endpoint/promotion/post_bat_loss/post_bat_loss.h b/components/brave_rewards/core/endpoint/promotion/post_bat_loss/post_bat_loss.h index 1d62c184154..65bdfdb0d19 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_bat_loss/post_bat_loss.h +++ b/components/brave_rewards/core/endpoint/promotion/post_bat_loss/post_bat_loss.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST /v1/wallets/{payment_id}/events/batloss/{version} // @@ -28,7 +28,7 @@ // {Empty} namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -37,7 +37,7 @@ using PostBatLossCallback = std::function; class PostBatLoss { public: - explicit PostBatLoss(LedgerImpl& ledger); + explicit PostBatLoss(RewardsEngineImpl& engine); ~PostBatLoss(); void Request(const double amount, @@ -53,7 +53,7 @@ class PostBatLoss { void OnRequest(mojom::UrlResponsePtr response, PostBatLossCallback callback); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/post_bat_loss/post_bat_loss_unittest.cc b/components/brave_rewards/core/endpoint/promotion/post_bat_loss/post_bat_loss_unittest.cc index 430141b4d15..48f3a3c494f 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_bat_loss/post_bat_loss_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_bat_loss/post_bat_loss_unittest.cc @@ -9,9 +9,9 @@ #include #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -28,7 +28,7 @@ namespace promotion { class PostBatLossTest : public testing::Test { protected: void SetUp() override { - ON_CALL(*mock_ledger_impl_.mock_client(), + ON_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletBrave, _)) .WillByDefault([](const std::string&, auto callback) { std::string wallet = R"({ @@ -40,12 +40,12 @@ class PostBatLossTest : public testing::Test { } base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostBatLoss loss_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostBatLoss loss_{mock_engine_impl_}; }; TEST_F(PostBatLossTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -56,14 +56,14 @@ TEST_F(PostBatLossTest, ServerOK) { }); MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_OK)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::OK)).Times(1); loss_.Request(30.0, 1, callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostBatLossTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -74,14 +74,14 @@ TEST_F(PostBatLossTest, ServerError500) { }); MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); loss_.Request(30.0, 1, callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostBatLossTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -92,7 +92,7 @@ TEST_F(PostBatLossTest, ServerErrorRandom) { }); MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); loss_.Request(30.0, 1, callback.AsStdFunction()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha.cc b/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha.cc index 77b316052a6..de6690cf64a 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha.cc @@ -10,7 +10,7 @@ #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -18,7 +18,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace promotion { -PostCaptcha::PostCaptcha(LedgerImpl& ledger) : ledger_(ledger) {} +PostCaptcha::PostCaptcha(RewardsEngineImpl& engine) : engine_(engine) {} PostCaptcha::~PostCaptcha() = default; @@ -27,7 +27,7 @@ std::string PostCaptcha::GetUrl() { } std::string PostCaptcha::GeneratePayload() { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Wallet is null"); return ""; @@ -45,15 +45,15 @@ std::string PostCaptcha::GeneratePayload() { mojom::Result PostCaptcha::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid request"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result PostCaptcha::ParseBody(const std::string& body, @@ -64,26 +64,26 @@ mojom::Result PostCaptcha::ParseBody(const std::string& body, absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* captcha_id_parse = dict.FindString("captchaId"); if (!captcha_id_parse) { BLOG(0, "Captcha id is wrong"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const auto* hint_parse = dict.FindString("hint"); if (!hint_parse) { BLOG(0, "Hint is wrong"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } *captcha_id = *captcha_id_parse; *hint = *hint_parse; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostCaptcha::Request(PostCaptchaCallback callback) { @@ -95,7 +95,7 @@ void PostCaptcha::Request(PostCaptchaCallback callback) { request->content = GeneratePayload(); request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void PostCaptcha::OnRequest(PostCaptchaCallback callback, @@ -107,7 +107,7 @@ void PostCaptcha::OnRequest(PostCaptchaCallback callback, std::string captcha_id; mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, hint, captcha_id); return; } diff --git a/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha.h b/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha.h index 24e183a201a..b1680358602 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha.h +++ b/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST /v1/captchas // @@ -31,7 +31,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -43,7 +43,7 @@ using PostCaptchaCallback = class PostCaptcha { public: - explicit PostCaptcha(LedgerImpl& ledger); + explicit PostCaptcha(RewardsEngineImpl& engine); ~PostCaptcha(); void Request(PostCaptchaCallback callback); @@ -61,7 +61,7 @@ class PostCaptcha { void OnRequest(PostCaptchaCallback callback, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha_unittest.cc b/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha_unittest.cc index 97042a3a3d9..4f3ab65f152 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_captcha/post_captcha_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace promotion { class PostCaptchaTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostCaptcha captcha_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostCaptcha captcha_{mock_engine_impl_}; }; TEST_F(PostCaptchaTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -46,7 +46,7 @@ TEST_F(PostCaptchaTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK, "circle", + EXPECT_CALL(callback, Run(mojom::Result::OK, "circle", "d155d2d2-2627-425b-9be8-44ae9f541762")) .Times(1); captcha_.Request(callback.Get()); @@ -55,7 +55,7 @@ TEST_F(PostCaptchaTest, ServerOK) { } TEST_F(PostCaptchaTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -66,14 +66,14 @@ TEST_F(PostCaptchaTest, ServerError400) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, _, _)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, _, _)).Times(1); captcha_.Request(callback.Get()); task_environment_.RunUntilIdle(); } TEST_F(PostCaptchaTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -84,7 +84,7 @@ TEST_F(PostCaptchaTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, _, _)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, _, _)).Times(1); captcha_.Request(callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/promotion/post_clobbered_claims/post_clobbered_claims.cc b/components/brave_rewards/core/endpoint/promotion/post_clobbered_claims/post_clobbered_claims.cc index a2ffde5f542..1749922d1fc 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_clobbered_claims/post_clobbered_claims.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_clobbered_claims/post_clobbered_claims.cc @@ -8,7 +8,7 @@ #include "base/json/json_writer.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" using std::placeholders::_1; @@ -17,8 +17,8 @@ namespace brave_rewards::internal { namespace endpoint { namespace promotion { -PostClobberedClaims::PostClobberedClaims(LedgerImpl& ledger) - : ledger_(ledger) {} +PostClobberedClaims::PostClobberedClaims(RewardsEngineImpl& engine) + : engine_(engine) {} PostClobberedClaims::~PostClobberedClaims() = default; @@ -40,20 +40,20 @@ std::string PostClobberedClaims::GeneratePayload( mojom::Result PostClobberedClaims::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid request"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_INTERNAL_SERVER_ERROR) { BLOG(0, "Internal server error"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostClobberedClaims::Request(base::Value::List corrupted_claims, @@ -66,7 +66,7 @@ void PostClobberedClaims::Request(base::Value::List corrupted_claims, request->content = GeneratePayload(std::move(corrupted_claims)); request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), url_callback); + engine_->LoadURL(std::move(request), url_callback); } void PostClobberedClaims::OnRequest(mojom::UrlResponsePtr response, diff --git a/components/brave_rewards/core/endpoint/promotion/post_clobbered_claims/post_clobbered_claims.h b/components/brave_rewards/core/endpoint/promotion/post_clobbered_claims/post_clobbered_claims.h index 37282bc9ca1..c7a3df69ca9 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_clobbered_claims/post_clobbered_claims.h +++ b/components/brave_rewards/core/endpoint/promotion/post_clobbered_claims/post_clobbered_claims.h @@ -10,7 +10,7 @@ #include "base/memory/raw_ref.h" #include "base/values.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST /v1/promotions/reportclobberedclaims // @@ -30,7 +30,7 @@ // {Empty} namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -40,7 +40,7 @@ using PostClobberedClaimsCallback = class PostClobberedClaims { public: - explicit PostClobberedClaims(LedgerImpl& ledger); + explicit PostClobberedClaims(RewardsEngineImpl& engine); ~PostClobberedClaims(); void Request(base::Value::List corrupted_claims, @@ -56,7 +56,7 @@ class PostClobberedClaims { void OnRequest(mojom::UrlResponsePtr response, PostClobberedClaimsCallback callback); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/post_clobbered_claims/post_clobbered_claims_unittest.cc b/components/brave_rewards/core/endpoint/promotion/post_clobbered_claims/post_clobbered_claims_unittest.cc index 6a2a83e916d..4921dcfae00 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_clobbered_claims/post_clobbered_claims_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_clobbered_claims/post_clobbered_claims_unittest.cc @@ -9,9 +9,9 @@ #include #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace promotion { class PostClobberedClaimsTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostClobberedClaims claims_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostClobberedClaims claims_{mock_engine_impl_}; }; TEST_F(PostClobberedClaimsTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -46,14 +46,14 @@ TEST_F(PostClobberedClaimsTest, ServerOK) { corrupted_claims.Append(base::Value("asfeq4gerg34gl3g34lg34g")); MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_OK)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::OK)).Times(1); claims_.Request(std::move(corrupted_claims), callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostClobberedClaimsTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -67,14 +67,14 @@ TEST_F(PostClobberedClaimsTest, ServerError400) { corrupted_claims.Append(base::Value("asfeq4gerg34gl3g34lg34g")); MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); claims_.Request(std::move(corrupted_claims), callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostClobberedClaimsTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -88,14 +88,14 @@ TEST_F(PostClobberedClaimsTest, ServerError500) { corrupted_claims.Append(base::Value("asfeq4gerg34gl3g34lg34g")); MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); claims_.Request(std::move(corrupted_claims), callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostClobberedClaimsTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -109,7 +109,7 @@ TEST_F(PostClobberedClaimsTest, ServerErrorRandom) { corrupted_claims.Append(base::Value("asfeq4gerg34gl3g34lg34g")); MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); claims_.Request(std::move(corrupted_claims), callback.AsStdFunction()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.cc b/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.cc index be6068e70b9..1603edc9d44 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.cc @@ -11,7 +11,7 @@ #include "brave/components/brave_rewards/core/common/request_util.h" #include "brave/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -19,7 +19,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace promotion { -PostCreds::PostCreds(LedgerImpl& ledger) : ledger_(ledger) {} +PostCreds::PostCreds(RewardsEngineImpl& engine) : engine_(engine) {} PostCreds::~PostCreds() = default; @@ -31,7 +31,7 @@ std::string PostCreds::GetUrl(const std::string& promotion_id) { } std::string PostCreds::GeneratePayload(base::Value::List&& blinded_creds) { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Wallet is null"); return ""; @@ -50,17 +50,17 @@ std::string PostCreds::GeneratePayload(base::Value::List&& blinded_creds) { mojom::Result PostCreds::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid request"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_FORBIDDEN) { BLOG(0, "Signature validation failed"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_CONFLICT) { BLOG(0, "Incorrect blinded credentials"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_GONE) { @@ -70,15 +70,15 @@ mojom::Result PostCreds::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_INTERNAL_SERVER_ERROR) { BLOG(0, "Internal server error"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result PostCreds::ParseBody(const std::string& body, @@ -88,28 +88,28 @@ mojom::Result PostCreds::ParseBody(const std::string& body, absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* id = dict.FindString("claimId"); if (!id || id->empty()) { BLOG(0, "Claim id is missing"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } *claim_id = *id; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostCreds::Request(const std::string& promotion_id, base::Value::List&& blinded_creds, PostCredsCallback callback) { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Wallet is null"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + std::move(callback).Run(mojom::Result::FAILED, ""); return; } @@ -128,7 +128,7 @@ void PostCreds::Request(const std::string& promotion_id, request->headers = headers; request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void PostCreds::OnRequest(PostCredsCallback callback, @@ -139,7 +139,7 @@ void PostCreds::OnRequest(PostCredsCallback callback, std::string claim_id; mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, claim_id); return; } diff --git a/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.h b/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.h index c320a36aec4..1fc4cd1a5e8 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.h +++ b/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds.h @@ -11,7 +11,7 @@ #include "base/memory/raw_ref.h" #include "base/values.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST /v1/promotions/{promotion_id} // @@ -40,7 +40,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -50,7 +50,7 @@ using PostCredsCallback = class PostCreds { public: - explicit PostCreds(LedgerImpl& ledger); + explicit PostCreds(RewardsEngineImpl& engine); ~PostCreds(); void Request(const std::string& promotion_id, @@ -68,7 +68,7 @@ class PostCreds { void OnRequest(PostCredsCallback callback, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds_unittest.cc b/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds_unittest.cc index 121b69b67d0..d40b336a7be 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_creds/post_creds_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -28,7 +28,7 @@ namespace promotion { class PostCredsTest : public testing::Test { protected: void SetUp() override { - ON_CALL(*mock_ledger_impl_.mock_client(), + ON_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletBrave, _)) .WillByDefault([](const std::string&, auto callback) { std::string wallet = R"({ @@ -40,12 +40,12 @@ class PostCredsTest : public testing::Test { } base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostCreds creds_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostCreds creds_{mock_engine_impl_}; }; TEST_F(PostCredsTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -61,8 +61,8 @@ TEST_F(PostCredsTest, ServerOK) { creds.Append(base::Value("asfeq4gerg34gl3g34lg34g")); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK, - "53714048-9675-419e-baa3-369d85a2facb")) + EXPECT_CALL(callback, + Run(mojom::Result::OK, "53714048-9675-419e-baa3-369d85a2facb")) .Times(1); creds_.Request("ff50981d-47de-4210-848d-995e186901a1", std::move(creds), callback.Get()); @@ -71,7 +71,7 @@ TEST_F(PostCredsTest, ServerOK) { } TEST_F(PostCredsTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -85,7 +85,7 @@ TEST_F(PostCredsTest, ServerError400) { creds.Append(base::Value("asfeq4gerg34gl3g34lg34g")); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, _)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, _)).Times(1); creds_.Request("ff50981d-47de-4210-848d-995e186901a1", std::move(creds), callback.Get()); @@ -93,7 +93,7 @@ TEST_F(PostCredsTest, ServerError400) { } TEST_F(PostCredsTest, ServerError403) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -107,7 +107,7 @@ TEST_F(PostCredsTest, ServerError403) { creds.Append(base::Value("asfeq4gerg34gl3g34lg34g")); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, _)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, _)).Times(1); creds_.Request("ff50981d-47de-4210-848d-995e186901a1", std::move(creds), callback.Get()); @@ -115,7 +115,7 @@ TEST_F(PostCredsTest, ServerError403) { } TEST_F(PostCredsTest, ServerError409) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -129,7 +129,7 @@ TEST_F(PostCredsTest, ServerError409) { creds.Append(base::Value("asfeq4gerg34gl3g34lg34g")); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, _)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, _)).Times(1); creds_.Request("ff50981d-47de-4210-848d-995e186901a1", std::move(creds), callback.Get()); @@ -137,7 +137,7 @@ TEST_F(PostCredsTest, ServerError409) { } TEST_F(PostCredsTest, ServerError410) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -159,7 +159,7 @@ TEST_F(PostCredsTest, ServerError410) { } TEST_F(PostCredsTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -173,7 +173,7 @@ TEST_F(PostCredsTest, ServerError500) { creds.Append(base::Value("asfeq4gerg34gl3g34lg34g")); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, _)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, _)).Times(1); creds_.Request("ff50981d-47de-4210-848d-995e186901a1", std::move(creds), callback.Get()); @@ -181,7 +181,7 @@ TEST_F(PostCredsTest, ServerError500) { } TEST_F(PostCredsTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -195,7 +195,7 @@ TEST_F(PostCredsTest, ServerErrorRandom) { creds.Append(base::Value("asfeq4gerg34gl3g34lg34g")); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, _)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, _)).Times(1); creds_.Request("ff50981d-47de-4210-848d-995e186901a1", std::move(creds), callback.Get()); diff --git a/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck.cc b/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck.cc index 3996c400751..820dd47b10a 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck.cc @@ -10,7 +10,7 @@ #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -20,7 +20,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace promotion { -PostDevicecheck::PostDevicecheck(LedgerImpl& ledger) : ledger_(ledger) {} +PostDevicecheck::PostDevicecheck(RewardsEngineImpl& engine) : engine_(engine) {} PostDevicecheck::~PostDevicecheck() = default; @@ -29,7 +29,7 @@ std::string PostDevicecheck::GetUrl() { } std::string PostDevicecheck::GeneratePayload(const std::string& key) { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Wallet is null"); return ""; @@ -47,20 +47,20 @@ std::string PostDevicecheck::GeneratePayload(const std::string& key) { mojom::Result PostDevicecheck::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid request"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_UNAUTHORIZED) { BLOG(0, "Invalid token"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result PostDevicecheck::ParseBody(const std::string& body, @@ -70,18 +70,18 @@ mojom::Result PostDevicecheck::ParseBody(const std::string& body, absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* nonce_string = dict.FindString("nonce"); if (!nonce_string) { BLOG(0, "Nonce is wrong"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } *nonce = *nonce_string; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostDevicecheck::Request(const std::string& key, @@ -94,7 +94,7 @@ void PostDevicecheck::Request(const std::string& key, request->content = GeneratePayload(key); request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void PostDevicecheck::OnRequest(PostDevicecheckCallback callback, @@ -105,7 +105,7 @@ void PostDevicecheck::OnRequest(PostDevicecheckCallback callback, std::string nonce; mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, nonce); return; } diff --git a/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck.h b/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck.h index a2f4aad43d9..5646dea81ed 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck.h +++ b/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST /v1/devicecheck/attestations // @@ -32,7 +32,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -42,7 +42,7 @@ using PostDevicecheckCallback = class PostDevicecheck { public: - explicit PostDevicecheck(LedgerImpl& ledger); + explicit PostDevicecheck(RewardsEngineImpl& engine); ~PostDevicecheck(); void Request(const std::string& key, PostDevicecheckCallback callback); @@ -59,7 +59,7 @@ class PostDevicecheck { void OnRequest(PostDevicecheckCallback callback, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck_unittest.cc b/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck_unittest.cc index 9810b3104b2..6c3524e0203 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_devicecheck/post_devicecheck_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace promotion { class PostDevicecheckTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostDevicecheck devicecheck_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostDevicecheck devicecheck_{mock_engine_impl_}; }; TEST_F(PostDevicecheckTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -45,8 +45,8 @@ TEST_F(PostDevicecheckTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK, - "c4645786-052f-402f-8593-56af2f7a21ce")) + EXPECT_CALL(callback, + Run(mojom::Result::OK, "c4645786-052f-402f-8593-56af2f7a21ce")) .Times(1); devicecheck_.Request("ff50981d-47de-4210-848d-995e186901a1", callback.Get()); @@ -54,7 +54,7 @@ TEST_F(PostDevicecheckTest, ServerOK) { } TEST_F(PostDevicecheckTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -65,14 +65,14 @@ TEST_F(PostDevicecheckTest, ServerError400) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, "")).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, "")).Times(1); devicecheck_.Request("ff50981d-47de-4210-848d-995e186901a1", callback.Get()); task_environment_.RunUntilIdle(); } TEST_F(PostDevicecheckTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -83,14 +83,14 @@ TEST_F(PostDevicecheckTest, ServerError401) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, "")).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, "")).Times(1); devicecheck_.Request("ff50981d-47de-4210-848d-995e186901a1", callback.Get()); task_environment_.RunUntilIdle(); } TEST_F(PostDevicecheckTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -101,7 +101,7 @@ TEST_F(PostDevicecheckTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, "")).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, "")).Times(1); devicecheck_.Request("ff50981d-47de-4210-848d-995e186901a1", callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet.cc b/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet.cc index 27ed25b40d0..55b8ceed710 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet.cc @@ -10,7 +10,7 @@ #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -18,7 +18,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace promotion { -PostSafetynet::PostSafetynet(LedgerImpl& ledger) : ledger_(ledger) {} +PostSafetynet::PostSafetynet(RewardsEngineImpl& engine) : engine_(engine) {} PostSafetynet::~PostSafetynet() = default; @@ -27,7 +27,7 @@ std::string PostSafetynet::GetUrl() { } std::string PostSafetynet::GeneratePayload() { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Wallet is null"); return ""; @@ -48,20 +48,20 @@ std::string PostSafetynet::GeneratePayload() { mojom::Result PostSafetynet::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid request"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_UNAUTHORIZED) { BLOG(0, "Invalid token"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result PostSafetynet::ParseBody(const std::string& body, @@ -71,18 +71,18 @@ mojom::Result PostSafetynet::ParseBody(const std::string& body, absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* nonce_string = dict.FindString("nonce"); if (!nonce_string) { BLOG(0, "Nonce is wrong"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } *nonce = *nonce_string; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostSafetynet::Request(PostSafetynetCallback callback) { @@ -94,7 +94,7 @@ void PostSafetynet::Request(PostSafetynetCallback callback) { request->content = GeneratePayload(); request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void PostSafetynet::OnRequest(PostSafetynetCallback callback, @@ -105,7 +105,7 @@ void PostSafetynet::OnRequest(PostSafetynetCallback callback, std::string nonce; mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, nonce); return; } diff --git a/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet.h b/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet.h index 8b13ec3d64c..dde0ac4fcc1 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet.h +++ b/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST /v2/attestations/safetynet // @@ -33,7 +33,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -43,7 +43,7 @@ using PostSafetynetCallback = class PostSafetynet { public: - explicit PostSafetynet(LedgerImpl& ledger); + explicit PostSafetynet(RewardsEngineImpl& engine); ~PostSafetynet(); void Request(PostSafetynetCallback callback); @@ -60,7 +60,7 @@ class PostSafetynet { void OnRequest(PostSafetynetCallback callback, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet_unittest.cc b/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet_unittest.cc index e390442a999..8c4e4002ec3 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_safetynet/post_safetynet_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace promotion { class PostSafetynetTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostSafetynet safetynet_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostSafetynet safetynet_{mock_engine_impl_}; }; TEST_F(PostSafetynetTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -45,8 +45,8 @@ TEST_F(PostSafetynetTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK, - "c4645786-052f-402f-8593-56af2f7a21ce")) + EXPECT_CALL(callback, + Run(mojom::Result::OK, "c4645786-052f-402f-8593-56af2f7a21ce")) .Times(1); safetynet_.Request(callback.Get()); @@ -54,7 +54,7 @@ TEST_F(PostSafetynetTest, ServerOK) { } TEST_F(PostSafetynetTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -65,14 +65,14 @@ TEST_F(PostSafetynetTest, ServerError400) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, "")).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, "")).Times(1); safetynet_.Request(callback.Get()); task_environment_.RunUntilIdle(); } TEST_F(PostSafetynetTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -83,7 +83,7 @@ TEST_F(PostSafetynetTest, ServerError401) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, "")).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, "")).Times(1); safetynet_.Request(callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/promotion/post_suggestions/post_suggestions.cc b/components/brave_rewards/core/endpoint/promotion/post_suggestions/post_suggestions.cc index 364b4a8562c..810ae58a727 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_suggestions/post_suggestions.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_suggestions/post_suggestions.cc @@ -11,7 +11,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/credentials/credentials_util.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" using std::placeholders::_1; @@ -20,7 +20,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace promotion { -PostSuggestions::PostSuggestions(LedgerImpl& ledger) : ledger_(ledger) {} +PostSuggestions::PostSuggestions(RewardsEngineImpl& engine) : engine_(engine) {} PostSuggestions::~PostSuggestions() = default; @@ -60,7 +60,7 @@ std::string PostSuggestions::GeneratePayload( mojom::Result PostSuggestions::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid request"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_SERVICE_UNAVAILABLE) { @@ -70,10 +70,10 @@ mojom::Result PostSuggestions::CheckStatusCode(const int status_code) { if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostSuggestions::Request(const credential::CredentialsRedeem& redeem, @@ -86,7 +86,7 @@ void PostSuggestions::Request(const credential::CredentialsRedeem& redeem, request->content = GeneratePayload(redeem); request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), url_callback); + engine_->LoadURL(std::move(request), url_callback); } void PostSuggestions::OnRequest(mojom::UrlResponsePtr response, diff --git a/components/brave_rewards/core/endpoint/promotion/post_suggestions/post_suggestions.h b/components/brave_rewards/core/endpoint/promotion/post_suggestions/post_suggestions.h index 29278093729..39a0b68440f 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_suggestions/post_suggestions.h +++ b/components/brave_rewards/core/endpoint/promotion/post_suggestions/post_suggestions.h @@ -10,7 +10,7 @@ #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/credentials/credentials_redeem.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST /v1/suggestions // @@ -37,7 +37,7 @@ // {Empty} namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -46,7 +46,7 @@ using PostSuggestionsCallback = std::function; class PostSuggestions { public: - explicit PostSuggestions(LedgerImpl& ledger); + explicit PostSuggestions(RewardsEngineImpl& engine); ~PostSuggestions(); void Request(const credential::CredentialsRedeem& redeem, @@ -62,7 +62,7 @@ class PostSuggestions { void OnRequest(mojom::UrlResponsePtr response, PostSuggestionsCallback callback); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/post_suggestions/post_suggestions_unittest.cc b/components/brave_rewards/core/endpoint/promotion/post_suggestions/post_suggestions_unittest.cc index 2856be0dc04..7b8917a1793 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_suggestions/post_suggestions_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_suggestions/post_suggestions_unittest.cc @@ -9,9 +9,9 @@ #include #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace promotion { class PostSuggestionsTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostSuggestions suggestions_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostSuggestions suggestions_{mock_engine_impl_}; }; TEST_F(PostSuggestionsTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -58,14 +58,14 @@ TEST_F(PostSuggestionsTest, ServerOK) { redeem.contribution_id = "83b3b77b-e7c3-455b-adda-e476fa0656d2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_OK)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::OK)).Times(1); suggestions_.Request(redeem, callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostSuggestionsTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -91,14 +91,14 @@ TEST_F(PostSuggestionsTest, ServerError400) { redeem.contribution_id = "83b3b77b-e7c3-455b-adda-e476fa0656d2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); suggestions_.Request(redeem, callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(PostSuggestionsTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -124,7 +124,7 @@ TEST_F(PostSuggestionsTest, ServerError500) { redeem.contribution_id = "83b3b77b-e7c3-455b-adda-e476fa0656d2"; MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED)).Times(1); suggestions_.Request(redeem, callback.AsStdFunction()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.cc b/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.cc index 69a84b1cbc1..3afc195bd98 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/common/security_util.h" #include "brave/components/brave_rewards/core/credentials/credentials_util.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -21,8 +21,8 @@ namespace brave_rewards::internal { namespace endpoint { namespace promotion { -PostSuggestionsClaim::PostSuggestionsClaim(LedgerImpl& ledger) - : ledger_(ledger) {} +PostSuggestionsClaim::PostSuggestionsClaim(RewardsEngineImpl& engine) + : engine_(engine) {} PostSuggestionsClaim::~PostSuggestionsClaim() = default; @@ -32,7 +32,7 @@ std::string PostSuggestionsClaim::GetUrl() { std::string PostSuggestionsClaim::GeneratePayload( const credential::CredentialsRedeem& redeem) { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Wallet is null"); return ""; @@ -53,7 +53,7 @@ std::string PostSuggestionsClaim::GeneratePayload( mojom::Result PostSuggestionsClaim::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_BAD_REQUEST) { BLOG(0, "Invalid request"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code == net::HTTP_SERVICE_UNAVAILABLE) { @@ -63,20 +63,20 @@ mojom::Result PostSuggestionsClaim::CheckStatusCode(const int status_code) { if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostSuggestionsClaim::Request(const credential::CredentialsRedeem& redeem, PostSuggestionsClaimCallback callback) { const std::string payload = GeneratePayload(redeem); - auto wallet = ledger_->wallet()->GetWallet(); + auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Wallet is null"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + std::move(callback).Run(mojom::Result::FAILED, ""); return; } @@ -94,7 +94,7 @@ void PostSuggestionsClaim::Request(const credential::CredentialsRedeem& redeem, request->headers = headers; request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void PostSuggestionsClaim::OnRequest(PostSuggestionsClaimCallback callback, @@ -102,7 +102,7 @@ void PostSuggestionsClaim::OnRequest(PostSuggestionsClaimCallback callback, DCHECK(response); LogUrlResponse(__func__, *response); auto result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, ""); return; } @@ -110,7 +110,7 @@ void PostSuggestionsClaim::OnRequest(PostSuggestionsClaimCallback callback, absl::optional value = base::JSONReader::Read(response->body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + std::move(callback).Run(mojom::Result::FAILED, ""); return; } @@ -118,7 +118,7 @@ void PostSuggestionsClaim::OnRequest(PostSuggestionsClaimCallback callback, auto* drain_id = dict.FindString("drainId"); if (!drain_id) { BLOG(0, "Missing drain id"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + std::move(callback).Run(mojom::Result::FAILED, ""); return; } std::move(callback).Run(result, std::move(*drain_id)); diff --git a/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.h b/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.h index a1560c0b60a..8828e943169 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.h +++ b/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.h @@ -10,7 +10,7 @@ #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/credentials/credentials_redeem.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST /v1/suggestions/claim // @@ -37,14 +37,14 @@ // {Empty} namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { class PostSuggestionsClaim { public: - explicit PostSuggestionsClaim(LedgerImpl& ledger); + explicit PostSuggestionsClaim(RewardsEngineImpl& engine); ~PostSuggestionsClaim(); void Request(const credential::CredentialsRedeem& redeem, @@ -60,7 +60,7 @@ class PostSuggestionsClaim { void OnRequest(PostSuggestionsClaimCallback callback, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim_unittest.cc b/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim_unittest.cc index a018672eb81..977849bca99 100644 --- a/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/post_suggestions_claim/post_suggestions_claim_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -44,7 +44,7 @@ class PostSuggestionsClaimTest : public testing::Test { } void SetUp() override { - ON_CALL(*mock_ledger_impl_.mock_client(), + ON_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletBrave, _)) .WillByDefault([](const std::string&, auto callback) { std::string wallet = R"({ @@ -56,13 +56,13 @@ class PostSuggestionsClaimTest : public testing::Test { } base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostSuggestionsClaim claim_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostSuggestionsClaim claim_{mock_engine_impl_}; credential::CredentialsRedeem redeem_; }; TEST_F(PostSuggestionsClaimTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -75,8 +75,8 @@ TEST_F(PostSuggestionsClaimTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK, - "1af0bf71-c81c-4b18-9188-a0d3c4a1b53b")) + EXPECT_CALL(callback, + Run(mojom::Result::OK, "1af0bf71-c81c-4b18-9188-a0d3c4a1b53b")) .Times(1); claim_.Request(redeem_, callback.Get()); @@ -84,7 +84,7 @@ TEST_F(PostSuggestionsClaimTest, ServerOK) { } TEST_F(PostSuggestionsClaimTest, ServerNeedsRetry) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -95,14 +95,14 @@ TEST_F(PostSuggestionsClaimTest, ServerNeedsRetry) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, "")).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, "")).Times(1); claim_.Request(redeem_, callback.Get()); task_environment_.RunUntilIdle(); } TEST_F(PostSuggestionsClaimTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -113,14 +113,14 @@ TEST_F(PostSuggestionsClaimTest, ServerError400) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, "")).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, "")).Times(1); claim_.Request(redeem_, callback.Get()); task_environment_.RunUntilIdle(); } TEST_F(PostSuggestionsClaimTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -131,7 +131,7 @@ TEST_F(PostSuggestionsClaimTest, ServerError500) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, "")).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, "")).Times(1); claim_.Request(redeem_, callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/promotion/promotion_server.cc b/components/brave_rewards/core/endpoint/promotion/promotion_server.cc index eb3d389cf07..c0067778dc2 100644 --- a/components/brave_rewards/core/endpoint/promotion/promotion_server.cc +++ b/components/brave_rewards/core/endpoint/promotion/promotion_server.cc @@ -4,27 +4,27 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/promotion/promotion_server.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace endpoint { -PromotionServer::PromotionServer(LedgerImpl& ledger) - : get_available_(ledger), - post_creds_(ledger), - get_signed_creds_(ledger), - post_clobbered_claims_(ledger), - post_bat_loss_(ledger), - get_wallet_(ledger), - post_captcha_(ledger), - get_captcha_(ledger), - put_captcha_(ledger), - post_safetynet_(ledger), - put_safetynet_(ledger), - post_devicecheck_(ledger), - put_devicecheck_(ledger), - post_suggestions_(ledger), - post_suggestions_claim_(ledger) {} +PromotionServer::PromotionServer(RewardsEngineImpl& engine) + : get_available_(engine), + post_creds_(engine), + get_signed_creds_(engine), + post_clobbered_claims_(engine), + post_bat_loss_(engine), + get_wallet_(engine), + post_captcha_(engine), + get_captcha_(engine), + put_captcha_(engine), + post_safetynet_(engine), + put_safetynet_(engine), + post_devicecheck_(engine), + put_devicecheck_(engine), + post_suggestions_(engine), + post_suggestions_claim_(engine) {} PromotionServer::~PromotionServer() = default; diff --git a/components/brave_rewards/core/endpoint/promotion/promotion_server.h b/components/brave_rewards/core/endpoint/promotion/promotion_server.h index 1be86c41ec0..dc994400b64 100644 --- a/components/brave_rewards/core/endpoint/promotion/promotion_server.h +++ b/components/brave_rewards/core/endpoint/promotion/promotion_server.h @@ -21,16 +21,16 @@ #include "brave/components/brave_rewards/core/endpoint/promotion/put_captcha/put_captcha.h" #include "brave/components/brave_rewards/core/endpoint/promotion/put_devicecheck/put_devicecheck.h" #include "brave/components/brave_rewards/core/endpoint/promotion/put_safetynet/put_safetynet.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { class PromotionServer { public: - explicit PromotionServer(LedgerImpl& ledger); + explicit PromotionServer(RewardsEngineImpl& engine); ~PromotionServer(); promotion::GetAvailable& get_available() { return get_available_; } diff --git a/components/brave_rewards/core/endpoint/promotion/promotions_util.cc b/components/brave_rewards/core/endpoint/promotion/promotions_util.cc index 06333b38ad7..daf1661ca9b 100644 --- a/components/brave_rewards/core/endpoint/promotion/promotions_util.cc +++ b/components/brave_rewards/core/endpoint/promotion/promotions_util.cc @@ -6,7 +6,7 @@ #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" #include "brave/components/brave_rewards/core/buildflags.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace endpoint { diff --git a/components/brave_rewards/core/endpoint/promotion/promotions_util_unittest.cc b/components/brave_rewards/core/endpoint/promotion/promotions_util_unittest.cc index 9a51eedee66..5c79d3c34fe 100644 --- a/components/brave_rewards/core/endpoint/promotion/promotions_util_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/promotions_util_unittest.cc @@ -7,7 +7,7 @@ #include "base/strings/strcat.h" #include "brave/components/brave_rewards/core/buildflags.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "testing/gtest/include/gtest/gtest.h" // npm run test -- brave_unit_tests --filter=PromotionsUtilTest.* diff --git a/components/brave_rewards/core/endpoint/promotion/put_captcha/put_captcha.cc b/components/brave_rewards/core/endpoint/promotion/put_captcha/put_captcha.cc index 0a075028f1a..9393aae5054 100644 --- a/components/brave_rewards/core/endpoint/promotion/put_captcha/put_captcha.cc +++ b/components/brave_rewards/core/endpoint/promotion/put_captcha/put_captcha.cc @@ -9,14 +9,14 @@ #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace promotion { -PutCaptcha::PutCaptcha(LedgerImpl& ledger) : ledger_(ledger) {} +PutCaptcha::PutCaptcha(RewardsEngineImpl& engine) : engine_(engine) {} PutCaptcha::~PutCaptcha() = default; @@ -52,15 +52,15 @@ mojom::Result PutCaptcha::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_INTERNAL_SERVER_ERROR) { BLOG(0, "Failed to verify captcha solution"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PutCaptcha::Request(const int x, @@ -75,7 +75,7 @@ void PutCaptcha::Request(const int x, request->content = GeneratePayload(x, y); request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::PUT; - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void PutCaptcha::OnRequest(PutCaptchaCallback callback, diff --git a/components/brave_rewards/core/endpoint/promotion/put_captcha/put_captcha.h b/components/brave_rewards/core/endpoint/promotion/put_captcha/put_captcha.h index d5902d61f9a..9f6f8bfcf4d 100644 --- a/components/brave_rewards/core/endpoint/promotion/put_captcha/put_captcha.h +++ b/components/brave_rewards/core/endpoint/promotion/put_captcha/put_captcha.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // PUT /v1/captchas/{captcha_id} // @@ -39,7 +39,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -48,7 +48,7 @@ using PutCaptchaCallback = base::OnceCallback; class PutCaptcha { public: - explicit PutCaptcha(LedgerImpl& ledger); + explicit PutCaptcha(RewardsEngineImpl& engine); ~PutCaptcha(); void Request(const int x, @@ -65,7 +65,7 @@ class PutCaptcha { void OnRequest(PutCaptchaCallback callback, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/put_captcha/put_captcha_unittest.cc b/components/brave_rewards/core/endpoint/promotion/put_captcha/put_captcha_unittest.cc index 796139836af..7e702536506 100644 --- a/components/brave_rewards/core/endpoint/promotion/put_captcha/put_captcha_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/put_captcha/put_captcha_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace promotion { class PutCaptchaTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PutCaptcha captcha_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PutCaptcha captcha_{mock_engine_impl_}; }; TEST_F(PutCaptchaTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -43,7 +43,7 @@ TEST_F(PutCaptchaTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::OK)).Times(1); captcha_.Request(10, 20, "83b3b77b-e7c3-455b-adda-e476fa0656d2", callback.Get()); @@ -51,7 +51,7 @@ TEST_F(PutCaptchaTest, ServerOK) { } TEST_F(PutCaptchaTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -70,7 +70,7 @@ TEST_F(PutCaptchaTest, ServerError400) { } TEST_F(PutCaptchaTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -89,7 +89,7 @@ TEST_F(PutCaptchaTest, ServerError401) { } TEST_F(PutCaptchaTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -100,7 +100,7 @@ TEST_F(PutCaptchaTest, ServerError500) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED)).Times(1); captcha_.Request(10, 20, "83b3b77b-e7c3-455b-adda-e476fa0656d2", callback.Get()); @@ -108,7 +108,7 @@ TEST_F(PutCaptchaTest, ServerError500) { } TEST_F(PutCaptchaTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -119,7 +119,7 @@ TEST_F(PutCaptchaTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED)).Times(1); captcha_.Request(10, 20, "83b3b77b-e7c3-455b-adda-e476fa0656d2", callback.Get()); diff --git a/components/brave_rewards/core/endpoint/promotion/put_devicecheck/put_devicecheck.cc b/components/brave_rewards/core/endpoint/promotion/put_devicecheck/put_devicecheck.cc index fdf6db4fe2b..d648039c556 100644 --- a/components/brave_rewards/core/endpoint/promotion/put_devicecheck/put_devicecheck.cc +++ b/components/brave_rewards/core/endpoint/promotion/put_devicecheck/put_devicecheck.cc @@ -9,14 +9,14 @@ #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace promotion { -PutDevicecheck::PutDevicecheck(LedgerImpl& ledger) : ledger_(ledger) {} +PutDevicecheck::PutDevicecheck(RewardsEngineImpl& engine) : engine_(engine) {} PutDevicecheck::~PutDevicecheck() = default; @@ -51,15 +51,15 @@ mojom::Result PutDevicecheck::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_INTERNAL_SERVER_ERROR) { BLOG(0, "Failed to verify captcha solution"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PutDevicecheck::Request(const std::string& blob, @@ -74,7 +74,7 @@ void PutDevicecheck::Request(const std::string& blob, request->content = GeneratePayload(blob, signature); request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::PUT; - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void PutDevicecheck::OnRequest(PutDevicecheckCallback callback, diff --git a/components/brave_rewards/core/endpoint/promotion/put_devicecheck/put_devicecheck.h b/components/brave_rewards/core/endpoint/promotion/put_devicecheck/put_devicecheck.h index ab23d5b97a3..5c40b5d84be 100644 --- a/components/brave_rewards/core/endpoint/promotion/put_devicecheck/put_devicecheck.h +++ b/components/brave_rewards/core/endpoint/promotion/put_devicecheck/put_devicecheck.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // PUT /v1/devicecheck/attestations/{nonce} // @@ -37,7 +37,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -46,7 +46,7 @@ using PutDevicecheckCallback = base::OnceCallback; class PutDevicecheck { public: - explicit PutDevicecheck(LedgerImpl& ledger); + explicit PutDevicecheck(RewardsEngineImpl& engine); ~PutDevicecheck(); void Request(const std::string& blob, @@ -65,7 +65,7 @@ class PutDevicecheck { void OnRequest(PutDevicecheckCallback callback, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/put_devicecheck/put_devicecheck_unittest.cc b/components/brave_rewards/core/endpoint/promotion/put_devicecheck/put_devicecheck_unittest.cc index a79fa46f683..c6fe08b016b 100644 --- a/components/brave_rewards/core/endpoint/promotion/put_devicecheck/put_devicecheck_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/put_devicecheck/put_devicecheck_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace promotion { class PutDevicecheckTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PutDevicecheck devicecheck_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PutDevicecheck devicecheck_{mock_engine_impl_}; }; TEST_F(PutDevicecheckTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -43,7 +43,7 @@ TEST_F(PutDevicecheckTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::OK)).Times(1); devicecheck_.Request("dsfqwf4f901a1", "asdfasdf", "fsadfasdfff4901a1", callback.Get()); @@ -51,7 +51,7 @@ TEST_F(PutDevicecheckTest, ServerOK) { } TEST_F(PutDevicecheckTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -70,7 +70,7 @@ TEST_F(PutDevicecheckTest, ServerError400) { } TEST_F(PutDevicecheckTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -89,7 +89,7 @@ TEST_F(PutDevicecheckTest, ServerError401) { } TEST_F(PutDevicecheckTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -100,7 +100,7 @@ TEST_F(PutDevicecheckTest, ServerError500) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED)).Times(1); devicecheck_.Request("dsfqwf4f901a1", "asdfasdf", "fsadfasdfff4901a1", callback.Get()); diff --git a/components/brave_rewards/core/endpoint/promotion/put_safetynet/put_safetynet.cc b/components/brave_rewards/core/endpoint/promotion/put_safetynet/put_safetynet.cc index 33ff35f248a..ba83ad0cd9c 100644 --- a/components/brave_rewards/core/endpoint/promotion/put_safetynet/put_safetynet.cc +++ b/components/brave_rewards/core/endpoint/promotion/put_safetynet/put_safetynet.cc @@ -9,14 +9,14 @@ #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace promotion { -PutSafetynet::PutSafetynet(LedgerImpl& ledger) : ledger_(ledger) {} +PutSafetynet::PutSafetynet(RewardsEngineImpl& engine) : engine_(engine) {} PutSafetynet::~PutSafetynet() = default; @@ -49,15 +49,15 @@ mojom::Result PutSafetynet::CheckStatusCode(const int status_code) { if (status_code == net::HTTP_INTERNAL_SERVER_ERROR) { BLOG(0, "Failed to verify captcha solution"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PutSafetynet::Request(const std::string& token, @@ -71,7 +71,7 @@ void PutSafetynet::Request(const std::string& token, request->content = GeneratePayload(token); request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::PUT; - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void PutSafetynet::OnRequest(PutSafetynetCallback callback, diff --git a/components/brave_rewards/core/endpoint/promotion/put_safetynet/put_safetynet.h b/components/brave_rewards/core/endpoint/promotion/put_safetynet/put_safetynet.h index 2ca2f6c6bf2..13f6e2e1901 100644 --- a/components/brave_rewards/core/endpoint/promotion/put_safetynet/put_safetynet.h +++ b/components/brave_rewards/core/endpoint/promotion/put_safetynet/put_safetynet.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // PUT /v2/attestations/safetynet/{nonce} // @@ -36,7 +36,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace promotion { @@ -45,7 +45,7 @@ using PutSafetynetCallback = base::OnceCallback; class PutSafetynet { public: - explicit PutSafetynet(LedgerImpl& ledger); + explicit PutSafetynet(RewardsEngineImpl& engine); ~PutSafetynet(); void Request(const std::string& token, @@ -61,7 +61,7 @@ class PutSafetynet { void OnRequest(PutSafetynetCallback callback, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace promotion diff --git a/components/brave_rewards/core/endpoint/promotion/put_safetynet/put_safetynet_unittest.cc b/components/brave_rewards/core/endpoint/promotion/put_safetynet/put_safetynet_unittest.cc index e704c84aa5a..69dcaeb21b8 100644 --- a/components/brave_rewards/core/endpoint/promotion/put_safetynet/put_safetynet_unittest.cc +++ b/components/brave_rewards/core/endpoint/promotion/put_safetynet/put_safetynet_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace promotion { class PutSafetynetTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PutSafetynet safetynet_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PutSafetynet safetynet_{mock_engine_impl_}; }; TEST_F(PutSafetynetTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -43,7 +43,7 @@ TEST_F(PutSafetynetTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::OK)).Times(1); safetynet_.Request("sdfsdf32d323d23d", "dfasdfasdpflsadfplf2r23re2", callback.Get()); @@ -51,7 +51,7 @@ TEST_F(PutSafetynetTest, ServerOK) { } TEST_F(PutSafetynetTest, ServerError400) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -70,7 +70,7 @@ TEST_F(PutSafetynetTest, ServerError400) { } TEST_F(PutSafetynetTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -89,7 +89,7 @@ TEST_F(PutSafetynetTest, ServerError401) { } TEST_F(PutSafetynetTest, ServerError500) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -100,7 +100,7 @@ TEST_F(PutSafetynetTest, ServerError500) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED)).Times(1); safetynet_.Request("sdfsdf32d323d23d", "dfasdfasdpflsadfplf2r23re2", callback.Get()); diff --git a/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.cc b/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.cc index 93388910235..79c7def8996 100644 --- a/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.cc +++ b/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.cc @@ -8,7 +8,7 @@ #include #include "brave/components/brave_rewards/core/endpoint/rewards/rewards_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" using std::placeholders::_1; @@ -17,7 +17,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace rewards { -GetPrefixList::GetPrefixList(LedgerImpl& ledger) : ledger_(ledger) {} +GetPrefixList::GetPrefixList(RewardsEngineImpl& engine) : engine_(engine) {} GetPrefixList::~GetPrefixList() = default; @@ -28,10 +28,10 @@ std::string GetPrefixList::GetUrl() { mojom::Result GetPrefixList::CheckStatusCode(const int status_code) { if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void GetPrefixList::Request(GetPrefixListCallback callback) { @@ -39,7 +39,7 @@ void GetPrefixList::Request(GetPrefixListCallback callback) { auto request = mojom::UrlRequest::New(); request->url = GetUrl(); - ledger_->LoadURL(std::move(request), url_callback); + engine_->LoadURL(std::move(request), url_callback); } void GetPrefixList::OnRequest(mojom::UrlResponsePtr response, @@ -47,14 +47,14 @@ void GetPrefixList::OnRequest(mojom::UrlResponsePtr response, DCHECK(response); LogUrlResponse(__func__, *response, true); - if (CheckStatusCode(response->status_code) != mojom::Result::LEDGER_OK || + if (CheckStatusCode(response->status_code) != mojom::Result::OK || response->body.empty()) { BLOG(0, "Invalid server response for publisher prefix list"); - callback(mojom::Result::LEDGER_ERROR, ""); + callback(mojom::Result::FAILED, ""); return; } - callback(mojom::Result::LEDGER_OK, response->body); + callback(mojom::Result::OK, response->body); } } // namespace rewards diff --git a/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.h b/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.h index ac834711ab5..37c1751d9ed 100644 --- a/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.h +++ b/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // GET /publishers/prefix-list // @@ -20,7 +20,7 @@ // blob namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace rewards { @@ -30,7 +30,7 @@ using GetPrefixListCallback = class GetPrefixList { public: - explicit GetPrefixList(LedgerImpl& ledger); + explicit GetPrefixList(RewardsEngineImpl& engine); ~GetPrefixList(); void Request(GetPrefixListCallback callback); @@ -43,7 +43,7 @@ class GetPrefixList { void OnRequest(mojom::UrlResponsePtr response, GetPrefixListCallback callback); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace rewards diff --git a/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list_unittest.cc b/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list_unittest.cc index 5b704f2632d..bc8d299cc8c 100644 --- a/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list_unittest.cc +++ b/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list_unittest.cc @@ -9,9 +9,9 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace rewards { class GetPrefixListTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - GetPrefixList list_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + GetPrefixList list_{mock_engine_impl_}; }; TEST_F(GetPrefixListTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -43,14 +43,14 @@ TEST_F(GetPrefixListTest, ServerOK) { }); MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_OK, "blob")).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::OK, "blob")).Times(1); list_.Request(callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(GetPrefixListTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -61,14 +61,14 @@ TEST_F(GetPrefixListTest, ServerErrorRandom) { }); MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR, "")).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED, "")).Times(1); list_.Request(callback.AsStdFunction()); task_environment_.RunUntilIdle(); } TEST_F(GetPrefixListTest, ServerBodyEmpty) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -79,7 +79,7 @@ TEST_F(GetPrefixListTest, ServerBodyEmpty) { }); MockFunction callback; - EXPECT_CALL(callback, Call(mojom::Result::LEDGER_ERROR, "")).Times(1); + EXPECT_CALL(callback, Call(mojom::Result::FAILED, "")).Times(1); list_.Request(callback.AsStdFunction()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/rewards/rewards_server.cc b/components/brave_rewards/core/endpoint/rewards/rewards_server.cc index df04742d92f..368966398f9 100644 --- a/components/brave_rewards/core/endpoint/rewards/rewards_server.cc +++ b/components/brave_rewards/core/endpoint/rewards/rewards_server.cc @@ -4,12 +4,13 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/rewards/rewards_server.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace endpoint { -RewardsServer::RewardsServer(LedgerImpl& ledger) : get_prefix_list_(ledger) {} +RewardsServer::RewardsServer(RewardsEngineImpl& engine) + : get_prefix_list_(engine) {} RewardsServer::~RewardsServer() = default; diff --git a/components/brave_rewards/core/endpoint/rewards/rewards_server.h b/components/brave_rewards/core/endpoint/rewards/rewards_server.h index f97b45a7093..55975ef8761 100644 --- a/components/brave_rewards/core/endpoint/rewards/rewards_server.h +++ b/components/brave_rewards/core/endpoint/rewards/rewards_server.h @@ -7,16 +7,16 @@ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_ENDPOINT_REWARDS_REWARDS_SERVER_H_ #include "brave/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { class RewardsServer { public: - explicit RewardsServer(LedgerImpl& ledger); + explicit RewardsServer(RewardsEngineImpl& engine); ~RewardsServer(); rewards::GetPrefixList& get_prefix_list() { return get_prefix_list_; } diff --git a/components/brave_rewards/core/endpoint/rewards/rewards_util.cc b/components/brave_rewards/core/endpoint/rewards/rewards_util.cc index 2bba45eda45..76c5256b913 100644 --- a/components/brave_rewards/core/endpoint/rewards/rewards_util.cc +++ b/components/brave_rewards/core/endpoint/rewards/rewards_util.cc @@ -4,7 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/rewards/rewards_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace endpoint { diff --git a/components/brave_rewards/core/endpoint/rewards/rewards_util_unittest.cc b/components/brave_rewards/core/endpoint/rewards/rewards_util_unittest.cc index 6df4ea1a792..82461bcdbd7 100644 --- a/components/brave_rewards/core/endpoint/rewards/rewards_util_unittest.cc +++ b/components/brave_rewards/core/endpoint/rewards/rewards_util_unittest.cc @@ -5,7 +5,7 @@ #include "brave/components/brave_rewards/core/endpoint/rewards/rewards_util.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "testing/gtest/include/gtest/gtest.h" // npm run test -- brave_unit_tests --filter=RewardsUtilTest.* diff --git a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.cc b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.cc index a6e752eaa16..8ec98f4352a 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.cc @@ -8,7 +8,7 @@ #include #include "base/json/json_reader.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" #include "net/http/http_status_code.h" @@ -19,7 +19,7 @@ using uphold::Capabilities; namespace endpoint { namespace uphold { -GetCapabilities::GetCapabilities(LedgerImpl& ledger) : ledger_(ledger) {} +GetCapabilities::GetCapabilities(RewardsEngineImpl& engine) : engine_(engine) {} GetCapabilities::~GetCapabilities() = default; @@ -28,7 +28,7 @@ void GetCapabilities::Request(const std::string& token, auto request = mojom::UrlRequest::New(); request->url = GetServerUrl("/v0/me/capabilities"); request->headers = RequestAuthorization(token); - ledger_->LoadURL(std::move(request), + engine_->LoadURL(std::move(request), base::BindOnce(&GetCapabilities::OnRequest, base::Unretained(this), std::move(callback))); } @@ -63,12 +63,11 @@ GetCapabilities::ProcessResponse(const mojom::UrlResponse& response) { if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return {mojom::Result::LEDGER_ERROR, {}}; + return {mojom::Result::FAILED, {}}; } auto capability_map = ParseBody(response.body); - return {!capability_map.empty() ? mojom::Result::LEDGER_OK - : mojom::Result::LEDGER_ERROR, + return {!capability_map.empty() ? mojom::Result::OK : mojom::Result::FAILED, std::move(capability_map)}; } diff --git a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.h b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.h index 0787a67dbec..4e252d414bd 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.h +++ b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.h @@ -11,7 +11,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/uphold/uphold_capabilities.h" // GET https://api.uphold.com/v0/me/capabilities @@ -167,7 +167,7 @@ // ] namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace uphold { @@ -177,7 +177,7 @@ using GetCapabilitiesCallback = class GetCapabilities { public: - explicit GetCapabilities(LedgerImpl& ledger); + explicit GetCapabilities(RewardsEngineImpl& engine); ~GetCapabilities(); void Request(const std::string& token, GetCapabilitiesCallback callback); @@ -198,7 +198,7 @@ class GetCapabilities { CapabilityMap ParseBody(const std::string& body); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace uphold diff --git a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities_unittest.cc b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities_unittest.cc index c17696bdd83..277cd6689e5 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities_unittest.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/uphold/uphold_capabilities.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -30,12 +30,12 @@ namespace uphold { class GetCapabilitiesTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - GetCapabilities get_capabilities_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + GetCapabilities get_capabilities_{mock_engine_impl_}; }; TEST_F(GetCapabilitiesTest, ServerReturns200OKSufficientReceivesAndSends) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -67,7 +67,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKSufficientReceivesAndSends) { EXPECT_CALL(callback, Run) .Times(1) .WillOnce([](mojom::Result result, Capabilities capabilities) { - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); EXPECT_EQ(capabilities.can_receive, true); EXPECT_EQ(capabilities.can_send, true); }); @@ -78,7 +78,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKSufficientReceivesAndSends) { } TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientReceives1) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -112,7 +112,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientReceives1) { EXPECT_CALL(callback, Run) .Times(1) .WillOnce([](mojom::Result result, Capabilities capabilities) { - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); EXPECT_EQ(capabilities.can_receive, false); EXPECT_EQ(capabilities.can_send, true); }); @@ -123,7 +123,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientReceives1) { } TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientReceives2) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -155,7 +155,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientReceives2) { EXPECT_CALL(callback, Run) .Times(1) .WillOnce([](mojom::Result result, Capabilities capabilities) { - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); EXPECT_EQ(capabilities.can_receive, false); EXPECT_EQ(capabilities.can_send, true); }); @@ -166,7 +166,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientReceives2) { } TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientSends1) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -200,7 +200,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientSends1) { EXPECT_CALL(callback, Run) .Times(1) .WillOnce([](mojom::Result result, Capabilities capabilities) { - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); EXPECT_EQ(capabilities.can_receive, true); EXPECT_EQ(capabilities.can_send, false); }); @@ -211,7 +211,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientSends1) { } TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientSends2) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -243,7 +243,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientSends2) { EXPECT_CALL(callback, Run) .Times(1) .WillOnce([](mojom::Result result, Capabilities capabilities) { - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); EXPECT_EQ(capabilities.can_receive, true); EXPECT_EQ(capabilities.can_send, false); }); @@ -254,7 +254,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientSends2) { } TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientReceivesAndSends1) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -290,7 +290,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientReceivesAndSends1) { EXPECT_CALL(callback, Run) .Times(1) .WillOnce([](mojom::Result result, Capabilities capabilities) { - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); EXPECT_EQ(capabilities.can_receive, false); EXPECT_EQ(capabilities.can_send, false); }); @@ -301,7 +301,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientReceivesAndSends1) { } TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientReceivesAndSends2) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -333,7 +333,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientReceivesAndSends2) { EXPECT_CALL(callback, Run) .Times(1) .WillOnce([](mojom::Result result, Capabilities capabilities) { - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); EXPECT_EQ(capabilities.can_receive, false); EXPECT_EQ(capabilities.can_send, false); }); @@ -344,7 +344,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns200OKInsufficientReceivesAndSends2) { } TEST_F(GetCapabilitiesTest, ServerReturns401Unauthorized) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -367,7 +367,7 @@ TEST_F(GetCapabilitiesTest, ServerReturns401Unauthorized) { } TEST_F(GetCapabilitiesTest, ServerReturnsUnexpectedHTTPStatus) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -379,7 +379,7 @@ TEST_F(GetCapabilitiesTest, ServerReturnsUnexpectedHTTPStatus) { EXPECT_CALL(callback, Run) .Times(1) .WillOnce([](mojom::Result result, Capabilities capabilities) { - EXPECT_EQ(result, mojom::Result::LEDGER_ERROR); + EXPECT_EQ(result, mojom::Result::FAILED); EXPECT_EQ(capabilities.can_receive, absl::nullopt); EXPECT_EQ(capabilities.can_send, absl::nullopt); }); diff --git a/components/brave_rewards/core/endpoint/uphold/get_card/get_card.cc b/components/brave_rewards/core/endpoint/uphold/get_card/get_card.cc index 3aa8f223180..8fdca74f91b 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_card/get_card.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_card/get_card.cc @@ -10,7 +10,7 @@ #include "base/json/json_reader.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/uphold/uphold_card.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" #include "net/http/http_status_code.h" @@ -21,7 +21,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace uphold { -GetCard::GetCard(LedgerImpl& ledger) : ledger_(ledger) {} +GetCard::GetCard(RewardsEngineImpl& engine) : engine_(engine) {} GetCard::~GetCard() = default; @@ -39,10 +39,10 @@ mojom::Result GetCard::CheckStatusCode(const int status_code) { if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result GetCard::ParseBody(const std::string& body, double* available) { @@ -51,14 +51,14 @@ mojom::Result GetCard::ParseBody(const std::string& body, double* available) { absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* available_str = dict.FindString("available"); if (!available_str) { BLOG(0, "Missing available"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const bool success = base::StringToDouble(*available_str, available); @@ -66,7 +66,7 @@ mojom::Result GetCard::ParseBody(const std::string& body, double* available) { *available = 0.0; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void GetCard::Request(const std::string& address, @@ -77,7 +77,7 @@ void GetCard::Request(const std::string& address, auto request = mojom::UrlRequest::New(); request->url = GetUrl(address); request->headers = RequestAuthorization(token); - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void GetCard::OnRequest(GetCardCallback callback, @@ -87,7 +87,7 @@ void GetCard::OnRequest(GetCardCallback callback, mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, 0.0); return; } diff --git a/components/brave_rewards/core/endpoint/uphold/get_card/get_card.h b/components/brave_rewards/core/endpoint/uphold/get_card/get_card.h index ad2f06a4e8e..98c7f2dcb1d 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_card/get_card.h +++ b/components/brave_rewards/core/endpoint/uphold/get_card/get_card.h @@ -10,7 +10,7 @@ #include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // GET https://api.uphold.com/v0/me/cards/{wallet_address} // @@ -73,7 +73,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace uphold { @@ -83,7 +83,7 @@ using GetCardCallback = base::OnceCallback ledger_; + const raw_ref engine_; }; } // namespace uphold diff --git a/components/brave_rewards/core/endpoint/uphold/get_card/get_card_unittest.cc b/components/brave_rewards/core/endpoint/uphold/get_card/get_card_unittest.cc index d126a77264d..9982f23eafd 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_card/get_card_unittest.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_card/get_card_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/uphold/get_card/get_card.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace uphold { class GetCardTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - GetCard card_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + GetCard card_{mock_engine_impl_}; }; TEST_F(GetCardTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -92,7 +92,7 @@ TEST_F(GetCardTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK, 4.0)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::OK, 4.0)).Times(1); card_.Request("193a77cf-02e8-4e10-8127-8a1b5a8bfece", "4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); @@ -100,7 +100,7 @@ TEST_F(GetCardTest, ServerOK) { } TEST_F(GetCardTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -119,7 +119,7 @@ TEST_F(GetCardTest, ServerError401) { } TEST_F(GetCardTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -130,7 +130,7 @@ TEST_F(GetCardTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, 0.0)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, 0.0)).Times(1); card_.Request("193a77cf-02e8-4e10-8127-8a1b5a8bfece", "4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); diff --git a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.cc b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.cc index 30c764cbdb9..e28b53ffd73 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.cc @@ -9,14 +9,14 @@ #include "base/json/json_reader.h" #include "base/strings/stringprintf.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/uphold/uphold_card.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoint::uphold { -GetCards::GetCards(LedgerImpl& ledger) : ledger_(ledger) {} +GetCards::GetCards(RewardsEngineImpl& engine) : engine_(engine) {} GetCards::~GetCards() = default; @@ -32,10 +32,10 @@ mojom::Result GetCards::CheckStatusCode(int status_code) { if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result GetCards::ParseBody(const std::string& body, std::string* id) { @@ -44,7 +44,7 @@ mojom::Result GetCards::ParseBody(const std::string& body, std::string* id) { absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_list()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } auto& list = value->GetList(); @@ -63,11 +63,11 @@ mojom::Result GetCards::ParseBody(const std::string& body, std::string* id) { } *id = *id_str; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } } - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } void GetCards::Request(const std::string& token, GetCardsCallback callback) { @@ -75,7 +75,7 @@ void GetCards::Request(const std::string& token, GetCardsCallback callback) { request->url = GetUrl(); request->headers = RequestAuthorization(token); - ledger_->LoadURL(std::move(request), + engine_->LoadURL(std::move(request), base::BindOnce(&GetCards::OnRequest, base::Unretained(this), std::move(callback))); } @@ -86,7 +86,7 @@ void GetCards::OnRequest(GetCardsCallback callback, LogUrlResponse(__func__, *response); mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { return std::move(callback).Run(result, ""); } diff --git a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.h b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.h index cccf3f89d92..cde17aa8bf7 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.h +++ b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // GET https://api.uphold.com/v0/me/cards?q=currency:BAT // @@ -73,7 +73,7 @@ // ] namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint::uphold { @@ -82,7 +82,7 @@ using GetCardsCallback = class GetCards { public: - explicit GetCards(LedgerImpl& ledger); + explicit GetCards(RewardsEngineImpl& engine); ~GetCards(); void Request(const std::string& token, GetCardsCallback); @@ -96,7 +96,7 @@ class GetCards { void OnRequest(GetCardsCallback, mojom::UrlResponsePtr); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace endpoint::uphold diff --git a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards_unittest.cc b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards_unittest.cc index fc0cd034d85..00218f08eb1 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards_unittest.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards_unittest.cc @@ -11,9 +11,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -28,12 +28,12 @@ namespace uphold { class GetCardsTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - GetCards card_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + GetCards card_{mock_engine_impl_}; }; TEST_F(GetCardsTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -95,7 +95,7 @@ TEST_F(GetCardsTest, ServerOK) { base::MockCallback callback; EXPECT_CALL(callback, - Run(mojom::Result::LEDGER_OK, + Run(mojom::Result::OK, std::string("3ed3b2c4-a715-4c01-b302-fa2681a971ea"))) .Times(1); card_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); @@ -104,7 +104,7 @@ TEST_F(GetCardsTest, ServerOK) { } TEST_F(GetCardsTest, CardNotFound) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -165,15 +165,14 @@ TEST_F(GetCardsTest, CardNotFound) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, std::string())) - .Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, std::string())).Times(1); card_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); task_environment_.RunUntilIdle(); } TEST_F(GetCardsTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -192,7 +191,7 @@ TEST_F(GetCardsTest, ServerError401) { } TEST_F(GetCardsTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -203,8 +202,7 @@ TEST_F(GetCardsTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, std::string())) - .Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, std::string())).Times(1); card_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/uphold/get_me/get_me.cc b/components/brave_rewards/core/endpoint/uphold/get_me/get_me.cc index 0257c5b3434..3e74a74e341 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_me/get_me.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_me/get_me.cc @@ -10,7 +10,7 @@ #include "base/containers/contains.h" #include "base/json/json_reader.h" #include "base/strings/stringprintf.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" #include "net/http/http_status_code.h" @@ -18,7 +18,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace uphold { -GetMe::GetMe(LedgerImpl& ledger) : ledger_(ledger) {} +GetMe::GetMe(RewardsEngineImpl& engine) : engine_(engine) {} GetMe::~GetMe() = default; @@ -34,10 +34,10 @@ mojom::Result GetMe::CheckStatusCode(const int status_code) { if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result GetMe::ParseBody(const std::string& body, @@ -47,7 +47,7 @@ mojom::Result GetMe::ParseBody(const std::string& body, absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); @@ -66,7 +66,7 @@ mojom::Result GetMe::ParseBody(const std::string& body, user->bat_not_allowed = !base::Contains(*currencies, base::Value(currency)); } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void GetMe::Request(const std::string& token, GetMeCallback callback) { @@ -76,7 +76,7 @@ void GetMe::Request(const std::string& token, GetMeCallback callback) { auto request = mojom::UrlRequest::New(); request->url = GetUrl(); request->headers = RequestAuthorization(token); - ledger_->LoadURL(std::move(request), std::move(url_callback)); + engine_->LoadURL(std::move(request), std::move(url_callback)); } void GetMe::OnRequest(GetMeCallback callback, mojom::UrlResponsePtr response) { @@ -85,7 +85,7 @@ void GetMe::OnRequest(GetMeCallback callback, mojom::UrlResponsePtr response) { internal::uphold::User user; mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { std::move(callback).Run(result, user); return; } diff --git a/components/brave_rewards/core/endpoint/uphold/get_me/get_me.h b/components/brave_rewards/core/endpoint/uphold/get_me/get_me.h index 3c414ece1db..7a6079598bc 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_me/get_me.h +++ b/components/brave_rewards/core/endpoint/uphold/get_me/get_me.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/uphold/uphold_user.h" // GET https://api.uphold.com/v0/me @@ -111,7 +111,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { namespace uphold { @@ -122,7 +122,7 @@ using GetMeCallback = class GetMe { public: - explicit GetMe(LedgerImpl& ledger); + explicit GetMe(RewardsEngineImpl& engine); ~GetMe(); void Request(const std::string& token, GetMeCallback callback); @@ -137,7 +137,7 @@ class GetMe { void OnRequest(GetMeCallback callback, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace uphold diff --git a/components/brave_rewards/core/endpoint/uphold/get_me/get_me_unittest.cc b/components/brave_rewards/core/endpoint/uphold/get_me/get_me_unittest.cc index c24e500af6b..7fa1f7504c1 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_me/get_me_unittest.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_me/get_me_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/uphold/get_me/get_me.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace uphold { class GetMeTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - GetMe me_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + GetMe me_{mock_engine_impl_}; }; TEST_F(GetMeTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -133,7 +133,7 @@ TEST_F(GetMeTest, ServerOK) { EXPECT_CALL(callback, Run) .Times(1) .WillOnce([](mojom::Result result, const internal::uphold::User& user) { - EXPECT_EQ(result, mojom::Result::LEDGER_OK); + EXPECT_EQ(result, mojom::Result::OK); EXPECT_EQ(user.name, "John"); EXPECT_EQ(user.member_id, "b34060c9-5ca3-4bdb-bc32-1f826ecea36e"); EXPECT_EQ(user.bat_not_allowed, false); @@ -144,7 +144,7 @@ TEST_F(GetMeTest, ServerOK) { } TEST_F(GetMeTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -162,7 +162,7 @@ TEST_F(GetMeTest, ServerError401) { } TEST_F(GetMeTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -173,7 +173,7 @@ TEST_F(GetMeTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, _)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, _)).Times(1); me_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.cc b/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.cc index 2e7e41c4de8..2a661a1f309 100644 --- a/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.cc +++ b/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.cc @@ -9,13 +9,13 @@ #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoint::uphold { -PatchCard::PatchCard(LedgerImpl& ledger) : ledger_(ledger) {} +PatchCard::PatchCard(RewardsEngineImpl& engine) : engine_(engine) {} PatchCard::~PatchCard() = default; @@ -44,10 +44,10 @@ mojom::Result PatchCard::CheckStatusCode(int status_code) { if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PatchCard::Request(const std::string& token, @@ -60,7 +60,7 @@ void PatchCard::Request(const std::string& token, request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::PATCH; - ledger_->LoadURL(std::move(request), + engine_->LoadURL(std::move(request), base::BindOnce(&PatchCard::OnRequest, base::Unretained(this), std::move(callback))); } diff --git a/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.h b/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.h index 1e9cf5f0d40..fa60b127337 100644 --- a/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.h +++ b/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // PATCH https://api.uphold.com/v0/me/cards/{wallet_address} // @@ -81,7 +81,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint::uphold { @@ -89,7 +89,7 @@ using PatchCardCallback = base::OnceCallback; class PatchCard { public: - explicit PatchCard(LedgerImpl& ledger); + explicit PatchCard(RewardsEngineImpl& engine); ~PatchCard(); void Request(const std::string& token, @@ -105,7 +105,7 @@ class PatchCard { void OnRequest(PatchCardCallback, mojom::UrlResponsePtr); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace endpoint::uphold diff --git a/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card_unittest.cc b/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card_unittest.cc index 6984ce5d79a..0f07edfc2c6 100644 --- a/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card_unittest.cc +++ b/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace uphold { class PatchCardTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PatchCard card_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PatchCard card_{mock_engine_impl_}; }; TEST_F(PatchCardTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -92,7 +92,7 @@ TEST_F(PatchCardTest, ServerOK) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_OK)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::OK)).Times(1); card_.Request("193a77cf-02e8-4e10-8127-8a1b5a8bfece", "4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); @@ -100,7 +100,7 @@ TEST_F(PatchCardTest, ServerOK) { } TEST_F(PatchCardTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -119,7 +119,7 @@ TEST_F(PatchCardTest, ServerError401) { } TEST_F(PatchCardTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -130,7 +130,7 @@ TEST_F(PatchCardTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR)).Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED)).Times(1); card_.Request("193a77cf-02e8-4e10-8127-8a1b5a8bfece", "4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); diff --git a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.cc b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.cc index 03c76f074ab..c319cf303df 100644 --- a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.cc +++ b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.cc @@ -9,14 +9,14 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/uphold/uphold_card.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoint::uphold { -PostCards::PostCards(LedgerImpl& ledger) : ledger_(ledger) {} +PostCards::PostCards(RewardsEngineImpl& engine) : engine_(engine) {} PostCards::~PostCards() = default; @@ -42,10 +42,10 @@ mojom::Result PostCards::CheckStatusCode(int status_code) { if (status_code != net::HTTP_OK) { BLOG(0, "Unexpected HTTP status: " << status_code); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } mojom::Result PostCards::ParseBody(const std::string& body, std::string* id) { @@ -54,19 +54,19 @@ mojom::Result PostCards::ParseBody(const std::string& body, std::string* id) { absl::optional value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { BLOG(0, "Invalid JSON"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } const base::Value::Dict& dict = value->GetDict(); const auto* id_str = dict.FindString("id"); if (!id_str) { BLOG(0, "Missing id"); - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } *id = *id_str; - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } void PostCards::Request(const std::string& token, PostCardsCallback callback) { @@ -77,7 +77,7 @@ void PostCards::Request(const std::string& token, PostCardsCallback callback) { request->content_type = "application/json; charset=utf-8"; request->method = mojom::UrlMethod::POST; - ledger_->LoadURL(std::move(request), + engine_->LoadURL(std::move(request), base::BindOnce(&PostCards::OnRequest, base::Unretained(this), std::move(callback))); } @@ -88,7 +88,7 @@ void PostCards::OnRequest(PostCardsCallback callback, LogUrlResponse(__func__, *response, true); mojom::Result result = CheckStatusCode(response->status_code); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { return std::move(callback).Run(result, ""); } diff --git a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.h b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.h index 6436f979560..57d57b8efc7 100644 --- a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.h +++ b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.h @@ -9,7 +9,7 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" // POST https://api.uphold.com/v0/me/cards // @@ -78,7 +78,7 @@ // } namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint::uphold { @@ -87,7 +87,7 @@ using PostCardsCallback = class PostCards { public: - explicit PostCards(LedgerImpl& ledger); + explicit PostCards(RewardsEngineImpl& engine); ~PostCards(); void Request(const std::string& token, PostCardsCallback); @@ -103,7 +103,7 @@ class PostCards { void OnRequest(PostCardsCallback, mojom::UrlResponsePtr); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace endpoint::uphold diff --git a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards_unittest.cc b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards_unittest.cc index bfed6d620b8..65484aa6724 100644 --- a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards_unittest.cc +++ b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards_unittest.cc @@ -10,9 +10,9 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,12 +27,12 @@ namespace uphold { class PostCardsTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - PostCards card_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + PostCards card_{mock_engine_impl_}; }; TEST_F(PostCardsTest, ServerOK) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -93,7 +93,7 @@ TEST_F(PostCardsTest, ServerOK) { base::MockCallback callback; EXPECT_CALL(callback, - Run(mojom::Result::LEDGER_OK, + Run(mojom::Result::OK, std::string("bd91a720-f3f9-42f8-b2f5-19548004f6a7"))) .Times(1); card_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); @@ -102,7 +102,7 @@ TEST_F(PostCardsTest, ServerOK) { } TEST_F(PostCardsTest, ServerError401) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -121,7 +121,7 @@ TEST_F(PostCardsTest, ServerError401) { } TEST_F(PostCardsTest, ServerErrorRandom) { - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([](mojom::UrlRequestPtr request, auto callback) { auto response = mojom::UrlResponse::New(); @@ -132,8 +132,7 @@ TEST_F(PostCardsTest, ServerErrorRandom) { }); base::MockCallback callback; - EXPECT_CALL(callback, Run(mojom::Result::LEDGER_ERROR, std::string())) - .Times(1); + EXPECT_CALL(callback, Run(mojom::Result::FAILED, std::string())).Times(1); card_.Request("4c2b665ca060d912fec5c735c734859a06118cc8", callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoint/uphold/uphold_server.cc b/components/brave_rewards/core/endpoint/uphold/uphold_server.cc index b30ac85d80d..55453f8a301 100644 --- a/components/brave_rewards/core/endpoint/uphold/uphold_server.cc +++ b/components/brave_rewards/core/endpoint/uphold/uphold_server.cc @@ -5,18 +5,18 @@ #include "brave/components/brave_rewards/core/endpoint/uphold/uphold_server.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace endpoint { -UpholdServer::UpholdServer(LedgerImpl& ledger) - : get_capabilities_(ledger), - get_cards_(ledger), - get_card_(ledger), - get_me_(ledger), - post_cards_(ledger), - patch_card_(ledger) {} +UpholdServer::UpholdServer(RewardsEngineImpl& engine) + : get_capabilities_(engine), + get_cards_(engine), + get_card_(engine), + get_me_(engine), + post_cards_(engine), + patch_card_(engine) {} UpholdServer::~UpholdServer() = default; diff --git a/components/brave_rewards/core/endpoint/uphold/uphold_server.h b/components/brave_rewards/core/endpoint/uphold/uphold_server.h index 831670826ac..2b01d40b1c0 100644 --- a/components/brave_rewards/core/endpoint/uphold/uphold_server.h +++ b/components/brave_rewards/core/endpoint/uphold/uphold_server.h @@ -12,16 +12,16 @@ #include "brave/components/brave_rewards/core/endpoint/uphold/get_me/get_me.h" #include "brave/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.h" #include "brave/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoint { class UpholdServer { public: - explicit UpholdServer(LedgerImpl& ledger); + explicit UpholdServer(RewardsEngineImpl& engine); ~UpholdServer(); uphold::GetCapabilities& get_capabilities() { return get_capabilities_; } diff --git a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction/post_commit_transaction_bitflyer.cc b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction/post_commit_transaction_bitflyer.cc index e5479b3083c..91c96b691f6 100644 --- a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction/post_commit_transaction_bitflyer.cc +++ b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction/post_commit_transaction_bitflyer.cc @@ -10,7 +10,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "brave/components/brave_rewards/core/bitflyer/bitflyer_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoints { diff --git a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction/post_commit_transaction_bitflyer.h b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction/post_commit_transaction_bitflyer.h index 79ccdb2246f..9bce5c1f6b8 100644 --- a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction/post_commit_transaction_bitflyer.h +++ b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction/post_commit_transaction_bitflyer.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger_endpoints.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_endpoints.mojom.h" #include "brave/components/brave_rewards/core/endpoints/post_commit_transaction/post_commit_transaction.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction/post_commit_transaction_bitflyer_unittest.cc b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction/post_commit_transaction_bitflyer_unittest.cc index 128b8f85108..77137f35ed4 100644 --- a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction/post_commit_transaction_bitflyer_unittest.cc +++ b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction/post_commit_transaction_bitflyer_unittest.cc @@ -11,8 +11,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction/post_commit_transaction_bitflyer.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,13 +39,13 @@ class PostCommitTransactionBitFlyer : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(PostCommitTransactionBitFlyer, Paths) { const auto& [ignore, status_code, body, expected_result] = GetParam(); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([&](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -58,7 +58,7 @@ TEST_P(PostCommitTransactionBitFlyer, Paths) { EXPECT_CALL(callback, Run(Result(expected_result))).Times(1); RequestFor( - mock_ledger_impl_, "token", "address", + mock_engine_impl_, "token", "address", mojom::ExternalTransaction::New("transaction_id", "contribution_id", "destination", "amount")) .Send(callback.Get()); diff --git a/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini.cc b/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini.cc index e6d07c706b9..38403ce66eb 100644 --- a/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini.cc +++ b/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini.cc @@ -9,7 +9,7 @@ #include "base/json/json_reader.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoints { @@ -62,9 +62,9 @@ Result GetRecipientIDGemini::ProcessResponse( } } -GetRecipientIDGemini::GetRecipientIDGemini(LedgerImpl& ledger, +GetRecipientIDGemini::GetRecipientIDGemini(RewardsEngineImpl& engine, std::string&& token) - : RequestBuilder(ledger), token_(std::move(token)) {} + : RequestBuilder(engine), token_(std::move(token)) {} GetRecipientIDGemini::~GetRecipientIDGemini() = default; diff --git a/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini.h b/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini.h index c0d3cbc5518..8620f0d3ce9 100644 --- a/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini.h +++ b/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger_endpoints.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_endpoints.mojom.h" #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" @@ -35,7 +35,7 @@ // ] namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoints { @@ -53,7 +53,7 @@ class GetRecipientIDGemini final public: static Result ProcessResponse(const mojom::UrlResponse&); - GetRecipientIDGemini(LedgerImpl& ledger, std::string&& token); + GetRecipientIDGemini(RewardsEngineImpl& engine, std::string&& token); ~GetRecipientIDGemini() override; private: diff --git a/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini_unittest.cc b/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini_unittest.cc index 422fdde8f38..60d5ed4723b 100644 --- a/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini_unittest.cc @@ -11,8 +11,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -40,13 +40,13 @@ class GetRecipientIDGemini : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(GetRecipientIDGemini, Paths) { const auto& [ignore, status_code, body, expected_result] = GetParam(); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([&](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -58,7 +58,7 @@ TEST_P(GetRecipientIDGemini, Paths) { base::MockCallback> callback; EXPECT_CALL(callback, Run(Result(expected_result))).Times(1); - RequestFor(mock_ledger_impl_, "token") + RequestFor(mock_engine_impl_, "token") .Send(callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction/post_commit_transaction_gemini.cc b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction/post_commit_transaction_gemini.cc index 52c7469188c..344f91e18e8 100644 --- a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction/post_commit_transaction_gemini.cc +++ b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction/post_commit_transaction_gemini.cc @@ -11,7 +11,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoints { diff --git a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction/post_commit_transaction_gemini.h b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction/post_commit_transaction_gemini.h index 95751602b90..aeae3d17625 100644 --- a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction/post_commit_transaction_gemini.h +++ b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction/post_commit_transaction_gemini.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger_endpoints.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_endpoints.mojom.h" #include "brave/components/brave_rewards/core/endpoints/post_commit_transaction/post_commit_transaction.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction/post_commit_transaction_gemini_unittest.cc b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction/post_commit_transaction_gemini_unittest.cc index cf27835dffb..25da5f1e488 100644 --- a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction/post_commit_transaction_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction/post_commit_transaction_gemini_unittest.cc @@ -11,8 +11,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoints/gemini/post_commit_transaction/post_commit_transaction_gemini.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,13 +39,13 @@ class PostCommitTransactionGemini : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(PostCommitTransactionGemini, Paths) { const auto& [ignore, status_code, body, expected_result] = GetParam(); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([&](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -58,7 +58,7 @@ TEST_P(PostCommitTransactionGemini, Paths) { EXPECT_CALL(callback, Run(Result(expected_result))).Times(1); RequestFor( - mock_ledger_impl_, "token", "address", + mock_engine_impl_, "token", "address", mojom::ExternalTransaction::New("transaction_id", "contribution_id", "destination", "amount")) .Send(callback.Get()); diff --git a/components/brave_rewards/core/endpoints/get_parameters/get_parameters.cc b/components/brave_rewards/core/endpoints/get_parameters/get_parameters.cc index 8959df9da27..89bb1bfd3c7 100644 --- a/components/brave_rewards/core/endpoints/get_parameters/get_parameters.cc +++ b/components/brave_rewards/core/endpoints/get_parameters/get_parameters.cc @@ -10,7 +10,7 @@ #include "base/json/json_reader.h" #include "brave/components/brave_rewards/core/endpoint/api/api_util.h" #include "brave/components/brave_rewards/core/endpoints/get_parameters/get_parameters_utils.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoints { @@ -140,7 +140,8 @@ Result GetParameters::ProcessResponse(const mojom::UrlResponse& response) { } } -GetParameters::GetParameters(LedgerImpl& ledger) : RequestBuilder(ledger) {} +GetParameters::GetParameters(RewardsEngineImpl& engine) + : RequestBuilder(engine) {} GetParameters::~GetParameters() = default; diff --git a/components/brave_rewards/core/endpoints/get_parameters/get_parameters.h b/components/brave_rewards/core/endpoints/get_parameters/get_parameters.h index 80deffeba87..cfb55d3123b 100644 --- a/components/brave_rewards/core/endpoints/get_parameters/get_parameters.h +++ b/components/brave_rewards/core/endpoints/get_parameters/get_parameters.h @@ -8,8 +8,8 @@ #include -#include "brave/components/brave_rewards/common/mojom/ledger.mojom.h" -#include "brave/components/brave_rewards/common/mojom/ledger_endpoints.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_endpoints.mojom.h" #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" @@ -57,7 +57,7 @@ // clang-format on namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoints { @@ -74,7 +74,7 @@ class GetParameters final : public RequestBuilder, public: static Result ProcessResponse(const mojom::UrlResponse&); - explicit GetParameters(LedgerImpl& ledger); + explicit GetParameters(RewardsEngineImpl& engine); ~GetParameters() override; private: diff --git a/components/brave_rewards/core/endpoints/get_parameters/get_parameters_unittest.cc b/components/brave_rewards/core/endpoints/get_parameters/get_parameters_unittest.cc index 5d645d533d7..fb11b6aba95 100644 --- a/components/brave_rewards/core/endpoints/get_parameters/get_parameters_unittest.cc +++ b/components/brave_rewards/core/endpoints/get_parameters/get_parameters_unittest.cc @@ -13,8 +13,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoints/get_parameters/get_parameters.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -42,13 +42,13 @@ using GetParametersParamType = std::tuple< class GetParameters : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(GetParameters, Paths) { const auto& [ignore, status_code, body, expected_result] = GetParam(); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([&](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -68,7 +68,7 @@ TEST_P(GetParameters, Paths) { } }); - RequestFor(mock_ledger_impl_).Send(callback.Get()); + RequestFor(mock_engine_impl_).Send(callback.Get()); task_environment_.RunUntilIdle(); } diff --git a/components/brave_rewards/core/endpoints/get_parameters/get_parameters_utils.cc b/components/brave_rewards/core/endpoints/get_parameters/get_parameters_utils.cc index e7d86dd4333..00d635c2519 100644 --- a/components/brave_rewards/core/endpoints/get_parameters/get_parameters_utils.cc +++ b/components/brave_rewards/core/endpoints/get_parameters/get_parameters_utils.cc @@ -7,7 +7,7 @@ #include #include "brave/components/brave_rewards/core/endpoints/get_parameters/get_parameters_utils.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace { diff --git a/components/brave_rewards/core/endpoints/get_parameters/get_parameters_utils.h b/components/brave_rewards/core/endpoints/get_parameters/get_parameters_utils.h index d8bdf86f403..f758284f680 100644 --- a/components/brave_rewards/core/endpoints/get_parameters/get_parameters_utils.h +++ b/components/brave_rewards/core/endpoints/get_parameters/get_parameters_utils.h @@ -10,7 +10,7 @@ #include "base/containers/flat_map.h" #include "base/values.h" -#include "brave/components/brave_rewards/common/mojom/ledger.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal::endpoints { diff --git a/components/brave_rewards/core/endpoints/get_transaction_status/get_transaction_status.cc b/components/brave_rewards/core/endpoints/get_transaction_status/get_transaction_status.cc index acb4e834d4f..8273cc30700 100644 --- a/components/brave_rewards/core/endpoints/get_transaction_status/get_transaction_status.cc +++ b/components/brave_rewards/core/endpoints/get_transaction_status/get_transaction_status.cc @@ -9,10 +9,10 @@ namespace brave_rewards::internal::endpoints { -GetTransactionStatus::GetTransactionStatus(LedgerImpl& ledger, +GetTransactionStatus::GetTransactionStatus(RewardsEngineImpl& engine, std::string&& token, std::string&& transaction_id) - : RequestBuilder(ledger), + : RequestBuilder(engine), token_(std::move(token)), transaction_id_(std::move(transaction_id)) {} diff --git a/components/brave_rewards/core/endpoints/get_transaction_status/get_transaction_status.h b/components/brave_rewards/core/endpoints/get_transaction_status/get_transaction_status.h index cf3f6341943..f29af995d32 100644 --- a/components/brave_rewards/core/endpoints/get_transaction_status/get_transaction_status.h +++ b/components/brave_rewards/core/endpoints/get_transaction_status/get_transaction_status.h @@ -11,13 +11,13 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoints { class GetTransactionStatus : public RequestBuilder { public: - GetTransactionStatus(LedgerImpl& ledger, + GetTransactionStatus(RewardsEngineImpl& engine, std::string&& token, std::string&& transaction_id); ~GetTransactionStatus() override; diff --git a/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets.cc b/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets.cc index c091efce084..a458657b674 100644 --- a/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets.cc +++ b/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/common/request_util.h" #include "brave/components/brave_rewards/core/common/security_util.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -80,8 +80,8 @@ Result PatchWallets::ProcessResponse(const mojom::UrlResponse& response) { } } -PatchWallets::PatchWallets(LedgerImpl& ledger, std::string&& geo_country) - : RequestBuilder(ledger), geo_country_(std::move(geo_country)) {} +PatchWallets::PatchWallets(RewardsEngineImpl& engine, std::string&& geo_country) + : RequestBuilder(engine), geo_country_(std::move(geo_country)) {} PatchWallets::~PatchWallets() = default; @@ -90,7 +90,7 @@ const char* PatchWallets::Path() const { } absl::optional PatchWallets::Url() const { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); return absl::nullopt; @@ -108,7 +108,7 @@ mojom::UrlMethod PatchWallets::Method() const { absl::optional> PatchWallets::Headers( const std::string& content) const { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); return absl::nullopt; diff --git a/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets.h b/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets.h index 62e3a7adf5e..941a77c7ab9 100644 --- a/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets.h +++ b/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger_endpoints.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_endpoints.mojom.h" #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" @@ -26,7 +26,7 @@ // Response body: - namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoints { @@ -43,7 +43,7 @@ class PatchWallets final : public RequestBuilder, public: static Result ProcessResponse(const mojom::UrlResponse&); - PatchWallets(LedgerImpl& ledger, std::string&& geo_country); + PatchWallets(RewardsEngineImpl& engine, std::string&& geo_country); ~PatchWallets() override; private: diff --git a/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets_unittest.cc b/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets_unittest.cc index 6a1ccc37171..826a2105cc7 100644 --- a/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets_unittest.cc +++ b/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets_unittest.cc @@ -11,8 +11,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -40,7 +40,7 @@ using PatchWalletsParamType = std::tuple< class PatchWallets : public TestWithParam { protected: void SetUp() override { - ON_CALL(*mock_ledger_impl_.mock_client(), + ON_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletBrave, _)) .WillByDefault([](const std::string&, auto callback) { std::string wallet = R"( @@ -54,13 +54,13 @@ class PatchWallets : public TestWithParam { } base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(PatchWallets, Paths) { const auto& [ignore, status_code, body, expected_result] = GetParam(); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([&](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -72,7 +72,7 @@ TEST_P(PatchWallets, Paths) { base::MockCallback> callback; EXPECT_CALL(callback, Run(Result(expected_result))).Times(1); - RequestFor(mock_ledger_impl_, "country_code") + RequestFor(mock_engine_impl_, "country_code") .Send(callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoints/post_commit_transaction/post_commit_transaction.cc b/components/brave_rewards/core/endpoints/post_commit_transaction/post_commit_transaction.cc index fa1302c2d10..8e7f801cb84 100644 --- a/components/brave_rewards/core/endpoints/post_commit_transaction/post_commit_transaction.cc +++ b/components/brave_rewards/core/endpoints/post_commit_transaction/post_commit_transaction.cc @@ -9,11 +9,11 @@ namespace brave_rewards::internal::endpoints { PostCommitTransaction::PostCommitTransaction( - LedgerImpl& ledger, + RewardsEngineImpl& engine, std::string&& token, std::string&& address, mojom::ExternalTransactionPtr transaction) - : RequestBuilder(ledger), + : RequestBuilder(engine), token_(std::move(token)), address_(std::move(address)), transaction_(std::move(transaction)) { diff --git a/components/brave_rewards/core/endpoints/post_commit_transaction/post_commit_transaction.h b/components/brave_rewards/core/endpoints/post_commit_transaction/post_commit_transaction.h index 742f38397e5..1c0bc36ebb8 100644 --- a/components/brave_rewards/core/endpoints/post_commit_transaction/post_commit_transaction.h +++ b/components/brave_rewards/core/endpoints/post_commit_transaction/post_commit_transaction.h @@ -11,13 +11,13 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoints { class PostCommitTransaction : public RequestBuilder { public: - PostCommitTransaction(LedgerImpl& ledger, + PostCommitTransaction(RewardsEngineImpl& engine, std::string&& token, std::string&& address, mojom::ExternalTransactionPtr); diff --git a/components/brave_rewards/core/endpoints/post_connect/bitflyer/post_connect_bitflyer.cc b/components/brave_rewards/core/endpoints/post_connect/bitflyer/post_connect_bitflyer.cc index 3d917a32ecf..e0addc09954 100644 --- a/components/brave_rewards/core/endpoints/post_connect/bitflyer/post_connect_bitflyer.cc +++ b/components/brave_rewards/core/endpoints/post_connect/bitflyer/post_connect_bitflyer.cc @@ -12,9 +12,9 @@ namespace brave_rewards::internal::endpoints { -PostConnectBitflyer::PostConnectBitflyer(LedgerImpl& ledger, +PostConnectBitflyer::PostConnectBitflyer(RewardsEngineImpl& engine, std::string&& linking_info) - : PostConnect(ledger), linking_info_(std::move(linking_info)) {} + : PostConnect(engine), linking_info_(std::move(linking_info)) {} PostConnectBitflyer::~PostConnectBitflyer() = default; diff --git a/components/brave_rewards/core/endpoints/post_connect/bitflyer/post_connect_bitflyer.h b/components/brave_rewards/core/endpoints/post_connect/bitflyer/post_connect_bitflyer.h index deef1f53324..73ece197c15 100644 --- a/components/brave_rewards/core/endpoints/post_connect/bitflyer/post_connect_bitflyer.h +++ b/components/brave_rewards/core/endpoints/post_connect/bitflyer/post_connect_bitflyer.h @@ -22,13 +22,13 @@ // Response body: - namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoints { class PostConnectBitflyer final : public PostConnect { public: - PostConnectBitflyer(LedgerImpl& ledger, std::string&& linking_info); + PostConnectBitflyer(RewardsEngineImpl& engine, std::string&& linking_info); ~PostConnectBitflyer() override; private: diff --git a/components/brave_rewards/core/endpoints/post_connect/gemini/post_connect_gemini.cc b/components/brave_rewards/core/endpoints/post_connect/gemini/post_connect_gemini.cc index 986afaed46e..051bdea9e95 100644 --- a/components/brave_rewards/core/endpoints/post_connect/gemini/post_connect_gemini.cc +++ b/components/brave_rewards/core/endpoints/post_connect/gemini/post_connect_gemini.cc @@ -12,10 +12,10 @@ namespace brave_rewards::internal::endpoints { -PostConnectGemini::PostConnectGemini(LedgerImpl& ledger, +PostConnectGemini::PostConnectGemini(RewardsEngineImpl& engine, std::string&& linking_info, std::string&& recipient_id) - : PostConnect(ledger), + : PostConnect(engine), linking_info_(std::move(linking_info)), recipient_id_(std::move(recipient_id)) {} diff --git a/components/brave_rewards/core/endpoints/post_connect/gemini/post_connect_gemini.h b/components/brave_rewards/core/endpoints/post_connect/gemini/post_connect_gemini.h index f0630aac58f..dad64a6bb51 100644 --- a/components/brave_rewards/core/endpoints/post_connect/gemini/post_connect_gemini.h +++ b/components/brave_rewards/core/endpoints/post_connect/gemini/post_connect_gemini.h @@ -23,13 +23,13 @@ // Response body: - namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoints { class PostConnectGemini final : public PostConnect { public: - PostConnectGemini(LedgerImpl& ledger, + PostConnectGemini(RewardsEngineImpl& engine, std::string&& linking_info, std::string&& recipient_id); ~PostConnectGemini() override; diff --git a/components/brave_rewards/core/endpoints/post_connect/post_connect.cc b/components/brave_rewards/core/endpoints/post_connect/post_connect.cc index 77b7fc11339..3b3b74041bc 100644 --- a/components/brave_rewards/core/endpoints/post_connect/post_connect.cc +++ b/components/brave_rewards/core/endpoints/post_connect/post_connect.cc @@ -11,7 +11,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/common/request_util.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -153,12 +153,12 @@ ConnectExternalWalletResult PostConnect::ToConnectExternalWalletResult( return {}; } -PostConnect::PostConnect(LedgerImpl& ledger) : RequestBuilder(ledger) {} +PostConnect::PostConnect(RewardsEngineImpl& engine) : RequestBuilder(engine) {} PostConnect::~PostConnect() = default; absl::optional PostConnect::Url() const { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); return absl::nullopt; @@ -172,7 +172,7 @@ absl::optional PostConnect::Url() const { absl::optional> PostConnect::Headers( const std::string& content) const { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); return absl::nullopt; diff --git a/components/brave_rewards/core/endpoints/post_connect/post_connect.h b/components/brave_rewards/core/endpoints/post_connect/post_connect.h index f38a158b3f0..91e98452ea1 100644 --- a/components/brave_rewards/core/endpoints/post_connect/post_connect.h +++ b/components/brave_rewards/core/endpoints/post_connect/post_connect.h @@ -9,16 +9,16 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger_endpoints.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_endpoints.mojom.h" #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/mojom_structs.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoints { @@ -36,7 +36,7 @@ class PostConnect : public RequestBuilder, public ResponseHandler { static ConnectExternalWalletResult ToConnectExternalWalletResult( const Result&); - explicit PostConnect(LedgerImpl& ledger); + explicit PostConnect(RewardsEngineImpl& engine); ~PostConnect() override; protected: diff --git a/components/brave_rewards/core/endpoints/post_connect/post_connect_unittest.cc b/components/brave_rewards/core/endpoints/post_connect/post_connect_unittest.cc index 04333393fe5..65146e66f84 100644 --- a/components/brave_rewards/core/endpoints/post_connect/post_connect_unittest.cc +++ b/components/brave_rewards/core/endpoints/post_connect/post_connect_unittest.cc @@ -11,8 +11,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoints/post_connect/post_connect.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -30,7 +30,7 @@ using Result = PostConnect::Result; class PostConnectMock final : public PostConnect { public: - explicit PostConnectMock(LedgerImpl& ledger) : PostConnect(ledger) {} + explicit PostConnectMock(RewardsEngineImpl& engine) : PostConnect(engine) {} ~PostConnectMock() override = default; private: @@ -49,7 +49,7 @@ using PostConnectParamType = std::tuple< class PostConnect : public TestWithParam { protected: void SetUp() override { - ON_CALL(*mock_ledger_impl_.mock_client(), + ON_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletBrave, _)) .WillByDefault([](const std::string&, auto callback) { std::move(callback).Run(R"( @@ -62,13 +62,13 @@ class PostConnect : public TestWithParam { } base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(PostConnect, Paths) { const auto& [ignore, status_code, body, expected_result] = GetParam(); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([&](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -80,7 +80,7 @@ TEST_P(PostConnect, Paths) { base::MockCallback> callback; EXPECT_CALL(callback, Run(Result(expected_result))).Times(1); - RequestFor(mock_ledger_impl_).Send(callback.Get()); + RequestFor(mock_engine_impl_).Send(callback.Get()); task_environment_.RunUntilIdle(); } diff --git a/components/brave_rewards/core/endpoints/post_connect/uphold/post_connect_uphold.cc b/components/brave_rewards/core/endpoints/post_connect/uphold/post_connect_uphold.cc index 1147673cd80..75277353a7a 100644 --- a/components/brave_rewards/core/endpoints/post_connect/uphold/post_connect_uphold.cc +++ b/components/brave_rewards/core/endpoints/post_connect/uphold/post_connect_uphold.cc @@ -10,13 +10,14 @@ #include "base/base64.h" #include "base/json/json_writer.h" #include "brave/components/brave_rewards/core/common/security_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" namespace brave_rewards::internal::endpoints { -PostConnectUphold::PostConnectUphold(LedgerImpl& ledger, std::string&& address) - : PostConnect(ledger), address_(std::move(address)) {} +PostConnectUphold::PostConnectUphold(RewardsEngineImpl& engine, + std::string&& address) + : PostConnect(engine), address_(std::move(address)) {} PostConnectUphold::~PostConnectUphold() = default; @@ -26,7 +27,7 @@ absl::optional PostConnectUphold::Content() const { return absl::nullopt; } - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); return absl::nullopt; diff --git a/components/brave_rewards/core/endpoints/post_connect/uphold/post_connect_uphold.h b/components/brave_rewards/core/endpoints/post_connect/uphold/post_connect_uphold.h index a69455fdbce..d668cf14e7f 100644 --- a/components/brave_rewards/core/endpoints/post_connect/uphold/post_connect_uphold.h +++ b/components/brave_rewards/core/endpoints/post_connect/uphold/post_connect_uphold.h @@ -41,13 +41,13 @@ // Response body: - namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoints { class PostConnectUphold final : public PostConnect { public: - PostConnectUphold(LedgerImpl& ledger, std::string&& address); + PostConnectUphold(RewardsEngineImpl& engine, std::string&& address); ~PostConnectUphold() override; private: diff --git a/components/brave_rewards/core/endpoints/post_create_transaction/post_create_transaction.cc b/components/brave_rewards/core/endpoints/post_create_transaction/post_create_transaction.cc index 0d595b7f0dc..e17d3f6e46e 100644 --- a/components/brave_rewards/core/endpoints/post_create_transaction/post_create_transaction.cc +++ b/components/brave_rewards/core/endpoints/post_create_transaction/post_create_transaction.cc @@ -9,11 +9,11 @@ namespace brave_rewards::internal::endpoints { PostCreateTransaction::PostCreateTransaction( - LedgerImpl& ledger, + RewardsEngineImpl& engine, std::string&& token, std::string&& address, mojom::ExternalTransactionPtr transaction) - : RequestBuilder(ledger), + : RequestBuilder(engine), token_(std::move(token)), address_(std::move(address)), transaction_(std::move(transaction)) { diff --git a/components/brave_rewards/core/endpoints/post_create_transaction/post_create_transaction.h b/components/brave_rewards/core/endpoints/post_create_transaction/post_create_transaction.h index 5081f072e30..20578c65f66 100644 --- a/components/brave_rewards/core/endpoints/post_create_transaction/post_create_transaction.h +++ b/components/brave_rewards/core/endpoints/post_create_transaction/post_create_transaction.h @@ -11,13 +11,13 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoints { class PostCreateTransaction : public RequestBuilder { public: - PostCreateTransaction(LedgerImpl& ledger, + PostCreateTransaction(RewardsEngineImpl& engine, std::string&& token, std::string&& address, mojom::ExternalTransactionPtr); diff --git a/components/brave_rewards/core/endpoints/post_wallets/post_wallets.cc b/components/brave_rewards/core/endpoints/post_wallets/post_wallets.cc index 4bf93e8eec2..2c655ff0238 100644 --- a/components/brave_rewards/core/endpoints/post_wallets/post_wallets.cc +++ b/components/brave_rewards/core/endpoints/post_wallets/post_wallets.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/common/request_util.h" #include "brave/components/brave_rewards/core/common/security_util.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -66,9 +66,9 @@ Result PostWallets::ProcessResponse(const mojom::UrlResponse& response) { } } -PostWallets::PostWallets(LedgerImpl& ledger, +PostWallets::PostWallets(RewardsEngineImpl& engine, absl::optional&& geo_country) - : RequestBuilder(ledger), geo_country_(std::move(geo_country)) {} + : RequestBuilder(engine), geo_country_(std::move(geo_country)) {} PostWallets::~PostWallets() = default; @@ -82,7 +82,7 @@ absl::optional PostWallets::Url() const { absl::optional> PostWallets::Headers( const std::string& content) const { - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet is null!"); return absl::nullopt; diff --git a/components/brave_rewards/core/endpoints/post_wallets/post_wallets.h b/components/brave_rewards/core/endpoints/post_wallets/post_wallets.h index 9afdf2e9b37..e86de81dbf5 100644 --- a/components/brave_rewards/core/endpoints/post_wallets/post_wallets.h +++ b/components/brave_rewards/core/endpoints/post_wallets/post_wallets.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger_endpoints.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_endpoints.mojom.h" #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" @@ -31,7 +31,7 @@ // clang-format on namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoints { @@ -48,7 +48,8 @@ class PostWallets final : public RequestBuilder, public: static Result ProcessResponse(const mojom::UrlResponse&); - PostWallets(LedgerImpl& ledger, absl::optional&& geo_country); + PostWallets(RewardsEngineImpl& engine, + absl::optional&& geo_country); ~PostWallets() override; private: diff --git a/components/brave_rewards/core/endpoints/post_wallets/post_wallets_unittest.cc b/components/brave_rewards/core/endpoints/post_wallets/post_wallets_unittest.cc index 1310111f555..78332deaf3d 100644 --- a/components/brave_rewards/core/endpoints/post_wallets/post_wallets_unittest.cc +++ b/components/brave_rewards/core/endpoints/post_wallets/post_wallets_unittest.cc @@ -11,8 +11,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoints/post_wallets/post_wallets.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -40,7 +40,7 @@ using PostWalletsParamType = std::tuple< class PostWallets : public TestWithParam { protected: void SetUp() override { - ON_CALL(*mock_ledger_impl_.mock_client(), + ON_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletBrave, _)) .WillByDefault([](const std::string&, auto callback) { std::string wallet = R"( @@ -54,13 +54,13 @@ class PostWallets : public TestWithParam { } base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(PostWallets, Paths) { const auto& [ignore, status_code, body, expected_result] = GetParam(); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([&](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -72,7 +72,7 @@ TEST_P(PostWallets, Paths) { base::MockCallback> callback; EXPECT_CALL(callback, Run(Result(expected_result))).Times(1); - RequestFor(mock_ledger_impl_, "geo_country") + RequestFor(mock_engine_impl_, "geo_country") .Send(callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/endpoints/request_builder.cc b/components/brave_rewards/core/endpoints/request_builder.cc index dd8e4c7e31a..e2f8122d9dd 100644 --- a/components/brave_rewards/core/endpoints/request_builder.cc +++ b/components/brave_rewards/core/endpoints/request_builder.cc @@ -31,7 +31,7 @@ absl::optional RequestBuilder::Request() const { ContentType(), SkipLog(), LoadFlags()); } -RequestBuilder::RequestBuilder(LedgerImpl& ledger) : ledger_(ledger) {} +RequestBuilder::RequestBuilder(RewardsEngineImpl& engine) : engine_(engine) {} mojom::UrlMethod RequestBuilder::Method() const { return mojom::UrlMethod::POST; diff --git a/components/brave_rewards/core/endpoints/request_builder.h b/components/brave_rewards/core/endpoints/request_builder.h index 586830052c0..4495d2e7b7e 100644 --- a/components/brave_rewards/core/endpoints/request_builder.h +++ b/components/brave_rewards/core/endpoints/request_builder.h @@ -14,7 +14,7 @@ #include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoints { @@ -27,7 +27,7 @@ class RequestBuilder { absl::optional Request() const; protected: - explicit RequestBuilder(LedgerImpl& ledger); + explicit RequestBuilder(RewardsEngineImpl& engine); virtual absl::optional Url() const = 0; @@ -44,7 +44,7 @@ class RequestBuilder { virtual uint32_t LoadFlags() const; - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace endpoints diff --git a/components/brave_rewards/core/endpoints/request_for.h b/components/brave_rewards/core/endpoints/request_for.h index e9b80f548b9..bca1badca2c 100644 --- a/components/brave_rewards/core/endpoints/request_for.h +++ b/components/brave_rewards/core/endpoints/request_for.h @@ -13,8 +13,8 @@ #include "base/memory/raw_ref.h" #include "base/task/sequenced_task_runner.h" #include "brave/components/brave_rewards/core/endpoints/request_builder.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/logging/logging.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal::endpoints { @@ -31,9 +31,9 @@ template class RequestFor { public: template - RequestFor(LedgerImpl& ledger, Ts&&... ts) - : ledger_(ledger), - request_(Endpoint(ledger, std::forward(ts)...).Request()) { + RequestFor(RewardsEngineImpl& engine, Ts&&... ts) + : engine_(engine), + request_(Endpoint(engine, std::forward(ts)...).Request()) { static_assert(std::is_base_of_v, "Endpoint should be derived from RequestBuilder!"); } @@ -60,12 +60,12 @@ class RequestFor { return; } - ledger_->LoadURL(std::move(*request_), base::BindOnce(&Endpoint::OnResponse, + engine_->LoadURL(std::move(*request_), base::BindOnce(&Endpoint::OnResponse, std::move(callback))); } private: - const raw_ref ledger_; + const raw_ref engine_; absl::optional request_; }; diff --git a/components/brave_rewards/core/endpoints/uphold/get_transaction_status/get_transaction_status_uphold.h b/components/brave_rewards/core/endpoints/uphold/get_transaction_status/get_transaction_status_uphold.h index 84bfc2feb72..3abd137d3c9 100644 --- a/components/brave_rewards/core/endpoints/uphold/get_transaction_status/get_transaction_status_uphold.h +++ b/components/brave_rewards/core/endpoints/uphold/get_transaction_status/get_transaction_status_uphold.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger_endpoints.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_endpoints.mojom.h" #include "brave/components/brave_rewards/core/endpoints/get_transaction_status/get_transaction_status.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/components/brave_rewards/core/endpoints/uphold/get_transaction_status/get_transaction_status_uphold_unittest.cc b/components/brave_rewards/core/endpoints/uphold/get_transaction_status/get_transaction_status_uphold_unittest.cc index 22ae3a9a16e..b991f5f46eb 100644 --- a/components/brave_rewards/core/endpoints/uphold/get_transaction_status/get_transaction_status_uphold_unittest.cc +++ b/components/brave_rewards/core/endpoints/uphold/get_transaction_status/get_transaction_status_uphold_unittest.cc @@ -11,8 +11,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/endpoints/uphold/get_transaction_status/get_transaction_status_uphold.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,13 +39,13 @@ class GetTransactionStatusUphold : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(GetTransactionStatusUphold, Paths) { const auto& [ignore, status_code, body, expected_result] = GetParam(); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([&](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -57,7 +57,7 @@ TEST_P(GetTransactionStatusUphold, Paths) { base::MockCallback> callback; EXPECT_CALL(callback, Run(Result(expected_result))).Times(1); - RequestFor(mock_ledger_impl_, "token", + RequestFor(mock_engine_impl_, "token", "transaction_id") .Send(callback.Get()); diff --git a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction/post_commit_transaction_uphold.cc b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction/post_commit_transaction_uphold.cc index 4d5be0e187b..a12d8c32fe3 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction/post_commit_transaction_uphold.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction/post_commit_transaction_uphold.cc @@ -9,7 +9,7 @@ #include "base/json/json_reader.h" #include "base/strings/stringprintf.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" #include "net/http/http_status_code.h" diff --git a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction/post_commit_transaction_uphold.h b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction/post_commit_transaction_uphold.h index 57279ab367b..86df57e86d6 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction/post_commit_transaction_uphold.h +++ b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction/post_commit_transaction_uphold.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger_endpoints.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_endpoints.mojom.h" #include "brave/components/brave_rewards/core/endpoints/post_commit_transaction/post_commit_transaction.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction/post_commit_transaction_uphold_unittest.cc b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction/post_commit_transaction_uphold_unittest.cc index bb1a3c7fe24..a9f0369fc64 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction/post_commit_transaction_uphold_unittest.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction/post_commit_transaction_uphold_unittest.cc @@ -11,8 +11,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/endpoints/uphold/post_commit_transaction/post_commit_transaction_uphold.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,13 +39,13 @@ class PostCommitTransactionUphold : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(PostCommitTransactionUphold, Paths) { const auto& [ignore, status_code, body, expected_result] = GetParam(); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([&](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -58,7 +58,7 @@ TEST_P(PostCommitTransactionUphold, Paths) { EXPECT_CALL(callback, Run(Result(expected_result))).Times(1); RequestFor( - mock_ledger_impl_, "token", "address", + mock_engine_impl_, "token", "address", mojom::ExternalTransaction::New("transaction_id", "contribution_id", "destination", "amount")) .Send(callback.Get()); diff --git a/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold.cc b/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold.cc index 21a97828caa..c1ac6725e93 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold.cc @@ -10,7 +10,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" #include "net/http/http_status_code.h" diff --git a/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold.h b/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold.h index 5bdcc8a643f..2a8fdf0e889 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold.h +++ b/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger_endpoints.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_endpoints.mojom.h" #include "brave/components/brave_rewards/core/endpoints/post_create_transaction/post_create_transaction.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold_unittest.cc b/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold_unittest.cc index 3200f3433d4..8e9fbd659d8 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold_unittest.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold_unittest.cc @@ -11,8 +11,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,13 +39,13 @@ class PostCreateTransactionUphold : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(PostCreateTransactionUphold, Paths) { const auto& [ignore, status_code, body, expected_result] = GetParam(); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([&](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -58,7 +58,7 @@ TEST_P(PostCreateTransactionUphold, Paths) { EXPECT_CALL(callback, Run(Result(expected_result))).Times(1); RequestFor( - mock_ledger_impl_, "token", "address", + mock_engine_impl_, "token", "address", mojom::ExternalTransaction::New("", "contribution_id", "destination", "amount")) .Send(callback.Get()); diff --git a/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold.cc b/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold.cc index b24005eefe2..bd88d2a2147 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold.cc @@ -8,7 +8,7 @@ #include #include "base/json/json_reader.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" #include "net/http/http_status_code.h" @@ -47,8 +47,8 @@ Result PostOAuthUphold::ProcessResponse(const mojom::UrlResponse& response) { } } -PostOAuthUphold::PostOAuthUphold(LedgerImpl& ledger, std::string&& code) - : RequestBuilder(ledger), code_(std::move(code)) {} +PostOAuthUphold::PostOAuthUphold(RewardsEngineImpl& engine, std::string&& code) + : RequestBuilder(engine), code_(std::move(code)) {} PostOAuthUphold::~PostOAuthUphold() = default; diff --git a/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold.h b/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold.h index 741c91e4701..f37238653cd 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold.h +++ b/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger_endpoints.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_endpoints.mojom.h" #include "brave/components/brave_rewards/core/endpoints/request_builder.h" #include "brave/components/brave_rewards/core/endpoints/response_handler.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" @@ -31,7 +31,7 @@ // clang-format on namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace endpoints { @@ -48,7 +48,7 @@ class PostOAuthUphold final : public RequestBuilder, public: static Result ProcessResponse(const mojom::UrlResponse&); - PostOAuthUphold(LedgerImpl& ledger, std::string&& code); + PostOAuthUphold(RewardsEngineImpl& engine, std::string&& code); ~PostOAuthUphold() override; private: diff --git a/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold_unittest.cc b/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold_unittest.cc index daec49afb26..bd4f7d72129 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold_unittest.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold_unittest.cc @@ -11,8 +11,8 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,13 +39,13 @@ using PostOAuthUpholdParamType = std::tuple< class PostOAuthUphold : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(PostOAuthUphold, Paths) { const auto& [ignore, status_code, body, expected_result] = GetParam(); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([&](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -58,7 +58,7 @@ TEST_P(PostOAuthUphold, Paths) { EXPECT_CALL(callback, Run(Result(expected_result))).Times(1); RequestFor( - mock_ledger_impl_, "bb50f9d4782fb86a4302ef18179033abb17c257f") + mock_engine_impl_, "bb50f9d4782fb86a4302ef18179033abb17c257f") .Send(callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/gemini/gemini.cc b/components/brave_rewards/core/gemini/gemini.cc index d675074d26e..d5a179861e7 100644 --- a/components/brave_rewards/core/gemini/gemini.cc +++ b/components/brave_rewards/core/gemini/gemini.cc @@ -14,7 +14,7 @@ #include "brave/components/brave_rewards/core/gemini/gemini.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" #include "brave/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.h" @@ -24,12 +24,12 @@ namespace brave_rewards::internal::gemini { -Gemini::Gemini(LedgerImpl& ledger) - : ledger_(ledger), - connect_wallet_(ledger), - get_wallet_(ledger), - transfer_(ledger), - gemini_server_(ledger) {} +Gemini::Gemini(RewardsEngineImpl& engine) + : engine_(engine), + connect_wallet_(engine), + get_wallet_(engine), + transfer_(engine), + gemini_server_(engine) {} Gemini::~Gemini() = default; @@ -50,7 +50,7 @@ void Gemini::StartContribution(const std::string& contribution_id, LegacyResultCallback callback) { if (!info) { BLOG(0, "Publisher info is null"); - return callback(mojom::Result::LEDGER_ERROR); + return callback(mojom::Result::FAILED); } const double fee = amount * 0.05; @@ -66,11 +66,11 @@ void Gemini::ContributionCompleted(LegacyResultCallback callback, double fee, const std::string& publisher_key, mojom::Result result) { - if (result == mojom::Result::LEDGER_OK) { + if (result == mojom::Result::OK) { SaveTransferFee(contribution_id, fee); if (!publisher_key.empty()) { - ledger_->database()->UpdateContributionInfoContributedAmount( + engine_->database()->UpdateContributionInfoContributedAmount( contribution_id, publisher_key, callback); return; } @@ -82,7 +82,7 @@ void Gemini::ContributionCompleted(LegacyResultCallback callback, void Gemini::FetchBalance(FetchBalanceCallback callback) { auto wallet = GetWalletIf({mojom::WalletStatus::kConnected}); if (!wallet) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR, 0.0); + return std::move(callback).Run(mojom::Result::FAILED, 0.0); } auto url_callback = base::BindOnce( @@ -95,26 +95,26 @@ void Gemini::OnFetchBalance(FetchBalanceCallback callback, const mojom::Result result, const double available) { if (!GetWalletIf({mojom::WalletStatus::kConnected})) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR, 0.0); + return std::move(callback).Run(mojom::Result::FAILED, 0.0); } if (result == mojom::Result::EXPIRED_TOKEN) { BLOG(0, "Expired token"); if (!LogOutWallet()) { BLOG(0, "Failed to disconnect " << constant::kWalletGemini << " wallet!"); - return std::move(callback).Run(mojom::Result::LEDGER_ERROR, 0.0); + return std::move(callback).Run(mojom::Result::FAILED, 0.0); } return std::move(callback).Run(mojom::Result::EXPIRED_TOKEN, 0.0); } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Couldn't get balance"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, 0.0); + std::move(callback).Run(mojom::Result::FAILED, 0.0); return; } - std::move(callback).Run(mojom::Result::LEDGER_OK, available); + std::move(callback).Run(mojom::Result::OK, available); } void Gemini::TransferFunds(double amount, @@ -169,7 +169,7 @@ void Gemini::StartTransferFeeTimer(const std::string& fee_id, void Gemini::OnTransferFeeCompleted(const std::string& contribution_id, int attempts, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { if (attempts < 3) { BLOG(0, "Transaction fee failed, retrying"); StartTransferFeeTimer(contribution_id, attempts + 1); @@ -210,20 +210,20 @@ void Gemini::OnTransferFeeTimerElapsed(const std::string& id, } mojom::ExternalWalletPtr Gemini::GetWallet() { - return wallet::GetWallet(*ledger_, constant::kWalletGemini); + return wallet::GetWallet(*engine_, constant::kWalletGemini); } mojom::ExternalWalletPtr Gemini::GetWalletIf( const std::set& statuses) { - return wallet::GetWalletIf(*ledger_, constant::kWalletGemini, statuses); + return wallet::GetWalletIf(*engine_, constant::kWalletGemini, statuses); } bool Gemini::SetWallet(mojom::ExternalWalletPtr wallet) { - return wallet::SetWallet(*ledger_, std::move(wallet)); + return wallet::SetWallet(*engine_, std::move(wallet)); } bool Gemini::LogOutWallet() { - return wallet::LogOutWallet(*ledger_, constant::kWalletGemini); + return wallet::LogOutWallet(*engine_, constant::kWalletGemini); } void Gemini::RemoveTransferFee(const std::string& contribution_id) { diff --git a/components/brave_rewards/core/gemini/gemini.h b/components/brave_rewards/core/gemini/gemini.h index f17e65c76ec..efecfd4ae6f 100644 --- a/components/brave_rewards/core/gemini/gemini.h +++ b/components/brave_rewards/core/gemini/gemini.h @@ -17,13 +17,13 @@ #include "base/memory/raw_ref.h" #include "base/timer/timer.h" #include "brave/components/brave_rewards/core/endpoint/gemini/gemini_server.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.h" #include "brave/components/brave_rewards/core/wallet_provider/gemini/gemini_transfer.h" #include "brave/components/brave_rewards/core/wallet_provider/gemini/get_gemini_wallet.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace gemini { @@ -31,7 +31,7 @@ using FetchBalanceCallback = base::OnceCallback; class Gemini { public: - explicit Gemini(LedgerImpl& ledger); + explicit Gemini(RewardsEngineImpl& engine); ~Gemini(); @@ -87,7 +87,7 @@ class Gemini { void RemoveTransferFee(const std::string& contribution_id); - const raw_ref ledger_; + const raw_ref engine_; ConnectGeminiWallet connect_wallet_; GetGeminiWallet get_wallet_; GeminiTransfer transfer_; diff --git a/components/brave_rewards/core/gemini/gemini_util.cc b/components/brave_rewards/core/gemini/gemini_util.cc index 117db9f41b9..eaa36990b33 100644 --- a/components/brave_rewards/core/gemini/gemini_util.cc +++ b/components/brave_rewards/core/gemini/gemini_util.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/buildflags.h" #include "brave/components/brave_rewards/core/common/random_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { @@ -131,10 +131,10 @@ mojom::Result CheckStatusCode(int status_code) { } if (status_code != net::HTTP_OK) { - return mojom::Result::LEDGER_ERROR; + return mojom::Result::FAILED; } - return mojom::Result::LEDGER_OK; + return mojom::Result::OK; } } // namespace brave_rewards::internal::endpoint::gemini diff --git a/components/brave_rewards/core/gemini/gemini_util.h b/components/brave_rewards/core/gemini/gemini_util.h index 1228b570adb..7d3f4d4502e 100644 --- a/components/brave_rewards/core/gemini/gemini_util.h +++ b/components/brave_rewards/core/gemini/gemini_util.h @@ -9,8 +9,8 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger.mojom.h" -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom.h" namespace brave_rewards::internal::gemini { diff --git a/components/brave_rewards/core/gemini/gemini_util_unittest.cc b/components/brave_rewards/core/gemini/gemini_util_unittest.cc index 366d560d014..1b6b8e5f057 100644 --- a/components/brave_rewards/core/gemini/gemini_util_unittest.cc +++ b/components/brave_rewards/core/gemini/gemini_util_unittest.cc @@ -14,11 +14,11 @@ #include "brave/components/brave_rewards/core/common/random_util.h" #include "brave/components/brave_rewards/core/gemini/gemini.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" -#include "brave/components/brave_rewards/core/test/test_ledger_client.h" +#include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" #include "net/http/http_status_code.h" #include "testing/gmock/include/gmock/gmock.h" @@ -98,18 +98,18 @@ TEST_F(GeminiUtilTest, GetOauthServerUrl) { TEST_F(GeminiUtilTest, GetWallet) { base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; // no wallet - ON_CALL(*mock_ledger_impl_.mock_client(), + ON_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletGemini, _)) .WillByDefault([](const std::string&, auto callback) { std::move(callback).Run(""); }); - auto result = mock_ledger_impl_.gemini()->GetWallet(); + auto result = mock_engine_impl_.gemini()->GetWallet(); EXPECT_FALSE(result); - ON_CALL(*mock_ledger_impl_.mock_client(), + ON_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletGemini, _)) .WillByDefault([](const std::string&, auto callback) { std::string wallet = FakeEncryption::Base64EncryptString(R"({ @@ -126,7 +126,7 @@ TEST_F(GeminiUtilTest, GetWallet) { }); // Gemini wallet - result = mock_ledger_impl_.gemini()->GetWallet(); + result = mock_engine_impl_.gemini()->GetWallet(); EXPECT_TRUE(result); EXPECT_EQ(result->address, "2323dff2ba-d0d1-4dfw-8e56-a2605bcaf4af"); EXPECT_EQ(result->user_name, "test"); @@ -217,9 +217,8 @@ TEST_F(GeminiUtilTest, CheckStatusCodeTest) { EXPECT_EQ(endpoint::gemini::CheckStatusCode(net::HTTP_NOT_FOUND), mojom::Result::NOT_FOUND); EXPECT_EQ(endpoint::gemini::CheckStatusCode(net::HTTP_BAD_REQUEST), - mojom::Result::LEDGER_ERROR); - EXPECT_EQ(endpoint::gemini::CheckStatusCode(net::HTTP_OK), - mojom::Result::LEDGER_OK); + mojom::Result::FAILED); + EXPECT_EQ(endpoint::gemini::CheckStatusCode(net::HTTP_OK), mojom::Result::OK); } } // namespace brave_rewards::internal::gemini diff --git a/components/brave_rewards/core/ledger_impl_mock.cc b/components/brave_rewards/core/ledger_impl_mock.cc deleted file mode 100644 index 1f4d72216f7..00000000000 --- a/components/brave_rewards/core/ledger_impl_mock.cc +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" -#include "brave/components/brave_rewards/common/mojom/bat_ledger.mojom-test-utils.h" - -using ::testing::_; -using ::testing::Return; - -namespace brave_rewards::internal { - -AddMockLedgerClient::AddMockLedgerClient() = default; - -AddMockLedgerClient::~AddMockLedgerClient() = default; - -MockLedgerImpl::MockLedgerImpl() - : LedgerImpl(mock_ledger_client_receiver_ - .BindNewEndpointAndPassDedicatedRemote()) { - ON_CALL(*this, InitializeDatabase(_)) - .WillByDefault([](LegacyResultCallback callback) { - callback(mojom::Result::LEDGER_OK); - }); - ON_CALL(*this, database()).WillByDefault(Return(&mock_database_)); - - const auto result = mojom::LedgerAsyncWaiter(this).Initialize(); - DCHECK(result == mojom::Result::LEDGER_OK); -} - -MockLedgerImpl::~MockLedgerImpl() = default; - -MockLedgerClient* MockLedgerImpl::mock_client() { - return &mock_ledger_client_; -} - -database::MockDatabase* MockLedgerImpl::mock_database() { - return &mock_database_; -} - -} // namespace brave_rewards::internal diff --git a/components/brave_rewards/core/ledger_impl_mock.h b/components/brave_rewards/core/ledger_impl_mock.h deleted file mode 100644 index 543bae02feb..00000000000 --- a/components/brave_rewards/core/ledger_impl_mock.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_IMPL_MOCK_H_ -#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_IMPL_MOCK_H_ - -#include "brave/components/brave_rewards/core/database/database_mock.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" -#include "mojo/public/cpp/bindings/associated_receiver.h" -#include "testing/gmock/include/gmock/gmock.h" - -namespace brave_rewards::internal { - -class AddMockLedgerClient { - protected: - AddMockLedgerClient(); - - ~AddMockLedgerClient(); - - MockLedgerClient mock_ledger_client_; - mojo::AssociatedReceiver mock_ledger_client_receiver_{ - &mock_ledger_client_}; -}; - -class MockLedgerImpl : private AddMockLedgerClient, public LedgerImpl { - public: - MockLedgerImpl(); - - ~MockLedgerImpl() override; - - MockLedgerClient* mock_client(); - - database::MockDatabase* mock_database(); - - MOCK_METHOD1(InitializeDatabase, void(LegacyResultCallback)); - - MOCK_METHOD0(database, database::Database*()); - - private: - database::MockDatabase mock_database_{*this}; -}; - -} // namespace brave_rewards::internal - -#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_IMPL_MOCK_H_ diff --git a/components/brave_rewards/core/legacy/bat_helper.cc b/components/brave_rewards/core/legacy/bat_helper.cc index 0ab2787d8d8..7b1221aafd1 100644 --- a/components/brave_rewards/core/legacy/bat_helper.cc +++ b/components/brave_rewards/core/legacy/bat_helper.cc @@ -17,9 +17,9 @@ #include "base/strings/stringprintf.h" #include "base/values.h" #include "brave/components/brave_rewards/core/constants.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/legacy/bat_helper.h" #include "brave/components/brave_rewards/core/logging/logging.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "third_party/re2/src/re2/re2.h" #include "tweetnacl.h" // NOLINT #include "url/gurl.h" diff --git a/components/brave_rewards/core/legacy/bat_state.cc b/components/brave_rewards/core/legacy/bat_state.cc index b77d42ab8d2..ea57d97fbc7 100644 --- a/components/brave_rewards/core/legacy/bat_state.cc +++ b/components/brave_rewards/core/legacy/bat_state.cc @@ -7,29 +7,29 @@ #include #include "brave/components/brave_rewards/core/common/time_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/legacy/bat_helper.h" #include "brave/components/brave_rewards/core/legacy/bat_state.h" #include "brave/components/brave_rewards/core/legacy/client_properties.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; using std::placeholders::_2; namespace brave_rewards::internal { -LegacyBatState::LegacyBatState(LedgerImpl& ledger) : ledger_(ledger) {} +LegacyBatState::LegacyBatState(RewardsEngineImpl& engine) : engine_(engine) {} LegacyBatState::~LegacyBatState() = default; void LegacyBatState::Load(LegacyResultCallback callback) { - ledger_->client()->LoadLedgerState(base::BindOnce( + engine_->client()->LoadLegacyState(base::BindOnce( &LegacyBatState::OnLoad, base::Unretained(this), std::move(callback))); } void LegacyBatState::OnLoad(LegacyResultCallback callback, mojom::Result result, const std::string& data) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { callback(result); return; } @@ -38,7 +38,7 @@ void LegacyBatState::OnLoad(LegacyResultCallback callback, if (!state.FromJson(data)) { BLOG(0, "Failed to load client state"); BLOG(6, "Client state contents: " << data); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } @@ -54,7 +54,7 @@ void LegacyBatState::OnLoad(LegacyResultCallback callback, state_.boot_timestamp = state_.boot_timestamp / 1000; } - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } bool LegacyBatState::GetRewardsMainEnabled() const { diff --git a/components/brave_rewards/core/legacy/bat_state.h b/components/brave_rewards/core/legacy/bat_state.h index 1f7b8386cf0..3d0928c2280 100644 --- a/components/brave_rewards/core/legacy/bat_state.h +++ b/components/brave_rewards/core/legacy/bat_state.h @@ -11,17 +11,17 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/legacy/client_properties.h" #include "brave/components/brave_rewards/core/legacy/wallet_info_properties.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; class LegacyBatState { public: - explicit LegacyBatState(LedgerImpl& ledger); + explicit LegacyBatState(RewardsEngineImpl& engine); ~LegacyBatState(); void Load(LegacyResultCallback callback); @@ -51,7 +51,7 @@ class LegacyBatState { mojom::Result result, const std::string& data); - const raw_ref ledger_; + const raw_ref engine_; ClientProperties state_; }; diff --git a/components/brave_rewards/core/legacy/media/github.cc b/components/brave_rewards/core/legacy/media/github.cc index 0aff1ad8e4c..6c504bbe9b0 100644 --- a/components/brave_rewards/core/legacy/media/github.cc +++ b/components/brave_rewards/core/legacy/media/github.cc @@ -14,10 +14,10 @@ #include "base/strings/utf_string_conversions.h" #include "brave/components/brave_rewards/core/constants.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/legacy/media/github.h" #include "brave/components/brave_rewards/core/legacy/static_values.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" #include "net/http/http_status_code.h" @@ -27,7 +27,7 @@ using std::placeholders::_3; namespace brave_rewards::internal { -GitHub::GitHub(LedgerImpl& ledger) : ledger_(ledger) {} +GitHub::GitHub(RewardsEngineImpl& engine) : engine_(engine) {} GitHub::~GitHub() = default; @@ -208,7 +208,7 @@ void GitHub::ProcessActivityFromUrl(uint64_t window_id, return; } - ledger_->database()->GetMediaPublisherInfo( + engine_->database()->GetMediaPublisherInfo( media_key, std::bind(&GitHub::OnMediaPublisherActivity, this, _1, _2, window_id, visit_data, media_key)); } @@ -235,8 +235,7 @@ void GitHub::OnMediaPublisherActivity(mojom::Result result, uint64_t window_id, const mojom::VisitData& visit_data, const std::string& media_key) { - if (result != mojom::Result::LEDGER_OK && - result != mojom::Result::NOT_FOUND) { + if (result != mojom::Result::OK && result != mojom::Result::NOT_FOUND) { OnMediaActivityError(window_id); return; } @@ -266,7 +265,7 @@ void GitHub::OnMediaActivityError(uint64_t window_id) { new_visit_data.path = "/"; new_visit_data.name = name; - ledger_->publisher()->GetPublisherActivityFromUrl( + engine_->publisher()->GetPublisherActivityFromUrl( window_id, mojom::VisitData::New(new_visit_data), ""); } @@ -274,10 +273,10 @@ void GitHub::OnMediaActivityError(uint64_t window_id) { void GitHub::GetPublisherPanelInfo(uint64_t window_id, const mojom::VisitData& visit_data, const std::string& publisher_key) { - auto filter = ledger_->publisher()->CreateActivityFilter( + auto filter = engine_->publisher()->CreateActivityFilter( publisher_key, mojom::ExcludeFilter::FILTER_ALL, false, - ledger_->state()->GetReconcileStamp(), true, false); - ledger_->database()->GetPanelPublisherInfo( + engine_->state()->GetReconcileStamp(), true, false); + engine_->database()->GetPanelPublisherInfo( std::move(filter), std::bind(&GitHub::OnPublisherPanelInfo, this, window_id, visit_data, publisher_key, _1, _2)); @@ -296,7 +295,7 @@ void GitHub::OnPublisherPanelInfo(uint64_t window_id, std::bind(&GitHub::OnUserPage, this, 0, window_id, visit_data, _1); FetchDataFromUrl(url, url_callback); } else { - ledger_->client()->OnPanelPublisherInfo(result, std::move(info), window_id); + engine_->client()->OnPanelPublisherInfo(result, std::move(info), window_id); } } @@ -305,7 +304,7 @@ void GitHub::FetchDataFromUrl(const std::string& url, auto request = mojom::UrlRequest::New(); request->url = url; request->skip_log = true; - ledger_->LoadURL(std::move(request), callback); + engine_->LoadURL(std::move(request), callback); } void GitHub::OnUserPage(const uint64_t duration, @@ -339,7 +338,7 @@ void GitHub::SavePublisherInfo(const uint64_t duration, const std::string media_key = GetMediaKey(screen_name); if (publisher_key.empty()) { - callback(mojom::Result::LEDGER_ERROR, nullptr); + callback(mojom::Result::FAILED, nullptr); BLOG(0, "Publisher key is missing"); return; } @@ -352,11 +351,11 @@ void GitHub::SavePublisherInfo(const uint64_t duration, visit_data.favicon_url = profile_picture; visit_data.name = publisher_name; - ledger_->publisher()->SaveVisit(publisher_key, visit_data, duration, true, + engine_->publisher()->SaveVisit(publisher_key, visit_data, duration, true, window_id, callback); if (!media_key.empty()) { - ledger_->database()->SaveMediaPublisherInfo(media_key, publisher_key, + engine_->database()->SaveMediaPublisherInfo(media_key, publisher_key, [](const mojom::Result) {}); } } @@ -369,9 +368,8 @@ void GitHub::OnMediaPublisherInfo(uint64_t window_id, PublisherInfoCallback callback, mojom::Result result, mojom::PublisherInfoPtr publisher_info) { - if (result != mojom::Result::LEDGER_OK && - result != mojom::Result::NOT_FOUND) { - callback(mojom::Result::LEDGER_ERROR, nullptr); + if (result != mojom::Result::OK && result != mojom::Result::NOT_FOUND) { + callback(mojom::Result::FAILED, nullptr); return; } @@ -399,7 +397,7 @@ void GitHub::OnMetaDataGet(PublisherInfoCallback callback, const std::string publisher_name = GetPublisherName(response->body); const std::string profile_picture = GetProfileImageURL(response->body); - ledger_->database()->GetMediaPublisherInfo( + engine_->database()->GetMediaPublisherInfo( media_key, std::bind(&GitHub::OnMediaPublisherInfo, this, 0, user_id, user_name, publisher_name, profile_picture, callback, _1, _2)); @@ -416,6 +414,6 @@ void GitHub::SaveMediaInfo(const base::flat_map& data, auto request = mojom::UrlRequest::New(); request->url = url; request->skip_log = true; - ledger_->LoadURL(std::move(request), url_callback); + engine_->LoadURL(std::move(request), url_callback); } } // namespace brave_rewards::internal diff --git a/components/brave_rewards/core/legacy/media/github.h b/components/brave_rewards/core/legacy/media/github.h index 5d23ebf5bcf..5103ae5491a 100644 --- a/components/brave_rewards/core/legacy/media/github.h +++ b/components/brave_rewards/core/legacy/media/github.h @@ -14,16 +14,16 @@ #include "base/containers/flat_map.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/legacy/media/helper.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; class GitHub { public: - explicit GitHub(LedgerImpl& ledger); + explicit GitHub(RewardsEngineImpl& engine); static std::string GetLinkType(const std::string& url); @@ -127,7 +127,7 @@ class GitHub { FRIEND_TEST_ALL_PREFIXES(MediaGitHubTest, GetJSONStringValue); FRIEND_TEST_ALL_PREFIXES(MediaGitHubTest, GetJSONIntValue); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace brave_rewards::internal #endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEGACY_MEDIA_GITHUB_H_ diff --git a/components/brave_rewards/core/legacy/media/github_unittest.cc b/components/brave_rewards/core/legacy/media/github_unittest.cc index 6c5a6b3b35b..f4e0fd5afae 100644 --- a/components/brave_rewards/core/legacy/media/github_unittest.cc +++ b/components/brave_rewards/core/legacy/media/github_unittest.cc @@ -6,9 +6,9 @@ #include #include "brave/components/brave_rewards/core/constants.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/legacy/media/github.h" #include "brave/components/brave_rewards/core/legacy/static_values.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "testing/gtest/include/gtest/gtest.h" // npm run test -- brave_unit_tests --filter=MediaGitHubTest.* diff --git a/components/brave_rewards/core/legacy/media/helper_unittest.cc b/components/brave_rewards/core/legacy/media/helper_unittest.cc index b1cdd223792..7fdcb0cbfbb 100644 --- a/components/brave_rewards/core/legacy/media/helper_unittest.cc +++ b/components/brave_rewards/core/legacy/media/helper_unittest.cc @@ -5,8 +5,8 @@ #include -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/legacy/media/helper.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "testing/gtest/include/gtest/gtest.h" // npm run test -- brave_unit_tests --filter=MediaHelperTest.* diff --git a/components/brave_rewards/core/legacy/media/media.cc b/components/brave_rewards/core/legacy/media/media.cc index 55f26687065..ac36f0b3b48 100644 --- a/components/brave_rewards/core/legacy/media/media.cc +++ b/components/brave_rewards/core/legacy/media/media.cc @@ -6,16 +6,16 @@ #include #include "base/containers/flat_map.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/legacy/media/media.h" #include "brave/components/brave_rewards/core/legacy/static_values.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "build/build_config.h" namespace brave_rewards::internal { -Media::Media(LedgerImpl& ledger) - : ledger_(ledger), media_youtube_(ledger), media_github_(ledger) {} +Media::Media(RewardsEngineImpl& engine) + : engine_(engine), media_youtube_(engine), media_github_(engine) {} Media::~Media() = default; @@ -84,7 +84,7 @@ void Media::OnMediaActivityError(mojom::VisitDataPtr visit_data, visit_data->path = "/"; visit_data->name = name; - ledger_->publisher()->GetPublisherActivityFromUrl(window_id, + engine_->publisher()->GetPublisherActivityFromUrl(window_id, std::move(visit_data), ""); } diff --git a/components/brave_rewards/core/legacy/media/media.h b/components/brave_rewards/core/legacy/media/media.h index f9b7668766b..8ba1dd108fe 100644 --- a/components/brave_rewards/core/legacy/media/media.h +++ b/components/brave_rewards/core/legacy/media/media.h @@ -10,17 +10,17 @@ #include "base/containers/flat_map.h" #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/legacy/media/github.h" #include "brave/components/brave_rewards/core/legacy/media/youtube.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; class Media { public: - explicit Media(LedgerImpl& ledger); + explicit Media(RewardsEngineImpl& engine); ~Media(); @@ -50,7 +50,7 @@ class Media { const std::string& type, uint64_t windowId); - const raw_ref ledger_; + const raw_ref engine_; YouTube media_youtube_; GitHub media_github_; }; diff --git a/components/brave_rewards/core/legacy/media/youtube.cc b/components/brave_rewards/core/legacy/media/youtube.cc index 88e9484f9ca..39dfec97644 100644 --- a/components/brave_rewards/core/legacy/media/youtube.cc +++ b/components/brave_rewards/core/legacy/media/youtube.cc @@ -10,12 +10,12 @@ #include "base/strings/escape.h" #include "base/strings/string_split.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/legacy/bat_helper.h" #include "brave/components/brave_rewards/core/legacy/media/helper.h" #include "brave/components/brave_rewards/core/legacy/media/youtube.h" #include "brave/components/brave_rewards/core/legacy/static_values.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" #include "net/http/http_status_code.h" @@ -25,7 +25,7 @@ using std::placeholders::_3; namespace brave_rewards::internal { -YouTube::YouTube(LedgerImpl& ledger) : ledger_(ledger) {} +YouTube::YouTube(RewardsEngineImpl& engine) : engine_(engine) {} YouTube::~YouTube() = default; @@ -281,7 +281,7 @@ void YouTube::OnMediaActivityError(const mojom::VisitData& visit_data, new_visit_data.path = "/"; new_visit_data.name = name; - ledger_->publisher()->GetPublisherActivityFromUrl( + engine_->publisher()->GetPublisherActivityFromUrl( window_id, mojom::VisitData::New(new_visit_data), std::string()); } else { BLOG(0, "Media activity error"); @@ -299,7 +299,7 @@ void YouTube::ProcessMedia( std::string media_key = GetMediaKey(media_id, YOUTUBE_MEDIA_TYPE); uint64_t duration = GetMediaDurationFromParts(parts, media_key); - ledger_->database()->GetMediaPublisherInfo( + engine_->database()->GetMediaPublisherInfo( media_key, std::bind(&YouTube::OnMediaPublisherInfo, this, media_id, media_key, duration, visit_data, 0, _1, _2)); } @@ -337,8 +337,7 @@ void YouTube::OnMediaPublisherInfo(const std::string& media_id, const uint64_t window_id, mojom::Result result, mojom::PublisherInfoPtr publisher_info) { - if (result != mojom::Result::LEDGER_OK && - result != mojom::Result::NOT_FOUND) { + if (result != mojom::Result::OK && result != mojom::Result::NOT_FOUND) { BLOG(0, "Failed to get publisher info"); return; } @@ -361,7 +360,7 @@ void YouTube::OnMediaPublisherInfo(const std::string& media_id, new_visit_data.favicon_url = publisher_info->favicon_url; std::string id = publisher_info->id; - ledger_->publisher()->SaveVisit( + engine_->publisher()->SaveVisit( id, new_visit_data, duration, true, window_id, [](mojom::Result, mojom::PublisherInfoPtr) {}); } @@ -458,12 +457,12 @@ void YouTube::SavePublisherInfo(const uint64_t duration, new_visit_data.name = publisher_name; new_visit_data.url = url; - ledger_->publisher()->SaveVisit( + engine_->publisher()->SaveVisit( publisher_id, new_visit_data, duration, true, window_id, [](mojom::Result, mojom::PublisherInfoPtr) {}); if (!media_key.empty()) { - ledger_->database()->SaveMediaPublisherInfo(media_key, publisher_id, + engine_->database()->SaveMediaPublisherInfo(media_key, publisher_id, [](const mojom::Result) {}); } } @@ -473,7 +472,7 @@ void YouTube::FetchDataFromUrl(const std::string& url, auto request = mojom::UrlRequest::New(); request->url = url; request->skip_log = true; - ledger_->LoadURL(std::move(request), callback); + engine_->LoadURL(std::move(request), callback); } void YouTube::WatchPath(uint64_t window_id, @@ -482,7 +481,7 @@ void YouTube::WatchPath(uint64_t window_id, std::string media_key = GetMediaKey(media_id, YOUTUBE_MEDIA_TYPE); if (!media_key.empty() || !media_id.empty()) { - ledger_->database()->GetMediaPublisherInfo( + engine_->database()->GetMediaPublisherInfo( media_key, std::bind(&YouTube::OnMediaPublisherActivity, this, _1, _2, window_id, visit_data, media_key, media_id)); } else { @@ -496,8 +495,7 @@ void YouTube::OnMediaPublisherActivity(mojom::Result result, const mojom::VisitData& visit_data, const std::string& media_key, const std::string& media_id) { - if (result != mojom::Result::LEDGER_OK && - result != mojom::Result::NOT_FOUND) { + if (result != mojom::Result::OK && result != mojom::Result::NOT_FOUND) { OnMediaActivityError(visit_data, window_id); return; } @@ -514,10 +512,10 @@ void YouTube::GetPublisherPanleInfo(uint64_t window_id, const mojom::VisitData& visit_data, const std::string& publisher_key, bool is_custom_path) { - auto filter = ledger_->publisher()->CreateActivityFilter( + auto filter = engine_->publisher()->CreateActivityFilter( publisher_key, mojom::ExcludeFilter::FILTER_ALL, false, - ledger_->state()->GetReconcileStamp(), true, false); - ledger_->database()->GetPanelPublisherInfo( + engine_->state()->GetReconcileStamp(), true, false); + engine_->database()->GetPanelPublisherInfo( std::move(filter), std::bind(&YouTube::OnPublisherPanleInfo, this, window_id, visit_data, publisher_key, is_custom_path, _1, _2)); @@ -534,7 +532,7 @@ void YouTube::OnPublisherPanleInfo(uint64_t window_id, std::bind(&YouTube::GetChannelHeadlineVideo, this, window_id, visit_data, is_custom_path, _1)); } else { - ledger_->client()->OnPanelPublisherInfo(result, std::move(info), window_id); + engine_->client()->OnPanelPublisherInfo(result, std::move(info), window_id); } } @@ -590,7 +588,7 @@ void YouTube::UserPath(uint64_t window_id, const mojom::VisitData& visit_data) { } std::string media_key = (std::string)YOUTUBE_MEDIA_TYPE + "_user_" + user; - ledger_->database()->GetMediaPublisherInfo( + engine_->database()->GetMediaPublisherInfo( media_key, std::bind(&YouTube::OnUserActivity, this, window_id, visit_data, media_key, _1, _2)); } @@ -600,8 +598,7 @@ void YouTube::OnUserActivity(uint64_t window_id, const std::string& media_key, mojom::Result result, mojom::PublisherInfoPtr info) { - if (result != mojom::Result::LEDGER_OK && - result != mojom::Result::NOT_FOUND) { + if (result != mojom::Result::OK && result != mojom::Result::NOT_FOUND) { OnMediaActivityError(visit_data, window_id); return; } @@ -627,7 +624,7 @@ void YouTube::OnChannelIdForUser(uint64_t window_id, std::string url = GetChannelUrl(channelId); std::string publisher_key = GetPublisherKey(channelId); - ledger_->database()->SaveMediaPublisherInfo(media_key, publisher_key, + engine_->database()->SaveMediaPublisherInfo(media_key, publisher_key, [](const mojom::Result) {}); mojom::VisitData new_visit_data; diff --git a/components/brave_rewards/core/legacy/media/youtube.h b/components/brave_rewards/core/legacy/media/youtube.h index fcaec6c545a..63c96538717 100644 --- a/components/brave_rewards/core/legacy/media/youtube.h +++ b/components/brave_rewards/core/legacy/media/youtube.h @@ -12,16 +12,16 @@ #include "base/containers/flat_map.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/legacy/media/helper.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; class YouTube { public: - explicit YouTube(LedgerImpl& ledger); + explicit YouTube(RewardsEngineImpl& engine); ~YouTube(); @@ -145,7 +145,7 @@ class YouTube { const std::string& media_key, mojom::UrlResponsePtr response); - const raw_ref ledger_; + const raw_ref engine_; // For testing purposes friend class MediaYouTubeTest; diff --git a/components/brave_rewards/core/legacy/media/youtube_unittest.cc b/components/brave_rewards/core/legacy/media/youtube_unittest.cc index ce902365bd4..cc4288f8d73 100644 --- a/components/brave_rewards/core/legacy/media/youtube_unittest.cc +++ b/components/brave_rewards/core/legacy/media/youtube_unittest.cc @@ -7,9 +7,9 @@ #include "base/containers/flat_map.h" #include "brave/components/brave_rewards/core/constants.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/legacy/media/youtube.h" #include "brave/components/brave_rewards/core/legacy/static_values.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "testing/gtest/include/gtest/gtest.h" // npm run test -- brave_unit_tests --filter=MediaYouTubeTest.* diff --git a/components/brave_rewards/core/legacy/publisher_state.cc b/components/brave_rewards/core/legacy/publisher_state.cc index 930bbd09127..cdb80d7bb6f 100644 --- a/components/brave_rewards/core/legacy/publisher_state.cc +++ b/components/brave_rewards/core/legacy/publisher_state.cc @@ -5,9 +5,9 @@ #include -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/legacy/publisher_settings_properties.h" #include "brave/components/brave_rewards/core/legacy/publisher_state.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; using std::placeholders::_2; @@ -15,8 +15,8 @@ using std::placeholders::_2; namespace brave_rewards::internal { namespace publisher { -LegacyPublisherState::LegacyPublisherState(LedgerImpl& ledger) - : ledger_(ledger) {} +LegacyPublisherState::LegacyPublisherState(RewardsEngineImpl& engine) + : engine_(engine) {} LegacyPublisherState::~LegacyPublisherState() = default; @@ -33,7 +33,7 @@ bool LegacyPublisherState::GetPublisherAllowNonVerified() const { } void LegacyPublisherState::Load(LegacyResultCallback callback) { - ledger_->client()->LoadPublisherState( + engine_->client()->LoadPublisherState( base::BindOnce(&LegacyPublisherState::OnLoad, base::Unretained(this), std::move(callback))); } @@ -41,19 +41,19 @@ void LegacyPublisherState::Load(LegacyResultCallback callback) { void LegacyPublisherState::OnLoad(LegacyResultCallback callback, mojom::Result result, const std::string& data) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { callback(result); return; } PublisherSettingsProperties state; if (!state.FromJson(data)) { - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } state_ = std::move(state); - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } std::vector LegacyPublisherState::GetAlreadyProcessedPublishers() diff --git a/components/brave_rewards/core/legacy/publisher_state.h b/components/brave_rewards/core/legacy/publisher_state.h index 5fc1dd49f12..5dd3fe6a1f0 100644 --- a/components/brave_rewards/core/legacy/publisher_state.h +++ b/components/brave_rewards/core/legacy/publisher_state.h @@ -11,11 +11,11 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/legacy/publisher_settings_properties.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; } namespace brave_rewards::internal { @@ -23,7 +23,7 @@ namespace publisher { class LegacyPublisherState { public: - explicit LegacyPublisherState(LedgerImpl& ledger); + explicit LegacyPublisherState(RewardsEngineImpl& engine); ~LegacyPublisherState(); @@ -44,7 +44,7 @@ class LegacyPublisherState { mojom::Result result, const std::string& data); - const raw_ref ledger_; + const raw_ref engine_; PublisherSettingsProperties state_; }; diff --git a/components/brave_rewards/core/logging/event_log_util.h b/components/brave_rewards/core/logging/event_log_util.h index ca1457ee754..7e908241839 100644 --- a/components/brave_rewards/core/logging/event_log_util.h +++ b/components/brave_rewards/core/logging/event_log_util.h @@ -8,7 +8,7 @@ #include -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom.h" #include "brave/components/brave_rewards/core/mojom_structs.h" namespace brave_rewards::internal { diff --git a/components/brave_rewards/core/logging/logging.cc b/components/brave_rewards/core/logging/logging.cc index 7cbbfdbd042..ee64a5d3604 100644 --- a/components/brave_rewards/core/logging/logging.cc +++ b/components/brave_rewards/core/logging/logging.cc @@ -7,21 +7,21 @@ namespace brave_rewards::internal { -mojom::LedgerClient* g_ledger_client = nullptr; // NOT OWNED +mojom::RewardsEngineClient* g_rewards_engine_client = nullptr; // NOT OWNED -void set_ledger_client_for_logging(mojom::LedgerClient* ledger_client) { - g_ledger_client = ledger_client; +void set_client_for_logging(mojom::RewardsEngineClient* client) { + g_rewards_engine_client = client; } void Log(const char* file, const int line, const int verbose_level, const std::string& message) { - if (!g_ledger_client) { + if (!g_rewards_engine_client) { return; } - g_ledger_client->Log(file, line, verbose_level, message); + g_rewards_engine_client->Log(file, line, verbose_level, message); } } // namespace brave_rewards::internal diff --git a/components/brave_rewards/core/logging/logging.h b/components/brave_rewards/core/logging/logging.h index 116b35d05e7..e1c7c882417 100644 --- a/components/brave_rewards/core/logging/logging.h +++ b/components/brave_rewards/core/logging/logging.h @@ -10,12 +10,12 @@ #include #include "base/logging.h" -#include "brave/components/brave_rewards/common/mojom/bat_ledger.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom.h" #include "brave/components/brave_rewards/core/logging/logging_util.h" namespace brave_rewards::internal { -void set_ledger_client_for_logging(mojom::LedgerClient* ledger_client); +void set_client_for_logging(mojom::RewardsEngineClient* client); void Log(const char* file, const int line, @@ -30,7 +30,7 @@ void Log(const char* file, // // --enable-logging=stderr --v=1 --vmodule=foo=2,bar=3 // -// This runs BAT Ledger with the global VLOG level set to "print everything at +// This runs BAT Rewards with the global VLOG level set to "print everything at // level 1 and lower", but prints levels up to 2 in foo.cc and levels up to 3 in // bar.cc // @@ -38,7 +38,7 @@ void Log(const char* file, // whole pathname and not just the module. e.g., "/foo/bar/=2" would change the // logging level for all code in source files under a "foo/bar" directory // -// BAT Ledger verbose levels: +// BAT Rewards verbose levels: // // 0 Error // 1 Info diff --git a/components/brave_rewards/core/mojom_structs.h b/components/brave_rewards/core/mojom_structs.h index 3f493750d7f..79204d9b404 100644 --- a/components/brave_rewards/core/mojom_structs.h +++ b/components/brave_rewards/core/mojom_structs.h @@ -6,7 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_MOJOM_STRUCTS_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_MOJOM_STRUCTS_H_ -#include "brave/components/brave_rewards/common/mojom/ledger.mojom.h" -#include "brave/components/brave_rewards/common/mojom/ledger_database.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_database.mojom.h" #endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_MOJOM_STRUCTS_H_ diff --git a/components/brave_rewards/core/promotion/promotion.cc b/components/brave_rewards/core/promotion/promotion.cc index 81eceafb699..95c4dd4dad3 100644 --- a/components/brave_rewards/core/promotion/promotion.cc +++ b/components/brave_rewards/core/promotion/promotion.cc @@ -17,10 +17,10 @@ #include "brave/components/brave_rewards/core/constants.h" #include "brave/components/brave_rewards/core/credentials/credentials_util.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/legacy/wallet_info_properties.h" #include "brave/components/brave_rewards/core/promotion/promotion_transfer.h" #include "brave/components/brave_rewards/core/promotion/promotion_util.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" @@ -43,7 +43,7 @@ const int kFetchPromotionsThresholdInSeconds = 10 * base::Time::kSecondsPerMinute; void HandleExpiredPromotions( - LedgerImpl& ledger_impl, + RewardsEngineImpl& engine_impl, base::flat_map* promotions) { DCHECK(promotions); if (!promotions) { @@ -64,7 +64,7 @@ void HandleExpiredPromotions( if (item.second->expires_at > 0 && item.second->expires_at <= current_time) { - ledger_impl.database()->UpdatePromotionStatus( + engine_impl.database()->UpdatePromotionStatus( item.second->id, mojom::PromotionStatus::OVER, [](const mojom::Result _) {}); } @@ -73,26 +73,26 @@ void HandleExpiredPromotions( } // namespace -Promotion::Promotion(LedgerImpl& ledger) - : ledger_(ledger), - attestation_(ledger), - transfer_(ledger), - credentials_(ledger), - promotion_server_(ledger) {} +Promotion::Promotion(RewardsEngineImpl& engine) + : engine_(engine), + attestation_(engine), + transfer_(engine), + credentials_(engine), + promotion_server_(engine) {} Promotion::~Promotion() = default; void Promotion::Initialize() { - if (!ledger_->state()->GetPromotionCorruptedMigrated()) { + if (!engine_->state()->GetPromotionCorruptedMigrated()) { BLOG(1, "Migrating corrupted promotions"); auto check_callback = std::bind(&Promotion::CheckForCorrupted, this, _1); - ledger_->database()->GetAllPromotions(check_callback); + engine_->database()->GetAllPromotions(check_callback); } auto retry_callback = std::bind(&Promotion::Retry, this, _1); - ledger_->database()->GetAllPromotions(retry_callback); + engine_->database()->GetAllPromotions(retry_callback); } void Promotion::Fetch(FetchPromotionsCallback callback) { @@ -100,14 +100,14 @@ void Promotion::Fetch(FetchPromotionsCallback callback) { // database instead of querying the server again if (!is_testing && _environment != mojom::Environment::STAGING) { const uint64_t last_promo_stamp = - ledger_->state()->GetPromotionLastFetchStamp(); + engine_->state()->GetPromotionLastFetchStamp(); const uint64_t now = util::GetCurrentTimeStamp(); if (now - last_promo_stamp < kFetchPromotionsThresholdInSeconds) { auto all_callback = base::BindOnce(&Promotion::OnGetAllPromotionsFromDatabase, base::Unretained(this), std::move(callback)); - ledger_->database()->GetAllPromotions( + engine_->database()->GetAllPromotions( [callback = std::make_shared( std::move(all_callback))]( base::flat_map promotions) { @@ -120,7 +120,7 @@ void Promotion::Fetch(FetchPromotionsCallback callback) { auto url_callback = base::BindOnce( &Promotion::OnFetch, base::Unretained(this), std::move(callback)); - auto client_info = ledger_->GetClientInfo(); + auto client_info = engine_->GetClientInfo(); const std::string client = ParseClientInfoToString(std::move(client_info)); promotion_server_.get_available().Request(client, std::move(url_callback)); } @@ -135,8 +135,8 @@ void Promotion::OnFetch(FetchPromotionsCallback callback, return; } - if (result == mojom::Result::LEDGER_ERROR) { - ProcessFetchedPromotions(mojom::Result::LEDGER_ERROR, std::move(list), + if (result == mojom::Result::FAILED) { + ProcessFetchedPromotions(mojom::Result::FAILED, std::move(list), std::move(callback)); return; } @@ -151,7 +151,7 @@ void Promotion::OnFetch(FetchPromotionsCallback callback, base::BindOnce(&Promotion::OnGetAllPromotions, base::Unretained(this), std::move(callback), std::move(list)); - ledger_->database()->GetAllPromotions( + engine_->database()->GetAllPromotions( [callback = std::make_shared(std::move(all_callback))]( base::flat_map promotions) { @@ -163,7 +163,7 @@ void Promotion::OnGetAllPromotions( FetchPromotionsCallback callback, std::vector list, base::flat_map promotions) { - HandleExpiredPromotions(*ledger_, &promotions); + HandleExpiredPromotions(*engine_, &promotions); std::vector promotions_ui; for (const auto& item : list) { @@ -189,13 +189,13 @@ void Promotion::OnGetAllPromotions( auto legacy_callback = std::bind(&Promotion::LegacyClaimedSaved, this, _1, std::make_shared(item->Clone())); - ledger_->database()->SavePromotion(item->Clone(), legacy_callback); + engine_->database()->SavePromotion(item->Clone(), legacy_callback); continue; } promotions_ui.push_back(item->Clone()); - ledger_->database()->SavePromotion(item->Clone(), + engine_->database()->SavePromotion(item->Clone(), [](const mojom::Result _) {}); } @@ -211,20 +211,20 @@ void Promotion::OnGetAllPromotions( [&promotion](auto& item) { return item->id == promotion.second->id; }); if (!found) { - ledger_->database()->UpdatePromotionStatus(promotion.second->id, + engine_->database()->UpdatePromotionStatus(promotion.second->id, mojom::PromotionStatus::OVER, [](const mojom::Result) {}); } } - ProcessFetchedPromotions(mojom::Result::LEDGER_OK, std::move(promotions_ui), + ProcessFetchedPromotions(mojom::Result::OK, std::move(promotions_ui), std::move(callback)); } void Promotion::OnGetAllPromotionsFromDatabase( FetchPromotionsCallback callback, base::flat_map promotions) { - HandleExpiredPromotions(*ledger_, &promotions); + HandleExpiredPromotions(*engine_, &promotions); std::vector promotions_ui; for (const auto& item : promotions) { @@ -232,13 +232,13 @@ void Promotion::OnGetAllPromotionsFromDatabase( promotions_ui.push_back(item.second->Clone()); } } - std::move(callback).Run(mojom::Result::LEDGER_OK, std::move(promotions_ui)); + std::move(callback).Run(mojom::Result::OK, std::move(promotions_ui)); } void Promotion::LegacyClaimedSaved( const mojom::Result result, std::shared_ptr shared_promotion) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Save failed"); return; } @@ -253,7 +253,7 @@ void Promotion::Claim(const std::string& promotion_id, base::BindOnce(&Promotion::OnClaimPromotion, base::Unretained(this), std::move(callback), payload); - ledger_->database()->GetPromotion( + engine_->database()->GetPromotion( promotion_id, [callback = std::make_shared( std::move(promotion_callback))](mojom::PromotionPtr promotion) { @@ -266,7 +266,7 @@ void Promotion::OnClaimPromotion(ClaimPromotionCallback callback, mojom::PromotionPtr promotion) { if (!promotion) { BLOG(0, "Promotion is null"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + std::move(callback).Run(mojom::Result::FAILED, ""); return; } @@ -276,10 +276,10 @@ void Promotion::OnClaimPromotion(ClaimPromotionCallback callback, return; } - const auto wallet = ledger_->wallet()->GetWallet(); + const auto wallet = engine_->wallet()->GetWallet(); if (!wallet) { BLOG(0, "Rewards wallet does not exist"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + std::move(callback).Run(mojom::Result::FAILED, ""); return; } @@ -293,7 +293,7 @@ void Promotion::Attest(const std::string& promotion_id, base::BindOnce(&Promotion::OnAttestPromotion, base::Unretained(this), std::move(callback), solution); - ledger_->database()->GetPromotion( + engine_->database()->GetPromotion( promotion_id, [callback = std::make_shared( std::move(promotion_callback))](mojom::PromotionPtr promotion) { @@ -306,7 +306,7 @@ void Promotion::OnAttestPromotion(AttestPromotionCallback callback, mojom::PromotionPtr promotion) { if (!promotion) { BLOG(1, "Promotion is null"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, nullptr); + std::move(callback).Run(mojom::Result::FAILED, nullptr); return; } @@ -325,7 +325,7 @@ void Promotion::OnAttestPromotion(AttestPromotionCallback callback, void Promotion::OnAttestedPromotion(AttestPromotionCallback callback, const std::string& promotion_id, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Attestation failed " << result); std::move(callback).Run(result, nullptr); return; @@ -335,7 +335,7 @@ void Promotion::OnAttestedPromotion(AttestPromotionCallback callback, base::BindOnce(&Promotion::OnCompletedAttestation, base::Unretained(this), std::move(callback)); - ledger_->database()->GetPromotion( + engine_->database()->GetPromotion( promotion_id, [callback = std::make_shared( std::move(promotion_callback))](mojom::PromotionPtr promotion) { @@ -347,7 +347,7 @@ void Promotion::OnCompletedAttestation(AttestPromotionCallback callback, mojom::PromotionPtr promotion) { if (!promotion) { BLOG(0, "Promotion does not exist"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR, nullptr); + std::move(callback).Run(mojom::Result::FAILED, nullptr); return; } @@ -363,7 +363,7 @@ void Promotion::OnCompletedAttestation(AttestPromotionCallback callback, base::BindOnce(&Promotion::AttestedSaved, base::Unretained(this), std::move(callback), promotion->Clone()); - ledger_->database()->SavePromotion( + engine_->database()->SavePromotion( std::move(promotion), [callback = std::make_shared(std::move(save_callback))]( @@ -373,7 +373,7 @@ void Promotion::OnCompletedAttestation(AttestPromotionCallback callback, void Promotion::AttestedSaved(AttestPromotionCallback callback, mojom::PromotionPtr promotion, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Save failed "); std::move(callback).Run(result, nullptr); return; @@ -393,7 +393,7 @@ void Promotion::Complete(AttestPromotionCallback callback, base::BindOnce(&Promotion::OnComplete, base::Unretained(this), std::move(callback), result); - ledger_->database()->GetPromotion( + engine_->database()->GetPromotion( promotion_id, [callback = std::make_shared( std::move(promotion_callback))](mojom::PromotionPtr promotion) { @@ -405,8 +405,8 @@ void Promotion::OnComplete(AttestPromotionCallback callback, mojom::Result result, mojom::PromotionPtr promotion) { BLOG(1, "Promotion completed with result " << result); - if (promotion && result == mojom::Result::LEDGER_OK) { - ledger_->database()->SaveBalanceReportInfoItem( + if (promotion && result == mojom::Result::OK) { + engine_->database()->SaveBalanceReportInfoItem( util::GetCurrentMonth(), util::GetCurrentYear(), ConvertPromotionTypeToReportType(promotion->type), promotion->approximate_value, [](mojom::Result) {}); @@ -420,10 +420,10 @@ void Promotion::ProcessFetchedPromotions( std::vector promotions, FetchPromotionsCallback callback) { const uint64_t now = util::GetCurrentTimeStamp(); - ledger_->state()->SetPromotionLastFetchStamp(now); + engine_->state()->SetPromotionLastFetchStamp(now); last_check_timer_.Stop(); const bool retry = - result != mojom::Result::LEDGER_OK && result != mojom::Result::NOT_FOUND; + result != mojom::Result::OK && result != mojom::Result::NOT_FOUND; Refresh(retry); std::move(callback).Run(result, std::move(promotions)); } @@ -432,7 +432,7 @@ void Promotion::GetCredentials(ResultCallback callback, mojom::PromotionPtr promotion) { if (!promotion) { BLOG(0, "Promotion is null"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } @@ -455,25 +455,25 @@ void Promotion::CredentialsProcessed(ResultCallback callback, retry_timer_.Start(FROM_HERE, base::Seconds(5), base::BindOnce(&Promotion::OnRetryTimerElapsed, base::Unretained(this))); - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); return; } if (result == mojom::Result::NOT_FOUND) { - ledger_->database()->UpdatePromotionStatus( + engine_->database()->UpdatePromotionStatus( promotion_id, mojom::PromotionStatus::OVER, [callback = std::make_shared(std::move(callback))]( mojom::Result result) { std::move(*callback).Run(result); }); return; } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Credentials process not succeeded " << result); std::move(callback).Run(result); return; } - ledger_->database()->UpdatePromotionStatus( + engine_->database()->UpdatePromotionStatus( promotion_id, mojom::PromotionStatus::FINISHED, [callback = std::make_shared(std::move(callback))]( mojom::Result result) { std::move(*callback).Run(result); }); @@ -481,7 +481,7 @@ void Promotion::CredentialsProcessed(ResultCallback callback, void Promotion::Retry( base::flat_map promotions) { - HandleExpiredPromotions(*ledger_, &promotions); + HandleExpiredPromotions(*engine_, &promotions); for (auto& promotion : promotions) { if (!promotion.second) { @@ -519,7 +519,7 @@ void Promotion::Refresh(const bool retry_after_error) { const auto default_time = constant::kPromotionRefreshInterval; const uint64_t now = util::GetCurrentTimeStamp(); const uint64_t last_promo_stamp = - ledger_->state()->GetPromotionLastFetchStamp(); + engine_->state()->GetPromotionLastFetchStamp(); uint64_t time_since_last_promo_check = 0ull; @@ -563,31 +563,31 @@ void Promotion::CheckForCorrupted( if (corrupted_promotions.empty()) { BLOG(1, "No corrupted promotions"); - CorruptedPromotionFixed(mojom::Result::LEDGER_OK); + CorruptedPromotionFixed(mojom::Result::OK); return; } auto get_callback = std::bind(&Promotion::CorruptedPromotionFixed, this, _1); - ledger_->database()->UpdatePromotionsBlankPublicKey(corrupted_promotions, + engine_->database()->UpdatePromotionsBlankPublicKey(corrupted_promotions, get_callback); } void Promotion::CorruptedPromotionFixed(const mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Could not update public keys"); return; } auto check_callback = std::bind(&Promotion::CheckForCorruptedCreds, this, _1); - ledger_->database()->GetAllCredsBatches(check_callback); + engine_->database()->GetAllCredsBatches(check_callback); } void Promotion::CheckForCorruptedCreds(std::vector list) { if (list.empty()) { BLOG(1, "Creds list is empty"); - ledger_->state()->SetPromotionCorruptedMigrated(true); + engine_->state()->SetPromotionCorruptedMigrated(true); return; } @@ -609,14 +609,14 @@ void Promotion::CheckForCorruptedCreds(std::vector list) { if (corrupted_promotions.empty()) { BLOG(1, "No corrupted creds"); - ledger_->state()->SetPromotionCorruptedMigrated(true); + engine_->state()->SetPromotionCorruptedMigrated(true); return; } auto get_callback = std::bind(&Promotion::CorruptedPromotions, this, _1, corrupted_promotions); - ledger_->database()->GetPromotionList(corrupted_promotions, get_callback); + engine_->database()->GetPromotionList(corrupted_promotions, get_callback); } void Promotion::CorruptedPromotions(std::vector promotions, @@ -633,7 +633,7 @@ void Promotion::CorruptedPromotions(std::vector promotions, if (corrupted_claims.empty()) { BLOG(1, "No corrupted creds"); - ledger_->state()->SetPromotionCorruptedMigrated(true); + engine_->state()->SetPromotionCorruptedMigrated(true); return; } @@ -646,17 +646,17 @@ void Promotion::CorruptedPromotions(std::vector promotions, void Promotion::OnCheckForCorrupted( const mojom::Result result, const std::vector& promotion_id_list) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to parse corrupted promotions response"); return; } - ledger_->state()->SetPromotionCorruptedMigrated(true); + engine_->state()->SetPromotionCorruptedMigrated(true); auto update_callback = std::bind(&Promotion::ErrorStatusSaved, this, _1, promotion_id_list); - ledger_->database()->UpdatePromotionsStatus( + engine_->database()->UpdatePromotionsStatus( promotion_id_list, mojom::PromotionStatus::CORRUPTED, update_callback); } @@ -664,26 +664,26 @@ void Promotion::ErrorStatusSaved( const mojom::Result result, const std::vector& promotion_id_list) { // even if promotions fail, let's try to update at least creds - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Promotion status save failed"); } auto update_callback = std::bind(&Promotion::ErrorCredsStatusSaved, this, _1); - ledger_->database()->UpdateCredsBatchesStatus( + engine_->database()->UpdateCredsBatchesStatus( promotion_id_list, mojom::CredsBatchType::PROMOTION, mojom::CredsBatchStatus::CORRUPTED, update_callback); } void Promotion::ErrorCredsStatusSaved(const mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Creds status save failed"); } // let's retry promotions that are valid now auto retry_callback = std::bind(&Promotion::Retry, this, _1); - ledger_->database()->GetAllPromotions(retry_callback); + engine_->database()->GetAllPromotions(retry_callback); } void Promotion::TransferTokens(PostSuggestionsClaimCallback callback) { @@ -691,7 +691,7 @@ void Promotion::TransferTokens(PostSuggestionsClaimCallback callback) { } void Promotion::OnRetryTimerElapsed() { - ledger_->database()->GetAllPromotions(std::bind(&Promotion::Retry, this, _1)); + engine_->database()->GetAllPromotions(std::bind(&Promotion::Retry, this, _1)); } void Promotion::OnLastCheckTimerElapsed() { diff --git a/components/brave_rewards/core/promotion/promotion.h b/components/brave_rewards/core/promotion/promotion.h index 9f040600f83..e4b99b43859 100644 --- a/components/brave_rewards/core/promotion/promotion.h +++ b/components/brave_rewards/core/promotion/promotion.h @@ -16,18 +16,18 @@ #include "brave/components/brave_rewards/core/attestation/attestation_impl.h" #include "brave/components/brave_rewards/core/credentials/credentials_promotion.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotion_server.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/mojom_structs.h" #include "brave/components/brave_rewards/core/promotion/promotion_transfer.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace promotion { class Promotion { public: - explicit Promotion(LedgerImpl& ledger); + explicit Promotion(RewardsEngineImpl& engine); ~Promotion(); void Initialize(); @@ -126,7 +126,7 @@ class Promotion { void OnLastCheckTimerElapsed(); - const raw_ref ledger_; + const raw_ref engine_; attestation::AttestationImpl attestation_; PromotionTransfer transfer_; credential::CredentialsPromotion credentials_; diff --git a/components/brave_rewards/core/promotion/promotion_transfer.cc b/components/brave_rewards/core/promotion/promotion_transfer.cc index 910f5374eaa..652f140f308 100644 --- a/components/brave_rewards/core/promotion/promotion_transfer.cc +++ b/components/brave_rewards/core/promotion/promotion_transfer.cc @@ -13,14 +13,14 @@ #include "brave/components/brave_rewards/core/constants.h" #include "brave/components/brave_rewards/core/credentials/credentials_promotion.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace promotion { -PromotionTransfer::PromotionTransfer(LedgerImpl& ledger) - : ledger_(ledger), credentials_(ledger) {} +PromotionTransfer::PromotionTransfer(RewardsEngineImpl& engine) + : engine_(engine), credentials_(engine) {} PromotionTransfer::~PromotionTransfer() = default; @@ -29,7 +29,7 @@ void PromotionTransfer::Start(PostSuggestionsClaimCallback callback) { base::BindOnce(&PromotionTransfer::OnGetSpendableUnblindedTokens, base::Unretained(this), std::move(callback)); - ledger_->database()->GetSpendableUnblindedTokens( + engine_->database()->GetSpendableUnblindedTokens( [callback = std::make_shared(std::move( tokens_callback))](std::vector tokens) { std::move(*callback).Run(std::move(tokens)); @@ -45,7 +45,7 @@ void PromotionTransfer::OnGetSpendableUnblindedTokens( } if (token_list.empty()) { - return std::move(callback).Run(mojom::Result::LEDGER_OK, ""); + return std::move(callback).Run(mojom::Result::OK, ""); } credential::CredentialsRedeem redeem; @@ -63,8 +63,8 @@ void PromotionTransfer::OnDrainTokens(PostSuggestionsClaimCallback callback, double transfer_amount, mojom::Result result, std::string drain_id) const { - if (result == mojom::Result::LEDGER_OK) { - ledger_->database()->SaveEventLog(log::kPromotionVBATDrained, + if (result == mojom::Result::OK) { + engine_->database()->SaveEventLog(log::kPromotionVBATDrained, base::NumberToString(transfer_amount)); } diff --git a/components/brave_rewards/core/promotion/promotion_transfer.h b/components/brave_rewards/core/promotion/promotion_transfer.h index 4fad5807614..0433eb0ba4a 100644 --- a/components/brave_rewards/core/promotion/promotion_transfer.h +++ b/components/brave_rewards/core/promotion/promotion_transfer.h @@ -11,16 +11,16 @@ #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/credentials/credentials_promotion.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace promotion { class PromotionTransfer { public: - explicit PromotionTransfer(LedgerImpl& ledger); + explicit PromotionTransfer(RewardsEngineImpl& engine); ~PromotionTransfer(); void Start(PostSuggestionsClaimCallback callback); @@ -35,7 +35,7 @@ class PromotionTransfer { mojom::Result result, std::string drain_id) const; - const raw_ref ledger_; + const raw_ref engine_; credential::CredentialsPromotion credentials_; }; diff --git a/components/brave_rewards/core/promotion/promotion_unittest.cc b/components/brave_rewards/core/promotion/promotion_unittest.cc index a693c4bcf52..e4df10525db 100644 --- a/components/brave_rewards/core/promotion/promotion_unittest.cc +++ b/components/brave_rewards/core/promotion/promotion_unittest.cc @@ -12,10 +12,10 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_mock.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" #include "brave/components/brave_rewards/core/promotion/promotion.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "testing/gtest/include/gtest/gtest.h" @@ -31,7 +31,7 @@ namespace brave_rewards::internal::promotion { class PromotionTest : public testing::Test { protected: void SetUp() override { - ON_CALL(*mock_ledger_impl_.mock_client(), + ON_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletBrave, _)) .WillByDefault([](const std::string&, auto callback) { std::move(callback).Run(R"( @@ -42,20 +42,20 @@ class PromotionTest : public testing::Test { )"); }); - ON_CALL(*mock_ledger_impl_.mock_client(), GetClientInfo(_)) + ON_CALL(*mock_engine_impl_.mock_client(), GetClientInfo(_)) .WillByDefault([](auto callback) { std::move(callback).Run(mojom::ClientInfo::New()); }); } base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - Promotion promotion_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + Promotion promotion_{mock_engine_impl_}; }; TEST_F(PromotionTest, LegacyPromotionIsNotOverwritten) { EXPECT_CALL( - *mock_ledger_impl_.mock_client(), + *mock_engine_impl_.mock_client(), LoadURL(Pointee(Field(&mojom::UrlRequest::url, HasSubstr("/v1/promotions" "?migrate=true&paymentId=fa5dea51-" @@ -89,7 +89,7 @@ TEST_F(PromotionTest, LegacyPromotionIsNotOverwritten) { }); bool inserted = false; - EXPECT_CALL(*mock_ledger_impl_.mock_database(), GetAllPromotions(_)) + EXPECT_CALL(*mock_engine_impl_.mock_database(), GetAllPromotions(_)) .Times(2) .WillRepeatedly([&inserted](auto callback) { base::flat_map map; @@ -109,14 +109,14 @@ TEST_F(PromotionTest, LegacyPromotionIsNotOverwritten) { // to suppress the Fetch(base::DoNothing()) calls // triggered by Promotion::OnLastCheckTimerElapsed() - EXPECT_CALL(*mock_ledger_impl_.mock_client(), + EXPECT_CALL(*mock_engine_impl_.mock_client(), GetUint64State(state::kPromotionLastFetchStamp, _)) .Times(2) .WillRepeatedly([](const std::string&, auto callback) { std::move(callback).Run(util::GetCurrentTimeStamp()); }); - EXPECT_CALL(*mock_ledger_impl_.mock_database(), SavePromotion(_, _)).Times(1); + EXPECT_CALL(*mock_engine_impl_.mock_database(), SavePromotion(_, _)).Times(1); base::MockCallback callback; EXPECT_CALL(callback, Run).Times(2); diff --git a/components/brave_rewards/core/publisher/publisher.cc b/components/brave_rewards/core/publisher/publisher.cc index 77fca7df87f..eb72929b3d6 100644 --- a/components/brave_rewards/core/publisher/publisher.cc +++ b/components/brave_rewards/core/publisher/publisher.cc @@ -17,13 +17,13 @@ #include "brave/components/brave_rewards/core/contribution/contribution.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/legacy/media/media.h" #include "brave/components/brave_rewards/core/legacy/static_values.h" #include "brave/components/brave_rewards/core/publisher/prefix_util.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" #include "brave/components/brave_rewards/core/publisher/publisher_prefix_list_updater.h" #include "brave/components/brave_rewards/core/publisher/server_publisher_fetcher.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" using std::placeholders::_1; @@ -32,10 +32,10 @@ using std::placeholders::_2; namespace brave_rewards::internal { namespace publisher { -Publisher::Publisher(LedgerImpl& ledger) - : ledger_(ledger), - prefix_list_updater_(ledger), - server_publisher_fetcher_(ledger) {} +Publisher::Publisher(RewardsEngineImpl& engine) + : engine_(engine), + prefix_list_updater_(engine), + server_publisher_fetcher_(engine) {} Publisher::~Publisher() = default; @@ -63,7 +63,7 @@ void Publisher::RefreshPublisher(const std::string& publisher_key, void Publisher::SetPublisherServerListTimer() { prefix_list_updater_.StartAutoUpdate( - [this]() { ledger_->client()->OnPublisherRegistryUpdated(); }); + [this]() { engine_->client()->OnPublisherRegistryUpdated(); }); } void Publisher::CalcScoreConsts(const int min_duration_seconds) { @@ -75,15 +75,15 @@ void Publisher::CalcScoreConsts(const int min_duration_seconds) { const double a = (1.0 / (d * 2.0)) - min_duration_big; const double b = min_duration_big - a; - ledger_->state()->SetScoreValues(a, b); + engine_->state()->SetScoreValues(a, b); } // courtesy of @dimitry-xyz: -// https://github.com/brave/ledger/issues/2#issuecomment-221752002 +// https://github.com/brave/engine/issues/2#issuecomment-221752002 double Publisher::concaveScore(const uint64_t& duration_seconds) { uint64_t duration_big = duration_seconds * 100; double a, b; - ledger_->state()->GetScoreValues(&a, &b); + engine_->state()->GetScoreValues(&a, &b); return (-b + std::sqrt((b * b) + (a * 4 * duration_big))) / (a * 2); } @@ -117,7 +117,7 @@ void Publisher::SaveVisit(const std::string& publisher_key, std::bind(&Publisher::OnSaveVisitServerPublisher, this, _1, publisher_key, visit_data, duration, first_visit, window_id, callback); - ledger_->database()->SearchPublisherPrefixList( + engine_->database()->SearchPublisherPrefixList( publisher_key, [this, publisher_key, on_server_info](bool publisher_exists) { if (publisher_exists) { @@ -139,11 +139,11 @@ mojom::ActivityInfoFilterPtr Publisher::CreateActivityFilter( filter->id = publisher_id; filter->excluded = excluded; filter->min_duration = - min_duration ? ledger_->state()->GetPublisherMinVisitTime() : 0; + min_duration ? engine_->state()->GetPublisherMinVisitTime() : 0; filter->reconcile_stamp = current_reconcile_stamp; filter->non_verified = non_verified; filter->min_visits = - min_visits ? ledger_->state()->GetPublisherMinVisits() : 0; + min_visits ? engine_->state()->GetPublisherMinVisits() : 0; return filter; } @@ -158,7 +158,7 @@ void Publisher::OnSaveVisitServerPublisher( const PublisherInfoCallback callback) { auto filter = CreateActivityFilter( publisher_key, mojom::ExcludeFilter::FILTER_ALL, false, - ledger_->state()->GetReconcileStamp(), true, false); + engine_->state()->GetReconcileStamp(), true, false); // we need to do this as I can't move server publisher into final function auto status = mojom::PublisherStatus::NOT_VERIFIED; @@ -173,7 +173,7 @@ void Publisher::OnSaveVisitServerPublisher( auto list_callback = std::bind(&Publisher::OnGetActivityInfo, this, _1, get_callback, filter->id); - ledger_->database()->GetActivityInfoList(0, 2, std::move(filter), + engine_->database()->GetActivityInfoList(0, 2, std::move(filter), list_callback); } @@ -181,7 +181,7 @@ void Publisher::OnGetActivityInfo(std::vector list, PublisherInfoCallback callback, const std::string& publisher_key) { if (list.empty()) { - ledger_->database()->GetPublisherInfo(publisher_key, callback); + engine_->database()->GetPublisherInfo(publisher_key, callback); return; } @@ -190,7 +190,7 @@ void Publisher::OnGetActivityInfo(std::vector list, return; } - callback(mojom::Result::LEDGER_OK, std::move(list[0])); + callback(mojom::Result::OK, std::move(list[0])); } void Publisher::SaveVisitInternal(const mojom::PublisherStatus status, @@ -203,10 +203,9 @@ void Publisher::SaveVisitInternal(const mojom::PublisherStatus status, mojom::Result result, mojom::PublisherInfoPtr publisher_info) { DCHECK(result != mojom::Result::TOO_MANY_RESULTS); - if (result != mojom::Result::LEDGER_OK && - result != mojom::Result::NOT_FOUND) { + if (result != mojom::Result::OK && result != mojom::Result::NOT_FOUND) { BLOG(0, "Visit was not saved " << result); - callback(mojom::Result::LEDGER_ERROR, nullptr); + callback(mojom::Result::FAILED, nullptr); return; } @@ -226,7 +225,7 @@ void Publisher::SaveVisitInternal(const mojom::PublisherStatus status, std::string fav_icon = visit_data.favicon_url; if (is_verified && !fav_icon.empty()) { if (fav_icon.find(".invalid") == std::string::npos) { - ledger_->client()->FetchFavIcon( + engine_->client()->FetchFavIcon( fav_icon, "https://" + base::Uuid::GenerateRandomV4().AsLowercaseString() + ".invalid", @@ -253,21 +252,21 @@ void Publisher::SaveVisitInternal(const mojom::PublisherStatus status, mojom::PublisherInfoPtr panel_info = nullptr; uint64_t min_visit_time = - static_cast(ledger_->state()->GetPublisherMinVisitTime()); + static_cast(engine_->state()->GetPublisherMinVisitTime()); // for new visits that are excluded or are not long enough or ac is off bool min_duration_new = duration < min_visit_time && !ignore_time; bool min_duration_ok = duration > min_visit_time || ignore_time; if ((new_publisher || updated_publisher) && - (excluded || !ledger_->state()->GetAutoContributeEnabled() || + (excluded || !engine_->state()->GetAutoContributeEnabled() || min_duration_new || !is_verified)) { panel_info = publisher_info->Clone(); auto publisher_info_saved_callback = std::bind(&Publisher::OnPublisherInfoSaved, this, _1); - ledger_->database()->SavePublisherInfo(std::move(publisher_info), + engine_->database()->SavePublisherInfo(std::move(publisher_info), publisher_info_saved_callback); } else if (!excluded && min_duration_ok && is_verified) { if (first_visit) { @@ -275,12 +274,12 @@ void Publisher::SaveVisitInternal(const mojom::PublisherStatus status, } publisher_info->duration += duration; publisher_info->score += concaveScore(duration); - publisher_info->reconcile_stamp = ledger_->state()->GetReconcileStamp(); + publisher_info->reconcile_stamp = engine_->state()->GetReconcileStamp(); // Activity queries expect the publisher to exist in the `publisher_info` // table. Save the publisher info if it does not already exist. if (new_publisher) { - ledger_->database()->SavePublisherInfo(publisher_info->Clone(), + engine_->database()->SavePublisherInfo(publisher_info->Clone(), [](mojom::Result) {}); } @@ -289,7 +288,7 @@ void Publisher::SaveVisitInternal(const mojom::PublisherStatus status, auto publisher_info_saved_callback = std::bind(&Publisher::OnPublisherInfoSaved, this, _1); - ledger_->database()->SaveActivityInfo(std::move(publisher_info), + engine_->database()->SaveActivityInfo(std::move(publisher_info), publisher_info_saved_callback); } @@ -299,11 +298,11 @@ void Publisher::SaveVisitInternal(const mojom::PublisherStatus status, } auto callback_info = panel_info->Clone(); - callback(mojom::Result::LEDGER_OK, std::move(callback_info)); + callback(mojom::Result::OK, std::move(callback_info)); if (window_id > 0) { - OnPanelPublisherInfo(mojom::Result::LEDGER_OK, std::move(panel_info), - window_id, visit_data); + OnPanelPublisherInfo(mojom::Result::OK, std::move(panel_info), window_id, + visit_data); } } } @@ -317,7 +316,7 @@ void Publisher::onFetchFavIcon(const std::string& publisher_key, return; } - ledger_->database()->GetPublisherInfo( + engine_->database()->GetPublisherInfo( publisher_key, std::bind(&Publisher::onFetchFavIconDBResponse, this, _1, _2, favicon_url, window_id)); } @@ -326,7 +325,7 @@ void Publisher::onFetchFavIconDBResponse(mojom::Result result, mojom::PublisherInfoPtr info, const std::string& favicon_url, uint64_t window_id) { - if (result != mojom::Result::LEDGER_OK || favicon_url.empty()) { + if (result != mojom::Result::OK || favicon_url.empty()) { BLOG(1, "Missing or corrupted favicon file"); return; } @@ -335,17 +334,17 @@ void Publisher::onFetchFavIconDBResponse(mojom::Result result, auto callback = std::bind(&Publisher::OnPublisherInfoSaved, this, _1); - ledger_->database()->SavePublisherInfo(info->Clone(), callback); + engine_->database()->SavePublisherInfo(info->Clone(), callback); if (window_id > 0) { mojom::VisitData visit_data; - OnPanelPublisherInfo(mojom::Result::LEDGER_OK, std::move(info), window_id, + OnPanelPublisherInfo(mojom::Result::OK, std::move(info), window_id, visit_data); } } void Publisher::OnPublisherInfoSaved(const mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Publisher info was not saved!"); return; } @@ -360,7 +359,7 @@ void Publisher::SetPublisherExclude(const std::string& publisher_id, base::BindOnce(&Publisher::OnSetPublisherExclude, base::Unretained(this), std::move(callback), exclude); - ledger_->database()->GetPublisherInfo( + engine_->database()->GetPublisherInfo( publisher_id, [callback = std::make_shared( std::move(get_publisher_info_callback))]( @@ -373,8 +372,7 @@ void Publisher::OnSetPublisherExclude(ResultCallback callback, mojom::PublisherExclude exclude, mojom::Result result, mojom::PublisherInfoPtr publisher_info) { - if (result != mojom::Result::LEDGER_OK && - result != mojom::Result::NOT_FOUND) { + if (result != mojom::Result::OK && result != mojom::Result::NOT_FOUND) { BLOG(0, "Publisher exclude status not saved"); std::move(callback).Run(result); return; @@ -382,37 +380,37 @@ void Publisher::OnSetPublisherExclude(ResultCallback callback, if (!publisher_info) { BLOG(0, "Publisher is null"); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } if (publisher_info->excluded == exclude) { - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); return; } publisher_info->excluded = exclude; auto save_callback = std::bind(&Publisher::OnPublisherInfoSaved, this, _1); - ledger_->database()->SavePublisherInfo(publisher_info->Clone(), + engine_->database()->SavePublisherInfo(publisher_info->Clone(), save_callback); if (exclude == mojom::PublisherExclude::EXCLUDED) { - ledger_->database()->DeleteActivityInfo(publisher_info->id, + engine_->database()->DeleteActivityInfo(publisher_info->id, [](const mojom::Result _) {}); } - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); } void Publisher::OnRestorePublishers(mojom::Result result, ResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Could not restore publishers."); std::move(callback).Run(result); return; } SynopsisNormalizer(); - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); } void Publisher::NormalizeContributeWinners( @@ -496,9 +494,9 @@ void Publisher::synopsisNormalizerInternal( void Publisher::SynopsisNormalizer() { auto filter = CreateActivityFilter("", mojom::ExcludeFilter::FILTER_ALL_EXCEPT_EXCLUDED, - true, ledger_->state()->GetReconcileStamp(), false, - ledger_->state()->GetPublisherMinVisits()); - ledger_->database()->GetActivityInfoList( + true, engine_->state()->GetReconcileStamp(), false, + engine_->state()->GetPublisherMinVisits()); + engine_->database()->GetActivityInfoList( 0, 0, std::move(filter), std::bind(&Publisher::SynopsisNormalizerCallback, this, _1)); } @@ -512,7 +510,7 @@ void Publisher::SynopsisNormalizerCallback( save_list.push_back(item.Clone()); } - ledger_->database()->NormalizeActivityInfoList(std::move(save_list), + engine_->database()->NormalizeActivityInfoList(std::move(save_list), [](const mojom::Result) {}); } @@ -542,18 +540,18 @@ void Publisher::GetPublisherActivityFromUrl(uint64_t windowId, visit_data->url += visit_data->path; - ledger_->media()->GetMediaActivityFromUrl(windowId, std::move(visit_data), + engine_->media()->GetMediaActivityFromUrl(windowId, std::move(visit_data), type, publisher_blob); return; } auto filter = CreateActivityFilter( visit_data->domain, mojom::ExcludeFilter::FILTER_ALL, false, - ledger_->state()->GetReconcileStamp(), true, false); + engine_->state()->GetReconcileStamp(), true, false); visit_data->favicon_url = ""; - ledger_->database()->GetPanelPublisherInfo( + engine_->database()->GetPanelPublisherInfo( std::move(filter), std::bind(&Publisher::OnPanelPublisherInfo, this, _1, _2, windowId, *visit_data)); } @@ -567,8 +565,8 @@ void Publisher::OnPanelPublisherInfo(mojom::Result result, mojom::PublisherInfoPtr info, uint64_t windowId, const mojom::VisitData& visit_data) { - if (result == mojom::Result::LEDGER_OK) { - ledger_->client()->OnPanelPublisherInfo(result, std::move(info), windowId); + if (result == mojom::Result::OK) { + engine_->client()->OnPanelPublisherInfo(result, std::move(info), windowId); return; } @@ -613,7 +611,7 @@ void Publisher::OnGetPublisherBanner(mojom::ServerPublisherInfoPtr info, std::bind(&Publisher::OnGetPublisherBannerPublisher, this, callback, *banner, _1, _2); - ledger_->database()->GetPublisherInfo(publisher_key, publisher_callback); + engine_->database()->GetPublisherInfo(publisher_key, publisher_callback); } void Publisher::OnGetPublisherBannerPublisher( @@ -623,7 +621,7 @@ void Publisher::OnGetPublisherBannerPublisher( mojom::PublisherInfoPtr publisher_info) { auto new_banner = mojom::PublisherBanner::New(banner); - if (!publisher_info || result != mojom::Result::LEDGER_OK) { + if (!publisher_info || result != mojom::Result::OK) { BLOG(0, "Publisher info not found"); callback(std::move(new_banner)); return; @@ -649,7 +647,7 @@ void Publisher::GetServerPublisherInfo( const std::string& publisher_key, bool use_prefix_list, database::GetServerPublisherInfoCallback callback) { - ledger_->database()->GetServerPublisherInfo( + engine_->database()->GetServerPublisherInfo( publisher_key, std::bind(&Publisher::OnServerPublisherInfoLoaded, this, _1, publisher_key, use_prefix_list, callback)); } @@ -663,7 +661,7 @@ void Publisher::OnServerPublisherInfoLoaded( // If we don't have a record in the database for this publisher, search the // prefix list. If the prefix list indicates that the publisher is likely // registered, then fetch the publisher data. - ledger_->database()->SearchPublisherPrefixList( + engine_->database()->SearchPublisherPrefixList( publisher_key, [this, publisher_key, callback](bool publisher_exists) { if (publisher_exists) { FetchServerPublisherInfo( @@ -699,7 +697,7 @@ void Publisher::UpdateMediaDuration(const uint64_t window_id, const uint64_t duration, const bool first_visit) { BLOG(1, "Media duration: " << duration); - ledger_->database()->GetPublisherInfo( + engine_->database()->GetPublisherInfo( publisher_key, std::bind(&Publisher::OnGetPublisherInfoForUpdateMediaDuration, this, _1, _2, window_id, duration, first_visit)); @@ -711,7 +709,7 @@ void Publisher::OnGetPublisherInfoForUpdateMediaDuration( const uint64_t window_id, const uint64_t duration, const bool first_visit) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to retrieve publisher info while updating media duration"); return; } @@ -730,9 +728,9 @@ void Publisher::GetPublisherPanelInfo(const std::string& publisher_key, GetPublisherPanelInfoCallback callback) { auto filter = CreateActivityFilter( publisher_key, mojom::ExcludeFilter::FILTER_ALL, false, - ledger_->state()->GetReconcileStamp(), true, false); + engine_->state()->GetReconcileStamp(), true, false); - ledger_->database()->GetPanelPublisherInfo( + engine_->database()->GetPanelPublisherInfo( std::move(filter), std::bind(&Publisher::OnGetPanelPublisherInfo, this, _1, _2, callback)); } @@ -741,7 +739,7 @@ void Publisher::OnGetPanelPublisherInfo( const mojom::Result result, mojom::PublisherInfoPtr info, GetPublisherPanelInfoCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to retrieve panel publisher info"); callback(result, nullptr); return; @@ -755,7 +753,7 @@ void Publisher::SavePublisherInfo(uint64_t window_id, LegacyResultCallback callback) { if (!publisher_info || publisher_info->id.empty()) { BLOG(0, "Publisher key is missing for url"); - callback(mojom::Result::LEDGER_ERROR); + callback(mojom::Result::FAILED); return; } diff --git a/components/brave_rewards/core/publisher/publisher.h b/components/brave_rewards/core/publisher/publisher.h index 3d03bc60a49..6ae595b0d12 100644 --- a/components/brave_rewards/core/publisher/publisher.h +++ b/components/brave_rewards/core/publisher/publisher.h @@ -13,18 +13,18 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/database/database_server_publisher_info.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/publisher/publisher_prefix_list_updater.h" #include "brave/components/brave_rewards/core/publisher/server_publisher_fetcher.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace publisher { class Publisher { public: - explicit Publisher(LedgerImpl& ledger); + explicit Publisher(RewardsEngineImpl& engine); ~Publisher(); @@ -197,7 +197,7 @@ class Publisher { bool use_prefix_list, database::GetServerPublisherInfoCallback callback); - const raw_ref ledger_; + const raw_ref engine_; PublisherPrefixListUpdater prefix_list_updater_; ServerPublisherFetcher server_publisher_fetcher_; diff --git a/components/brave_rewards/core/publisher/publisher_prefix_list_updater.cc b/components/brave_rewards/core/publisher/publisher_prefix_list_updater.cc index 191759ee5bd..5aeb4129ca9 100644 --- a/components/brave_rewards/core/publisher/publisher_prefix_list_updater.cc +++ b/components/brave_rewards/core/publisher/publisher_prefix_list_updater.cc @@ -9,8 +9,8 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/publisher/prefix_list_reader.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" #include "net/http/http_status_code.h" @@ -28,8 +28,9 @@ constexpr int64_t kMaxRetryAfterFailureDelay = 4 * base::Time::kSecondsPerHour; namespace brave_rewards::internal { namespace publisher { -PublisherPrefixListUpdater::PublisherPrefixListUpdater(LedgerImpl& ledger) - : ledger_(ledger), rewards_server_(ledger) {} +PublisherPrefixListUpdater::PublisherPrefixListUpdater( + RewardsEngineImpl& engine) + : engine_(engine), rewards_server_(engine) {} PublisherPrefixListUpdater::~PublisherPrefixListUpdater() = default; @@ -67,7 +68,7 @@ void PublisherPrefixListUpdater::OnFetchTimerElapsed() { void PublisherPrefixListUpdater::OnFetchCompleted(const mojom::Result result, const std::string& body) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Invalid server response for publisher prefix list"); StartFetchTimer(FROM_HERE, GetRetryAfterFailureDelay()); return; @@ -94,7 +95,7 @@ void PublisherPrefixListUpdater::OnFetchCompleted(const mojom::Result result, retry_count_ = 0; BLOG(1, "Resetting publisher prefix list table"); - ledger_->database()->ResetPublisherPrefixList( + engine_->database()->ResetPublisherPrefixList( std::move(reader), std::bind(&PublisherPrefixListUpdater::OnPrefixListInserted, this, _1)); } @@ -106,13 +107,13 @@ void PublisherPrefixListUpdater::OnPrefixListInserted( // successful fetch time for calculation of next refresh interval. // In order to avoid unecessary server load, do not attempt to retry // using a failure delay if the database insert was unsuccessful. - ledger_->state()->SetServerPublisherListStamp(util::GetCurrentTimeStamp()); + engine_->state()->SetServerPublisherListStamp(util::GetCurrentTimeStamp()); if (auto_update_) { StartFetchTimer(FROM_HERE, GetAutoUpdateDelay()); } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Error updating publisher prefix list table: " << result); return; } @@ -123,7 +124,7 @@ void PublisherPrefixListUpdater::OnPrefixListInserted( } base::TimeDelta PublisherPrefixListUpdater::GetAutoUpdateDelay() { - uint64_t last_fetch_sec = ledger_->state()->GetServerPublisherListStamp(); + uint64_t last_fetch_sec = engine_->state()->GetServerPublisherListStamp(); auto now = base::Time::Now(); auto fetch_time = diff --git a/components/brave_rewards/core/publisher/publisher_prefix_list_updater.h b/components/brave_rewards/core/publisher/publisher_prefix_list_updater.h index af8fa8eb731..c36391631c0 100644 --- a/components/brave_rewards/core/publisher/publisher_prefix_list_updater.h +++ b/components/brave_rewards/core/publisher/publisher_prefix_list_updater.h @@ -14,10 +14,10 @@ #include "base/time/time.h" #include "base/timer/timer.h" #include "brave/components/brave_rewards/core/endpoint/rewards/rewards_server.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace publisher { @@ -27,7 +27,7 @@ using PublisherPrefixListUpdatedCallback = std::function; // intervals. class PublisherPrefixListUpdater { public: - explicit PublisherPrefixListUpdater(LedgerImpl& ledger); + explicit PublisherPrefixListUpdater(RewardsEngineImpl& engine); PublisherPrefixListUpdater(const PublisherPrefixListUpdater&) = delete; PublisherPrefixListUpdater& operator=(const PublisherPrefixListUpdater&) = @@ -52,7 +52,7 @@ class PublisherPrefixListUpdater { base::TimeDelta GetAutoUpdateDelay(); base::TimeDelta GetRetryAfterFailureDelay(); - const raw_ref ledger_; + const raw_ref engine_; base::OneShotTimer timer_; bool auto_update_ = false; int retry_count_ = 0; diff --git a/components/brave_rewards/core/publisher/publisher_status_helper.cc b/components/brave_rewards/core/publisher/publisher_status_helper.cc index 63224eed65c..54944055038 100644 --- a/components/brave_rewards/core/publisher/publisher_status_helper.cc +++ b/components/brave_rewards/core/publisher/publisher_status_helper.cc @@ -14,8 +14,8 @@ #include "base/memory/raw_ref.h" #include "base/time/time.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { @@ -29,15 +29,15 @@ struct PublisherStatusData { using PublisherStatusMap = std::map; struct RefreshTaskInfo { - RefreshTaskInfo(LedgerImpl& ledger, + RefreshTaskInfo(RewardsEngineImpl& engine, PublisherStatusMap&& status_map, std::function callback) - : ledger(ledger), + : engine(engine), map(std::move(status_map)), current(map.begin()), callback(callback) {} - const raw_ref ledger; + const raw_ref engine; PublisherStatusMap map; PublisherStatusMap::iterator current; std::function callback; @@ -52,7 +52,7 @@ void RefreshNext(std::shared_ptr task_info) { mojom::ServerPublisherInfo server_info; server_info.status = key_value.second.status; server_info.updated_at = key_value.second.updated_at; - return task_info->ledger->publisher()->ShouldFetchServerPublisherInfo( + return task_info->engine->publisher()->ShouldFetchServerPublisherInfo( &server_info); }); @@ -64,7 +64,7 @@ void RefreshNext(std::shared_ptr task_info) { // Look for publisher key in hash index. auto& key = task_info->current->first; - task_info->ledger->database()->SearchPublisherPrefixList( + task_info->engine->database()->SearchPublisherPrefixList( key, [task_info](bool exists) { // If the publisher key does not exist in the hash index look for // next expired entry. @@ -75,7 +75,7 @@ void RefreshNext(std::shared_ptr task_info) { } // Fetch current publisher info. auto& key = task_info->current->first; - task_info->ledger->publisher()->GetServerPublisherInfo( + task_info->engine->publisher()->GetServerPublisherInfo( key, [task_info](mojom::ServerPublisherInfoPtr server_info) { // Update status map and continue looking for expired entries. task_info->current->second.status = server_info->status; @@ -86,10 +86,10 @@ void RefreshNext(std::shared_ptr task_info) { } void RefreshPublisherStatusMap( - LedgerImpl& ledger, + RewardsEngineImpl& engine, PublisherStatusMap&& status_map, std::function callback) { - RefreshNext(std::make_shared(ledger, std::move(status_map), + RefreshNext(std::make_shared(engine, std::move(status_map), callback)); } @@ -97,7 +97,7 @@ void RefreshPublisherStatusMap( namespace publisher { -void RefreshPublisherStatus(LedgerImpl& ledger, +void RefreshPublisherStatus(RewardsEngineImpl& engine, std::vector&& info_list, GetRecurringTipsCallback callback) { PublisherStatusMap map; @@ -108,7 +108,7 @@ void RefreshPublisherStatus(LedgerImpl& ledger, auto shared_list = std::make_shared>( std::move(info_list)); - RefreshPublisherStatusMap(ledger, std::move(map), + RefreshPublisherStatusMap(engine, std::move(map), [shared_list, callback](auto map) { for (const auto& info : *shared_list) { info->status = map[info->id].status; diff --git a/components/brave_rewards/core/publisher/publisher_status_helper.h b/components/brave_rewards/core/publisher/publisher_status_helper.h index f41c64efa1a..33f6d9a699f 100644 --- a/components/brave_rewards/core/publisher/publisher_status_helper.h +++ b/components/brave_rewards/core/publisher/publisher_status_helper.h @@ -8,15 +8,15 @@ #include -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace publisher { // Refreshes the publisher status for each entry in the specified list -void RefreshPublisherStatus(LedgerImpl& ledger, +void RefreshPublisherStatus(RewardsEngineImpl& engine, std::vector&& info_list, GetRecurringTipsCallback callback); diff --git a/components/brave_rewards/core/publisher/publisher_unittest.cc b/components/brave_rewards/core/publisher/publisher_unittest.cc index 554fbbb399b..bca46a0924a 100644 --- a/components/brave_rewards/core/publisher/publisher_unittest.cc +++ b/components/brave_rewards/core/publisher/publisher_unittest.cc @@ -9,10 +9,10 @@ #include "base/containers/flat_map.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/database/database_mock.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "testing/gtest/include/gtest/gtest.h" @@ -44,17 +44,17 @@ class PublisherTest : public testing::Test { } void SetUp() override { - ON_CALL(*mock_ledger_impl_.mock_client(), GetDoubleState(state::kScoreA, _)) + ON_CALL(*mock_engine_impl_.mock_client(), GetDoubleState(state::kScoreA, _)) .WillByDefault([this](const std::string&, auto callback) { std::move(callback).Run(a_); }); - ON_CALL(*mock_ledger_impl_.mock_client(), GetDoubleState(state::kScoreB, _)) + ON_CALL(*mock_engine_impl_.mock_client(), GetDoubleState(state::kScoreB, _)) .WillByDefault([this](const std::string&, auto callback) { std::move(callback).Run(b_); }); - ON_CALL(*mock_ledger_impl_.mock_client(), SetDoubleState(_, _, _)) + ON_CALL(*mock_engine_impl_.mock_client(), SetDoubleState(_, _, _)) .WillByDefault( [this](const std::string& key, double value, auto callback) { if (key == state::kScoreA) { @@ -68,15 +68,15 @@ class PublisherTest : public testing::Test { } }); - ON_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + ON_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .WillByDefault([](mojom::DBTransactionPtr, auto callback) { std::move(callback).Run(db_error_response->Clone()); }); } base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; - Publisher publisher_{mock_ledger_impl_}; + MockRewardsEngineImpl mock_engine_impl_; + Publisher publisher_{mock_engine_impl_}; double a_ = 0; double b_ = 0; diff --git a/components/brave_rewards/core/publisher/server_publisher_fetcher.cc b/components/brave_rewards/core/publisher/server_publisher_fetcher.cc index 0e442cf1098..578f423e53d 100644 --- a/components/brave_rewards/core/publisher/server_publisher_fetcher.cc +++ b/components/brave_rewards/core/publisher/server_publisher_fetcher.cc @@ -14,9 +14,9 @@ #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/publisher/prefix_util.h" #include "brave/components/brave_rewards/core/publisher/protos/channel_response.pb.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave_base/random.h" using std::placeholders::_1; @@ -40,8 +40,8 @@ int64_t GetCacheExpiryInSeconds() { namespace publisher { -ServerPublisherFetcher::ServerPublisherFetcher(LedgerImpl& ledger) - : ledger_(ledger), private_cdn_server_(ledger) {} +ServerPublisherFetcher::ServerPublisherFetcher(RewardsEngineImpl& engine) + : engine_(engine), private_cdn_server_(engine) {} ServerPublisherFetcher::~ServerPublisherFetcher() = default; @@ -69,7 +69,7 @@ void ServerPublisherFetcher::OnFetchCompleted( const mojom::Result result, mojom::ServerPublisherInfoPtr info, const std::string& publisher_key) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { RunCallbacks(publisher_key, nullptr); return; } @@ -80,9 +80,9 @@ void ServerPublisherFetcher::OnFetchCompleted( std::make_shared(std::move(info)); // Store the result for subsequent lookups. - ledger_->database()->InsertServerPublisherInfo( + engine_->database()->InsertServerPublisherInfo( **shared_info, [this, publisher_key, shared_info](mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Error saving server publisher info record"); } RunCallbacks(publisher_key, std::move(*shared_info)); @@ -113,7 +113,7 @@ bool ServerPublisherFetcher::IsExpired( void ServerPublisherFetcher::PurgeExpiredRecords() { BLOG(1, "Purging expired server publisher info records"); int64_t max_age = GetCacheExpiryInSeconds() * 2; - ledger_->database()->DeleteExpiredServerPublisherInfo(max_age, + engine_->database()->DeleteExpiredServerPublisherInfo(max_age, [](auto result) {}); } @@ -136,7 +136,7 @@ void ServerPublisherFetcher::RunCallbacks( for (auto& callback : callbacks) { callback(server_info ? server_info.Clone() : nullptr); } - ledger_->client()->OnPublisherUpdated(publisher_key); + engine_->client()->OnPublisherUpdated(publisher_key); } } // namespace publisher diff --git a/components/brave_rewards/core/publisher/server_publisher_fetcher.h b/components/brave_rewards/core/publisher/server_publisher_fetcher.h index e9ef8862850..cd56b8cbcf6 100644 --- a/components/brave_rewards/core/publisher/server_publisher_fetcher.h +++ b/components/brave_rewards/core/publisher/server_publisher_fetcher.h @@ -13,10 +13,10 @@ #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/database/database_server_publisher_info.h" #include "brave/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace publisher { @@ -27,7 +27,7 @@ using FetchCallbackVector = // whether a server publisher info record is expired class ServerPublisherFetcher { public: - explicit ServerPublisherFetcher(LedgerImpl& ledger); + explicit ServerPublisherFetcher(RewardsEngineImpl& engine); ServerPublisherFetcher(const ServerPublisherFetcher&) = delete; ServerPublisherFetcher& operator=(const ServerPublisherFetcher&) = delete; @@ -55,7 +55,7 @@ class ServerPublisherFetcher { void RunCallbacks(const std::string& publisher_key, mojom::ServerPublisherInfoPtr server_info); - const raw_ref ledger_; + const raw_ref engine_; std::map callback_map_; endpoint::PrivateCDNServer private_cdn_server_; }; diff --git a/components/brave_rewards/core/recovery/recovery.cc b/components/brave_rewards/core/recovery/recovery.cc index d25ba63adb3..10cc775961c 100644 --- a/components/brave_rewards/core/recovery/recovery.cc +++ b/components/brave_rewards/core/recovery/recovery.cc @@ -4,19 +4,19 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/recovery/recovery.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" namespace brave_rewards::internal { namespace recovery { -Recovery::Recovery(LedgerImpl& ledger) - : ledger_(ledger), empty_balance_(ledger) {} +Recovery::Recovery(RewardsEngineImpl& engine) + : engine_(engine), empty_balance_(engine) {} Recovery::~Recovery() = default; void Recovery::Check() { - if (!ledger_->state()->GetEmptyBalanceChecked()) { + if (!engine_->state()->GetEmptyBalanceChecked()) { BLOG(1, "Running empty balance check...") empty_balance_.Check(); } diff --git a/components/brave_rewards/core/recovery/recovery.h b/components/brave_rewards/core/recovery/recovery.h index cdff43c5d5d..f80a14463bd 100644 --- a/components/brave_rewards/core/recovery/recovery.h +++ b/components/brave_rewards/core/recovery/recovery.h @@ -10,19 +10,19 @@ #include "brave/components/brave_rewards/core/recovery/recovery_empty_balance.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace recovery { class Recovery { public: - explicit Recovery(LedgerImpl& ledger); + explicit Recovery(RewardsEngineImpl& engine); ~Recovery(); void Check(); private: - const raw_ref ledger_; + const raw_ref engine_; EmptyBalance empty_balance_; }; diff --git a/components/brave_rewards/core/recovery/recovery_empty_balance.cc b/components/brave_rewards/core/recovery/recovery_empty_balance.cc index d134b7e9163..d2adf205b29 100644 --- a/components/brave_rewards/core/recovery/recovery_empty_balance.cc +++ b/components/brave_rewards/core/recovery/recovery_empty_balance.cc @@ -10,8 +10,8 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/credentials/credentials_util.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/recovery/recovery_empty_balance.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" #include "net/http/http_status_code.h" @@ -26,14 +26,14 @@ const int32_t kVersion = 1; namespace brave_rewards::internal { namespace recovery { -EmptyBalance::EmptyBalance(LedgerImpl& ledger) - : ledger_(ledger), promotion_server_(ledger) {} +EmptyBalance::EmptyBalance(RewardsEngineImpl& engine) + : engine_(engine), promotion_server_(engine) {} EmptyBalance::~EmptyBalance() = default; void EmptyBalance::Check() { auto get_callback = std::bind(&EmptyBalance::OnAllContributions, this, _1); - ledger_->database()->GetAllContributions(get_callback); + engine_->database()->GetAllContributions(get_callback); } void EmptyBalance::OnAllContributions( @@ -66,7 +66,7 @@ void EmptyBalance::GetPromotions(database::GetPromotionListCallback callback) { auto get_callback = std::bind(&EmptyBalance::OnPromotions, this, _1, callback); - ledger_->database()->GetAllPromotions(get_callback); + engine_->database()->GetAllPromotions(get_callback); } void EmptyBalance::OnPromotions( @@ -96,13 +96,13 @@ void EmptyBalance::GetCredsByPromotions(std::vector list) { auto get_callback = std::bind(&EmptyBalance::OnCreds, this, _1); - ledger_->database()->GetCredsBatchesByTriggers(promotion_ids, get_callback); + engine_->database()->GetCredsBatchesByTriggers(promotion_ids, get_callback); } void EmptyBalance::OnCreds(std::vector list) { if (list.empty()) { BLOG(1, "Creds batch list is emtpy"); - ledger_->state()->SetEmptyBalanceChecked(true); + engine_->state()->SetEmptyBalanceChecked(true); return; } @@ -131,19 +131,19 @@ void EmptyBalance::OnCreds(std::vector list) { if (token_list.empty()) { BLOG(1, "Unblinded token list is emtpy"); - ledger_->state()->SetEmptyBalanceChecked(true); + engine_->state()->SetEmptyBalanceChecked(true); return; } auto save_callback = std::bind(&EmptyBalance::OnSaveUnblindedCreds, this, _1); - ledger_->database()->SaveUnblindedTokenList(std::move(token_list), + engine_->database()->SaveUnblindedTokenList(std::move(token_list), save_callback); } void EmptyBalance::OnSaveUnblindedCreds(const mojom::Result result) { BLOG(1, "Finished empty balance migration with result: " << result); - ledger_->state()->SetEmptyBalanceChecked(true); + engine_->state()->SetEmptyBalanceChecked(true); } void EmptyBalance::GetAllTokens(std::vector list, @@ -160,7 +160,7 @@ void EmptyBalance::GetAllTokens(std::vector list, auto tokens_callback = std::bind(&EmptyBalance::ReportResults, this, _1, contribution_sum, promotion_sum); - ledger_->database()->GetSpendableUnblindedTokensByBatchTypes( + engine_->database()->GetSpendableUnblindedTokensByBatchTypes( {mojom::CredsBatchType::PROMOTION}, tokens_callback); } @@ -177,7 +177,7 @@ void EmptyBalance::ReportResults(std::vector list, if (total <= 0) { BLOG(1, "Unblinded token total is OK"); - ledger_->state()->SetEmptyBalanceChecked(true); + engine_->state()->SetEmptyBalanceChecked(true); return; } @@ -189,12 +189,12 @@ void EmptyBalance::ReportResults(std::vector list, } void EmptyBalance::Sent(const mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { return; } BLOG(1, "Finished empty balance migration!"); - ledger_->state()->SetEmptyBalanceChecked(true); + engine_->state()->SetEmptyBalanceChecked(true); } } // namespace recovery diff --git a/components/brave_rewards/core/recovery/recovery_empty_balance.h b/components/brave_rewards/core/recovery/recovery_empty_balance.h index a46d67e65d0..3248c3b803f 100644 --- a/components/brave_rewards/core/recovery/recovery_empty_balance.h +++ b/components/brave_rewards/core/recovery/recovery_empty_balance.h @@ -14,13 +14,13 @@ #include "brave/components/brave_rewards/core/endpoint/promotion/promotion_server.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace recovery { class EmptyBalance { public: - explicit EmptyBalance(LedgerImpl& ledger); + explicit EmptyBalance(RewardsEngineImpl& engine); ~EmptyBalance(); void Check(); @@ -48,7 +48,7 @@ class EmptyBalance { void Sent(const mojom::Result result); - const raw_ref ledger_; + const raw_ref engine_; endpoint::PromotionServer promotion_server_; }; diff --git a/components/brave_rewards/core/report/report.cc b/components/brave_rewards/core/report/report.cc index 9392076d619..bf05770240f 100644 --- a/components/brave_rewards/core/report/report.cc +++ b/components/brave_rewards/core/report/report.cc @@ -10,8 +10,8 @@ #include "base/strings/string_split.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/report/report.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" using std::placeholders::_1; using std::placeholders::_2; @@ -19,7 +19,7 @@ using std::placeholders::_2; namespace brave_rewards::internal { namespace report { -Report::Report(LedgerImpl& ledger) : ledger_(ledger) {} +Report::Report(RewardsEngineImpl& engine) : engine_(engine) {} Report::~Report() = default; @@ -29,7 +29,7 @@ void Report::GetMonthly(const mojom::ActivityMonth month, auto balance_callback = std::bind(&Report::OnBalance, this, _1, _2, month, year, callback); - ledger_->database()->GetBalanceReportInfo(month, year, balance_callback); + engine_->database()->GetBalanceReportInfo(month, year, balance_callback); } void Report::OnBalance(const mojom::Result result, @@ -37,7 +37,7 @@ void Report::OnBalance(const mojom::Result result, const mojom::ActivityMonth month, const uint32_t year, GetMonthlyReportCallback callback) { - if (result != mojom::Result::LEDGER_OK || !balance_report) { + if (result != mojom::Result::OK || !balance_report) { BLOG(0, "Could not get balance report"); callback(result, nullptr); return; @@ -51,7 +51,7 @@ void Report::OnBalance(const mojom::Result result, std::make_shared(std::move(monthly_report)), callback); - ledger_->database()->GetTransactionReport(month, year, transaction_callback); + engine_->database()->GetTransactionReport(month, year, transaction_callback); } void Report::OnTransactions( @@ -62,7 +62,7 @@ void Report::OnTransactions( GetMonthlyReportCallback callback) { if (!shared_report) { BLOG(0, "Could not parse monthly report"); - callback(mojom::Result::LEDGER_ERROR, nullptr); + callback(mojom::Result::FAILED, nullptr); return; } @@ -71,7 +71,7 @@ void Report::OnTransactions( auto contribution_callback = std::bind(&Report::OnContributions, this, _1, shared_report, callback); - ledger_->database()->GetContributionReport(month, year, + engine_->database()->GetContributionReport(month, year, contribution_callback); } @@ -81,13 +81,13 @@ void Report::OnContributions( GetMonthlyReportCallback callback) { if (!shared_report) { BLOG(0, "Could not parse monthly report"); - callback(mojom::Result::LEDGER_ERROR, nullptr); + callback(mojom::Result::FAILED, nullptr); return; } (*shared_report)->contributions = std::move(contribution_report); - callback(mojom::Result::LEDGER_OK, std::move(*shared_report)); + callback(mojom::Result::OK, std::move(*shared_report)); } // This will be removed when we move reports in database and just order in db @@ -116,7 +116,7 @@ void Report::GetAllMonthlyIds(GetAllMonthlyReportIdsCallback callback) { auto balance_reports_callback = std::bind(&Report::OnGetAllBalanceReports, this, _1, callback); - ledger_->database()->GetAllBalanceReports(balance_reports_callback); + engine_->database()->GetAllBalanceReports(balance_reports_callback); } void Report::OnGetAllBalanceReports( diff --git a/components/brave_rewards/core/report/report.h b/components/brave_rewards/core/report/report.h index 50852bd90d3..283939ef3de 100644 --- a/components/brave_rewards/core/report/report.h +++ b/components/brave_rewards/core/report/report.h @@ -12,14 +12,14 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { namespace report { class Report { public: - explicit Report(LedgerImpl& ledger); + explicit Report(RewardsEngineImpl& engine); ~Report(); @@ -51,7 +51,7 @@ class Report { void OnGetAllBalanceReports(std::vector reports, GetAllMonthlyReportIdsCallback callback); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace report diff --git a/components/brave_rewards/core/ledger_callbacks.h b/components/brave_rewards/core/rewards_callbacks.h similarity index 77% rename from components/brave_rewards/core/ledger_callbacks.h rename to components/brave_rewards/core/rewards_callbacks.h index ab67c4cfbe3..cfa44de4bef 100644 --- a/components/brave_rewards/core/ledger_callbacks.h +++ b/components/brave_rewards/core/rewards_callbacks.h @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_CALLBACKS_H_ -#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_CALLBACKS_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_CALLBACKS_H_ +#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_CALLBACKS_H_ #include #include @@ -13,40 +13,42 @@ #include "base/containers/flat_map.h" #include "base/functional/callback_forward.h" #include "base/types/expected.h" -#include "brave/components/brave_rewards/common/mojom/bat_ledger.mojom.h" -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom.h" #include "brave/components/brave_rewards/core/mojom_structs.h" namespace brave_rewards::internal { -using AttestPromotionCallback = mojom::Ledger::AttestPromotionCallback; +using AttestPromotionCallback = mojom::RewardsEngine::AttestPromotionCallback; -using ClaimPromotionCallback = mojom::Ledger::ClaimPromotionCallback; +using ClaimPromotionCallback = mojom::RewardsEngine::ClaimPromotionCallback; using ConnectExternalWalletCallback = - mojom::Ledger::ConnectExternalWalletCallback; + mojom::RewardsEngine::ConnectExternalWalletCallback; using ConnectExternalWalletResult = base::expected; -using CreateRewardsWalletCallback = mojom::Ledger::CreateRewardsWalletCallback; +using CreateRewardsWalletCallback = + mojom::RewardsEngine::CreateRewardsWalletCallback; -using FetchBalanceCallback = mojom::Ledger::FetchBalanceCallback; +using FetchBalanceCallback = mojom::RewardsEngine::FetchBalanceCallback; using FetchBalanceResult = base::expected; -using FetchPromotionsCallback = mojom::Ledger::FetchPromotionsCallback; +using FetchPromotionsCallback = mojom::RewardsEngine::FetchPromotionsCallback; -using GetExternalWalletCallback = mojom::Ledger::GetExternalWalletCallback; +using GetExternalWalletCallback = + mojom::RewardsEngine::GetExternalWalletCallback; using GetExternalWalletResult = base::expected; using GetRewardsParametersCallback = - mojom::Ledger::GetRewardsParametersCallback; + mojom::RewardsEngine::GetRewardsParametersCallback; -using GetRewardsWalletCallback = mojom::Ledger::GetRewardsWalletCallback; +using GetRewardsWalletCallback = mojom::RewardsEngine::GetRewardsWalletCallback; using LoadURLCallback = base::OnceCallback; @@ -127,4 +129,4 @@ using UnverifiedPublishersCallback = } // namespace brave_rewards::internal -#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_CALLBACKS_H_ +#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_CALLBACKS_H_ diff --git a/components/brave_rewards/core/ledger_database.cc b/components/brave_rewards/core/rewards_database.cc similarity index 93% rename from components/brave_rewards/core/ledger_database.cc rename to components/brave_rewards/core/rewards_database.cc index ead3ec65256..97b5b541b34 100644 --- a/components/brave_rewards/core/ledger_database.cc +++ b/components/brave_rewards/core/rewards_database.cc @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "brave/components/brave_rewards/core/ledger_database.h" +#include "brave/components/brave_rewards/core/rewards_database.h" #include #include @@ -101,13 +101,13 @@ mojom::DBRecordPtr CreateRecord( } // namespace -LedgerDatabase::LedgerDatabase(const base::FilePath& path) : db_path_(path) { +RewardsDatabase::RewardsDatabase(const base::FilePath& path) : db_path_(path) { DETACH_FROM_SEQUENCE(sequence_checker_); } -LedgerDatabase::~LedgerDatabase() = default; +RewardsDatabase::~RewardsDatabase() = default; -mojom::DBCommandResponsePtr LedgerDatabase::RunTransaction( +mojom::DBCommandResponsePtr RewardsDatabase::RunTransaction( mojom::DBTransactionPtr transaction) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -199,7 +199,7 @@ mojom::DBCommandResponsePtr LedgerDatabase::RunTransaction( return command_response; } -mojom::DBCommandResponse::Status LedgerDatabase::Initialize( +mojom::DBCommandResponse::Status RewardsDatabase::Initialize( const int32_t version, const int32_t compatible_version, mojom::DBCommandResponse* command_response) { @@ -226,7 +226,7 @@ mojom::DBCommandResponse::Status LedgerDatabase::Initialize( initialized_ = true; memory_pressure_listener_ = std::make_unique( - FROM_HERE, base::BindRepeating(&LedgerDatabase::OnMemoryPressure, + FROM_HERE, base::BindRepeating(&RewardsDatabase::OnMemoryPressure, base::Unretained(this))); } else { table_version = meta_table_.GetVersionNumber(); @@ -239,7 +239,7 @@ mojom::DBCommandResponse::Status LedgerDatabase::Initialize( return mojom::DBCommandResponse::Status::RESPONSE_OK; } -mojom::DBCommandResponse::Status LedgerDatabase::Execute( +mojom::DBCommandResponse::Status RewardsDatabase::Execute( mojom::DBCommand* command) { if (!initialized_) { return mojom::DBCommandResponse::Status::INITIALIZATION_ERROR; @@ -259,7 +259,7 @@ mojom::DBCommandResponse::Status LedgerDatabase::Execute( return mojom::DBCommandResponse::Status::RESPONSE_OK; } -mojom::DBCommandResponse::Status LedgerDatabase::Run( +mojom::DBCommandResponse::Status RewardsDatabase::Run( mojom::DBCommand* command) { if (!initialized_) { return mojom::DBCommandResponse::Status::INITIALIZATION_ERROR; @@ -284,7 +284,7 @@ mojom::DBCommandResponse::Status LedgerDatabase::Run( return mojom::DBCommandResponse::Status::RESPONSE_OK; } -mojom::DBCommandResponse::Status LedgerDatabase::Read( +mojom::DBCommandResponse::Status RewardsDatabase::Read( mojom::DBCommand* command, mojom::DBCommandResponse* command_response) { if (!initialized_) { @@ -311,7 +311,7 @@ mojom::DBCommandResponse::Status LedgerDatabase::Read( return mojom::DBCommandResponse::Status::RESPONSE_OK; } -mojom::DBCommandResponse::Status LedgerDatabase::Migrate( +mojom::DBCommandResponse::Status RewardsDatabase::Migrate( const int32_t version, const int32_t compatible_version) { if (!initialized_) { @@ -324,7 +324,7 @@ mojom::DBCommandResponse::Status LedgerDatabase::Migrate( return mojom::DBCommandResponse::Status::RESPONSE_OK; } -void LedgerDatabase::OnMemoryPressure( +void RewardsDatabase::OnMemoryPressure( base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); db_.TrimMemory(); diff --git a/components/brave_rewards/core/ledger_database.h b/components/brave_rewards/core/rewards_database.h similarity index 76% rename from components/brave_rewards/core/ledger_database.h rename to components/brave_rewards/core/rewards_database.h index ec911d9b5d8..60c3e6b7069 100644 --- a/components/brave_rewards/core/ledger_database.h +++ b/components/brave_rewards/core/rewards_database.h @@ -3,29 +3,29 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_DATABASE_H_ -#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_DATABASE_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_DATABASE_H_ +#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_DATABASE_H_ #include #include "base/files/file_path.h" #include "base/memory/memory_pressure_listener.h" #include "base/sequence_checker.h" -#include "brave/components/brave_rewards/common/mojom/ledger_database.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_database.mojom.h" #include "sql/database.h" #include "sql/init_status.h" #include "sql/meta_table.h" namespace brave_rewards::internal { -class LedgerDatabase { +class RewardsDatabase { public: - explicit LedgerDatabase(const base::FilePath& path); + explicit RewardsDatabase(const base::FilePath& path); - LedgerDatabase(const LedgerDatabase&) = delete; - LedgerDatabase& operator=(const LedgerDatabase&) = delete; + RewardsDatabase(const RewardsDatabase&) = delete; + RewardsDatabase& operator=(const RewardsDatabase&) = delete; - ~LedgerDatabase(); + ~RewardsDatabase(); mojom::DBCommandResponsePtr RunTransaction( mojom::DBTransactionPtr transaction); @@ -64,4 +64,4 @@ class LedgerDatabase { } // namespace brave_rewards::internal -#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_DATABASE_H_ +#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_DATABASE_H_ diff --git a/components/brave_rewards/core/ledger_client_mock.cc b/components/brave_rewards/core/rewards_engine_client_mock.cc similarity index 84% rename from components/brave_rewards/core/ledger_client_mock.cc rename to components/brave_rewards/core/rewards_engine_client_mock.cc index fdbcf2bb154..2d3ff2bb0d1 100644 --- a/components/brave_rewards/core/ledger_client_mock.cc +++ b/components/brave_rewards/core/rewards_engine_client_mock.cc @@ -3,28 +3,28 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "brave/components/brave_rewards/core/ledger_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" #include -#include "brave/components/brave_rewards/core/test/test_ledger_client.h" +#include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" using ::testing::_; namespace brave_rewards::internal { -MockLedgerClient::MockLedgerClient() { +MockRewardsEngineClient::MockRewardsEngineClient() { // If a mock function takes a response callback as its parameter, // its default action won't run the callback passed to it, which is an error // if the callback's corresponding interface pipe is not closed. Make sure we // don't drop response callbacks by explicitly specifying default actions for // such functions. - ON_CALL(*this, LoadLedgerState(_)).WillByDefault([](auto callback) { - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + ON_CALL(*this, LoadLegacyState(_)).WillByDefault([](auto callback) { + std::move(callback).Run(mojom::Result::FAILED, ""); }); ON_CALL(*this, LoadPublisherState(_)).WillByDefault([](auto callback) { - std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + std::move(callback).Run(mojom::Result::FAILED, ""); }); ON_CALL(*this, FetchFavIcon(_, _, _)) @@ -132,7 +132,7 @@ MockLedgerClient::MockLedgerClient() { ON_CALL(*this, ShowNotification(_, _, _)) .WillByDefault([](const std::string&, const std::vector&, auto callback) { - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); }); ON_CALL(*this, GetClientInfo(_)).WillByDefault([](auto callback) { @@ -145,19 +145,19 @@ MockLedgerClient::MockLedgerClient() { }); ON_CALL(*this, DeleteLog(_)).WillByDefault([](auto callback) { - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); }); } -MockLedgerClient::~MockLedgerClient() = default; +MockRewardsEngineClient::~MockRewardsEngineClient() = default; -void MockLedgerClient::EncryptString(const std::string& value, - EncryptStringCallback callback) { +void MockRewardsEngineClient::EncryptString(const std::string& value, + EncryptStringCallback callback) { std::move(callback).Run(FakeEncryption::EncryptString(value)); } -void MockLedgerClient::DecryptString(const std::string& value, - DecryptStringCallback callback) { +void MockRewardsEngineClient::DecryptString(const std::string& value, + DecryptStringCallback callback) { std::move(callback).Run(FakeEncryption::DecryptString(value)); } diff --git a/components/brave_rewards/core/ledger_client_mock.h b/components/brave_rewards/core/rewards_engine_client_mock.h similarity index 87% rename from components/brave_rewards/core/ledger_client_mock.h rename to components/brave_rewards/core/rewards_engine_client_mock.h index d1cb694f887..12d45099165 100644 --- a/components/brave_rewards/core/ledger_client_mock.h +++ b/components/brave_rewards/core/rewards_engine_client_mock.h @@ -3,15 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_CLIENT_MOCK_H_ -#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_CLIENT_MOCK_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_CLIENT_MOCK_H_ +#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_CLIENT_MOCK_H_ #include #include -#include "brave/components/brave_rewards/common/mojom/bat_ledger.mojom.h" -#include "brave/components/brave_rewards/common/mojom/ledger.mojom.h" -#include "brave/components/brave_rewards/common/mojom/ledger_database.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_database.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom.h" #include "testing/gmock/include/gmock/gmock.h" namespace brave_rewards::internal { @@ -22,13 +22,13 @@ inline const auto db_error_response = [] { return response; }(); -class MockLedgerClient : public mojom::LedgerClient { +class MockRewardsEngineClient : public mojom::RewardsEngineClient { public: - MockLedgerClient(); + MockRewardsEngineClient(); - ~MockLedgerClient() override; + ~MockRewardsEngineClient() override; - MOCK_METHOD1(LoadLedgerState, void(LoadLedgerStateCallback)); + MOCK_METHOD1(LoadLegacyState, void(LoadLegacyStateCallback)); MOCK_METHOD1(LoadPublisherState, void(LoadPublisherStateCallback)); @@ -146,4 +146,4 @@ class MockLedgerClient : public mojom::LedgerClient { } // namespace brave_rewards::internal -#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_CLIENT_MOCK_H_ +#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_CLIENT_MOCK_H_ diff --git a/components/brave_rewards/core/ledger_impl.cc b/components/brave_rewards/core/rewards_engine_impl.cc similarity index 67% rename from components/brave_rewards/core/ledger_impl.cc rename to components/brave_rewards/core/rewards_engine_impl.cc index bd6fba5fd90..20dfc961222 100644 --- a/components/brave_rewards/core/ledger_impl.cc +++ b/components/brave_rewards/core/rewards_engine_impl.cc @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include #include @@ -20,9 +20,9 @@ using std::placeholders::_1; namespace brave_rewards::internal { -LedgerImpl::LedgerImpl( - mojo::PendingAssociatedRemote ledger_client_remote) - : ledger_client_(std::move(ledger_client_remote)), +RewardsEngineImpl::RewardsEngineImpl( + mojo::PendingAssociatedRemote client_remote) + : client_(std::move(client_remote)), promotion_(*this), publisher_(*this), media_(*this), @@ -37,30 +37,32 @@ LedgerImpl::LedgerImpl( gemini_(*this), uphold_(*this) { DCHECK(base::ThreadPoolInstance::Get()); - set_ledger_client_for_logging(ledger_client_.get()); + set_client_for_logging(client_.get()); } -LedgerImpl::~LedgerImpl() { - set_ledger_client_for_logging(nullptr); +RewardsEngineImpl::~RewardsEngineImpl() { + set_client_for_logging(nullptr); } -// mojom::Ledger implementation begin (in the order of appearance in Mojom) -void LedgerImpl::Initialize(InitializeCallback callback) { +// mojom::RewardsEngine implementation begin (in the order of appearance in +// Mojom) +void RewardsEngineImpl::Initialize(InitializeCallback callback) { if (ready_state_ != ReadyState::kUninitialized) { - BLOG(0, "Ledger already initializing"); - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + BLOG(0, "Already initializing"); + return std::move(callback).Run(mojom::Result::FAILED); } ready_state_ = ReadyState::kInitializing; InitializeDatabase(ToLegacyCallback(std::move(callback))); } -void LedgerImpl::GetEnvironment(GetEnvironmentCallback callback) { +void RewardsEngineImpl::GetEnvironment(GetEnvironmentCallback callback) { std::move(callback).Run(_environment); } -void LedgerImpl::CreateRewardsWallet(const std::string& country, - CreateRewardsWalletCallback callback) { +void RewardsEngineImpl::CreateRewardsWallet( + const std::string& country, + CreateRewardsWalletCallback callback) { WhenReady([this, country, callback = std::move(callback)]() mutable { wallet()->CreateWalletIfNecessary( country.empty() ? absl::nullopt @@ -69,7 +71,8 @@ void LedgerImpl::CreateRewardsWallet(const std::string& country, }); } -void LedgerImpl::GetRewardsParameters(GetRewardsParametersCallback callback) { +void RewardsEngineImpl::GetRewardsParameters( + GetRewardsParametersCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { auto params = state()->GetRewardsParameters(); if (params->rate == 0.0) { @@ -84,7 +87,7 @@ void LedgerImpl::GetRewardsParameters(GetRewardsParametersCallback callback) { }); } -void LedgerImpl::GetAutoContributeProperties( +void RewardsEngineImpl::GetAutoContributeProperties( GetAutoContributePropertiesCallback callback) { if (!IsReady()) { return std::move(callback).Run(mojom::AutoContributeProperties::New()); @@ -99,7 +102,7 @@ void LedgerImpl::GetAutoContributeProperties( std::move(callback).Run(std::move(props)); } -void LedgerImpl::GetPublisherMinVisitTime( +void RewardsEngineImpl::GetPublisherMinVisitTime( GetPublisherMinVisitTimeCallback callback) { if (!IsReady()) { return std::move(callback).Run(0); @@ -108,7 +111,8 @@ void LedgerImpl::GetPublisherMinVisitTime( std::move(callback).Run(state()->GetPublisherMinVisitTime()); } -void LedgerImpl::GetPublisherMinVisits(GetPublisherMinVisitsCallback callback) { +void RewardsEngineImpl::GetPublisherMinVisits( + GetPublisherMinVisitsCallback callback) { if (!IsReady()) { return std::move(callback).Run(0); } @@ -116,7 +120,7 @@ void LedgerImpl::GetPublisherMinVisits(GetPublisherMinVisitsCallback callback) { std::move(callback).Run(state()->GetPublisherMinVisits()); } -void LedgerImpl::GetAutoContributeEnabled( +void RewardsEngineImpl::GetAutoContributeEnabled( GetAutoContributeEnabledCallback callback) { if (!IsReady()) { return std::move(callback).Run(false); @@ -125,7 +129,7 @@ void LedgerImpl::GetAutoContributeEnabled( std::move(callback).Run(state()->GetAutoContributeEnabled()); } -void LedgerImpl::GetReconcileStamp(GetReconcileStampCallback callback) { +void RewardsEngineImpl::GetReconcileStamp(GetReconcileStampCallback callback) { if (!IsReady()) { return std::move(callback).Run(0); } @@ -133,7 +137,8 @@ void LedgerImpl::GetReconcileStamp(GetReconcileStampCallback callback) { std::move(callback).Run(state()->GetReconcileStamp()); } -void LedgerImpl::OnLoad(mojom::VisitDataPtr visit_data, uint64_t current_time) { +void RewardsEngineImpl::OnLoad(mojom::VisitDataPtr visit_data, + uint64_t current_time) { if (!IsReady() || !visit_data || visit_data->domain.empty()) { return; } @@ -151,7 +156,7 @@ void LedgerImpl::OnLoad(mojom::VisitDataPtr visit_data, uint64_t current_time) { current_pages_[visit_data->tab_id] = *visit_data; } -void LedgerImpl::OnUnload(uint32_t tab_id, uint64_t current_time) { +void RewardsEngineImpl::OnUnload(uint32_t tab_id, uint64_t current_time) { if (!IsReady()) { return; } @@ -163,7 +168,7 @@ void LedgerImpl::OnUnload(uint32_t tab_id, uint64_t current_time) { } } -void LedgerImpl::OnShow(uint32_t tab_id, uint64_t current_time) { +void RewardsEngineImpl::OnShow(uint32_t tab_id, uint64_t current_time) { if (!IsReady()) { return; } @@ -172,7 +177,7 @@ void LedgerImpl::OnShow(uint32_t tab_id, uint64_t current_time) { last_shown_tab_id_ = tab_id; } -void LedgerImpl::OnHide(uint32_t tab_id, uint64_t current_time) { +void RewardsEngineImpl::OnHide(uint32_t tab_id, uint64_t current_time) { if (!IsReady()) { return; } @@ -201,7 +206,7 @@ void LedgerImpl::OnHide(uint32_t tab_id, uint64_t current_time) { [](mojom::Result, mojom::PublisherInfoPtr) {}); } -void LedgerImpl::OnForeground(uint32_t tab_id, uint64_t current_time) { +void RewardsEngineImpl::OnForeground(uint32_t tab_id, uint64_t current_time) { if (!IsReady()) { return; } @@ -220,7 +225,7 @@ void LedgerImpl::OnForeground(uint32_t tab_id, uint64_t current_time) { OnShow(tab_id, current_time); } -void LedgerImpl::OnBackground(uint32_t tab_id, uint64_t current_time) { +void RewardsEngineImpl::OnBackground(uint32_t tab_id, uint64_t current_time) { if (!IsReady()) { return; } @@ -235,7 +240,7 @@ void LedgerImpl::OnBackground(uint32_t tab_id, uint64_t current_time) { OnHide(tab_id, current_time); } -void LedgerImpl::OnXHRLoad( +void RewardsEngineImpl::OnXHRLoad( uint32_t tab_id, const std::string& url, const base::flat_map& parts, @@ -253,9 +258,10 @@ void LedgerImpl::OnXHRLoad( media()->ProcessMedia(parts, type, std::move(visit_data)); } -void LedgerImpl::SetPublisherExclude(const std::string& publisher_key, - mojom::PublisherExclude exclude, - SetPublisherExcludeCallback callback) { +void RewardsEngineImpl::SetPublisherExclude( + const std::string& publisher_key, + mojom::PublisherExclude exclude, + SetPublisherExcludeCallback callback) { WhenReady( [this, publisher_key, exclude, callback = std::move(callback)]() mutable { publisher()->SetPublisherExclude(publisher_key, exclude, @@ -263,64 +269,64 @@ void LedgerImpl::SetPublisherExclude(const std::string& publisher_key, }); } -void LedgerImpl::RestorePublishers(RestorePublishersCallback callback) { +void RewardsEngineImpl::RestorePublishers(RestorePublishersCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { database()->RestorePublishers(std::move(callback)); }); } -void LedgerImpl::FetchPromotions(FetchPromotionsCallback callback) { +void RewardsEngineImpl::FetchPromotions(FetchPromotionsCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { promotion()->Fetch(std::move(callback)); }); } -void LedgerImpl::ClaimPromotion(const std::string& promotion_id, - const std::string& payload, - ClaimPromotionCallback callback) { +void RewardsEngineImpl::ClaimPromotion(const std::string& promotion_id, + const std::string& payload, + ClaimPromotionCallback callback) { WhenReady( [this, promotion_id, payload, callback = std::move(callback)]() mutable { promotion()->Claim(promotion_id, payload, std::move(callback)); }); } -void LedgerImpl::AttestPromotion(const std::string& promotion_id, - const std::string& solution, - AttestPromotionCallback callback) { +void RewardsEngineImpl::AttestPromotion(const std::string& promotion_id, + const std::string& solution, + AttestPromotionCallback callback) { WhenReady( [this, promotion_id, solution, callback = std::move(callback)]() mutable { promotion()->Attest(promotion_id, solution, std::move(callback)); }); } -void LedgerImpl::SetPublisherMinVisitTime(int duration_in_seconds) { +void RewardsEngineImpl::SetPublisherMinVisitTime(int duration_in_seconds) { WhenReady([this, duration_in_seconds]() { state()->SetPublisherMinVisitTime(duration_in_seconds); }); } -void LedgerImpl::SetPublisherMinVisits(int visits) { +void RewardsEngineImpl::SetPublisherMinVisits(int visits) { WhenReady([this, visits]() { state()->SetPublisherMinVisits(visits); }); } -void LedgerImpl::SetAutoContributionAmount(double amount) { +void RewardsEngineImpl::SetAutoContributionAmount(double amount) { WhenReady([this, amount]() { state()->SetAutoContributionAmount(amount); }); } -void LedgerImpl::SetAutoContributeEnabled(bool enabled) { +void RewardsEngineImpl::SetAutoContributeEnabled(bool enabled) { WhenReady([this, enabled]() { state()->SetAutoContributeEnabled(enabled); }); } -void LedgerImpl::GetBalanceReport(mojom::ActivityMonth month, - int32_t year, - GetBalanceReportCallback callback) { +void RewardsEngineImpl::GetBalanceReport(mojom::ActivityMonth month, + int32_t year, + GetBalanceReportCallback callback) { WhenReady([this, month, year, callback = ToLegacyCallback(std::move(callback))]() mutable { database()->GetBalanceReportInfo(month, year, std::move(callback)); }); } -void LedgerImpl::GetPublisherActivityFromUrl( +void RewardsEngineImpl::GetPublisherActivityFromUrl( uint64_t window_id, mojom::VisitDataPtr visit_data, const std::string& publisher_blob) { @@ -331,7 +337,7 @@ void LedgerImpl::GetPublisherActivityFromUrl( }); } -void LedgerImpl::GetAutoContributionAmount( +void RewardsEngineImpl::GetAutoContributionAmount( GetAutoContributionAmountCallback callback) { if (!IsReady()) { return std::move(callback).Run(0); @@ -340,32 +346,34 @@ void LedgerImpl::GetAutoContributionAmount( std::move(callback).Run(state()->GetAutoContributionAmount()); } -void LedgerImpl::GetPublisherBanner(const std::string& publisher_id, - GetPublisherBannerCallback callback) { +void RewardsEngineImpl::GetPublisherBanner( + const std::string& publisher_id, + GetPublisherBannerCallback callback) { WhenReady([this, publisher_id, callback = ToLegacyCallback(std::move(callback))]() mutable { publisher()->GetPublisherBanner(publisher_id, std::move(callback)); }); } -void LedgerImpl::OneTimeTip(const std::string& publisher_key, - double amount, - OneTimeTipCallback callback) { +void RewardsEngineImpl::OneTimeTip(const std::string& publisher_key, + double amount, + OneTimeTipCallback callback) { WhenReady([this, publisher_key, amount, callback = ToLegacyCallback(std::move(callback))]() { contribution()->OneTimeTip(publisher_key, amount, std::move(callback)); }); } -void LedgerImpl::RemoveRecurringTip(const std::string& publisher_key, - RemoveRecurringTipCallback callback) { +void RewardsEngineImpl::RemoveRecurringTip( + const std::string& publisher_key, + RemoveRecurringTipCallback callback) { WhenReady([this, publisher_key, callback = ToLegacyCallback(std::move(callback))]() mutable { database()->RemoveRecurringTip(publisher_key, std::move(callback)); }); } -void LedgerImpl::GetCreationStamp(GetCreationStampCallback callback) { +void RewardsEngineImpl::GetCreationStamp(GetCreationStampCallback callback) { if (!IsReady()) { return std::move(callback).Run(0); } @@ -373,7 +381,7 @@ void LedgerImpl::GetCreationStamp(GetCreationStampCallback callback) { std::move(callback).Run(state()->GetCreationStamp()); } -void LedgerImpl::GetRewardsInternalsInfo( +void RewardsEngineImpl::GetRewardsInternalsInfo( GetRewardsInternalsInfoCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { auto info = mojom::RewardsInternalsInfo::New(); @@ -407,8 +415,8 @@ void LedgerImpl::GetRewardsInternalsInfo( }); } -void LedgerImpl::SaveRecurringTip(mojom::RecurringTipPtr info, - SaveRecurringTipCallback callback) { +void RewardsEngineImpl::SaveRecurringTip(mojom::RecurringTipPtr info, + SaveRecurringTipCallback callback) { WhenReady([this, info = std::move(info), callback = ToLegacyCallback(std::move(callback))]() mutable { database()->SaveRecurringTip( @@ -420,10 +428,10 @@ void LedgerImpl::SaveRecurringTip(mojom::RecurringTipPtr info, }); } -void LedgerImpl::SendContribution(const std::string& publisher_id, - double amount, - bool set_monthly, - SendContributionCallback callback) { +void RewardsEngineImpl::SendContribution(const std::string& publisher_id, + double amount, + bool set_monthly, + SendContributionCallback callback) { WhenReady([this, publisher_id, amount, set_monthly, callback = std::move(callback)]() mutable { contribution()->SendContribution(publisher_id, amount, set_monthly, @@ -431,23 +439,24 @@ void LedgerImpl::SendContribution(const std::string& publisher_id, }); } -void LedgerImpl::GetRecurringTips(GetRecurringTipsCallback callback) { +void RewardsEngineImpl::GetRecurringTips(GetRecurringTipsCallback callback) { WhenReady([this, callback = ToLegacyCallback(std::move(callback))]() mutable { contribution()->GetRecurringTips(std::move(callback)); }); } -void LedgerImpl::GetOneTimeTips(GetOneTimeTipsCallback callback) { +void RewardsEngineImpl::GetOneTimeTips(GetOneTimeTipsCallback callback) { WhenReady([this, callback = ToLegacyCallback(std::move(callback))]() mutable { database()->GetOneTimeTips(util::GetCurrentMonth(), util::GetCurrentYear(), std::move(callback)); }); } -void LedgerImpl::GetActivityInfoList(uint32_t start, - uint32_t limit, - mojom::ActivityInfoFilterPtr filter, - GetActivityInfoListCallback callback) { +void RewardsEngineImpl::GetActivityInfoList( + uint32_t start, + uint32_t limit, + mojom::ActivityInfoFilterPtr filter, + GetActivityInfoListCallback callback) { WhenReady([this, start, limit, filter = std::move(filter), callback = ToLegacyCallback(std::move(callback))]() mutable { database()->GetActivityInfoList(start, limit, std::move(filter), @@ -455,45 +464,46 @@ void LedgerImpl::GetActivityInfoList(uint32_t start, }); } -void LedgerImpl::GetPublishersVisitedCount( +void RewardsEngineImpl::GetPublishersVisitedCount( GetPublishersVisitedCountCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { database()->GetPublishersVisitedCount(std::move(callback)); }); } -void LedgerImpl::GetExcludedList(GetExcludedListCallback callback) { +void RewardsEngineImpl::GetExcludedList(GetExcludedListCallback callback) { WhenReady([this, callback = ToLegacyCallback(std::move(callback))]() mutable { database()->GetExcludedList(std::move(callback)); }); } -void LedgerImpl::RefreshPublisher(const std::string& publisher_key, - RefreshPublisherCallback callback) { +void RewardsEngineImpl::RefreshPublisher(const std::string& publisher_key, + RefreshPublisherCallback callback) { WhenReady([this, publisher_key, callback = ToLegacyCallback(std::move(callback))]() mutable { publisher()->RefreshPublisher(publisher_key, std::move(callback)); }); } -void LedgerImpl::StartContributionsForTesting() { +void RewardsEngineImpl::StartContributionsForTesting() { WhenReady([this]() { contribution()->StartContributionsForTesting(); // IN-TEST }); } -void LedgerImpl::UpdateMediaDuration(uint64_t window_id, - const std::string& publisher_key, - uint64_t duration, - bool first_visit) { +void RewardsEngineImpl::UpdateMediaDuration(uint64_t window_id, + const std::string& publisher_key, + uint64_t duration, + bool first_visit) { WhenReady([this, window_id, publisher_key, duration, first_visit]() { publisher()->UpdateMediaDuration(window_id, publisher_key, duration, first_visit); }); } -void LedgerImpl::IsPublisherRegistered(const std::string& publisher_id, - IsPublisherRegisteredCallback callback) { +void RewardsEngineImpl::IsPublisherRegistered( + const std::string& publisher_id, + IsPublisherRegisteredCallback callback) { WhenReady([this, publisher_id, callback = ToLegacyCallback(std::move(callback))]() mutable { publisher()->GetServerPublisherInfo( @@ -505,25 +515,27 @@ void LedgerImpl::IsPublisherRegistered(const std::string& publisher_id, }); } -void LedgerImpl::GetPublisherInfo(const std::string& publisher_key, - GetPublisherInfoCallback callback) { +void RewardsEngineImpl::GetPublisherInfo(const std::string& publisher_key, + GetPublisherInfoCallback callback) { WhenReady([this, publisher_key, callback = ToLegacyCallback(std::move(callback))]() mutable { database()->GetPublisherInfo(publisher_key, std::move(callback)); }); } -void LedgerImpl::GetPublisherPanelInfo(const std::string& publisher_key, - GetPublisherPanelInfoCallback callback) { +void RewardsEngineImpl::GetPublisherPanelInfo( + const std::string& publisher_key, + GetPublisherPanelInfoCallback callback) { WhenReady([this, publisher_key, callback = ToLegacyCallback(std::move(callback))]() mutable { publisher()->GetPublisherPanelInfo(publisher_key, std::move(callback)); }); } -void LedgerImpl::SavePublisherInfo(uint64_t window_id, - mojom::PublisherInfoPtr publisher_info, - SavePublisherInfoCallback callback) { +void RewardsEngineImpl::SavePublisherInfo( + uint64_t window_id, + mojom::PublisherInfoPtr publisher_info, + SavePublisherInfoCallback callback) { WhenReady([this, window_id, info = std::move(publisher_info), callback = ToLegacyCallback(std::move(callback))]() mutable { publisher()->SavePublisherInfo(window_id, std::move(info), @@ -531,7 +543,7 @@ void LedgerImpl::SavePublisherInfo(uint64_t window_id, }); } -void LedgerImpl::SetInlineTippingPlatformEnabled( +void RewardsEngineImpl::SetInlineTippingPlatformEnabled( mojom::InlineTipsPlatforms platform, bool enabled) { WhenReady([this, platform, enabled]() { @@ -539,7 +551,7 @@ void LedgerImpl::SetInlineTippingPlatformEnabled( }); } -void LedgerImpl::GetInlineTippingPlatformEnabled( +void RewardsEngineImpl::GetInlineTippingPlatformEnabled( mojom::InlineTipsPlatforms platform, GetInlineTippingPlatformEnabledCallback callback) { if (!IsReady()) { @@ -549,7 +561,7 @@ void LedgerImpl::GetInlineTippingPlatformEnabled( std::move(callback).Run(state()->GetInlineTippingPlatformEnabled(platform)); } -void LedgerImpl::GetShareURL( +void RewardsEngineImpl::GetShareURL( const base::flat_map& args, GetShareURLCallback callback) { if (!IsReady()) { @@ -559,14 +571,14 @@ void LedgerImpl::GetShareURL( std::move(callback).Run(publisher()->GetShareURL(args)); } -void LedgerImpl::FetchBalance(FetchBalanceCallback callback) { +void RewardsEngineImpl::FetchBalance(FetchBalanceCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { wallet()->FetchBalance(std::move(callback)); }); } -void LedgerImpl::GetExternalWallet(const std::string& wallet_type, - GetExternalWalletCallback callback) { +void RewardsEngineImpl::GetExternalWallet(const std::string& wallet_type, + GetExternalWalletCallback callback) { WhenReady([this, wallet_type, callback = std::move(callback)]() mutable { if (wallet_type == constant::kWalletBitflyer) { return bitflyer()->GetWallet(std::move(callback)); @@ -586,7 +598,7 @@ void LedgerImpl::GetExternalWallet(const std::string& wallet_type, }); } -void LedgerImpl::ConnectExternalWallet( +void RewardsEngineImpl::ConnectExternalWallet( const std::string& wallet_type, const base::flat_map& args, ConnectExternalWalletCallback callback) { @@ -610,71 +622,75 @@ void LedgerImpl::ConnectExternalWallet( }); } -void LedgerImpl::GetTransactionReport(mojom::ActivityMonth month, - int year, - GetTransactionReportCallback callback) { +void RewardsEngineImpl::GetTransactionReport( + mojom::ActivityMonth month, + int year, + GetTransactionReportCallback callback) { WhenReady([this, month, year, callback = ToLegacyCallback(std::move(callback))]() mutable { database()->GetTransactionReport(month, year, std::move(callback)); }); } -void LedgerImpl::GetContributionReport(mojom::ActivityMonth month, - int year, - GetContributionReportCallback callback) { +void RewardsEngineImpl::GetContributionReport( + mojom::ActivityMonth month, + int year, + GetContributionReportCallback callback) { WhenReady([this, month, year, callback = ToLegacyCallback(std::move(callback))]() mutable { database()->GetContributionReport(month, year, std::move(callback)); }); } -void LedgerImpl::GetAllContributions(GetAllContributionsCallback callback) { +void RewardsEngineImpl::GetAllContributions( + GetAllContributionsCallback callback) { WhenReady([this, callback = ToLegacyCallback(std::move(callback))]() mutable { database()->GetAllContributions(std::move(callback)); }); } -void LedgerImpl::GetMonthlyReport(mojom::ActivityMonth month, - int year, - GetMonthlyReportCallback callback) { +void RewardsEngineImpl::GetMonthlyReport(mojom::ActivityMonth month, + int year, + GetMonthlyReportCallback callback) { WhenReady([this, month, year, callback = ToLegacyCallback(std::move(callback))]() mutable { report()->GetMonthly(month, year, std::move(callback)); }); } -void LedgerImpl::GetAllMonthlyReportIds( +void RewardsEngineImpl::GetAllMonthlyReportIds( GetAllMonthlyReportIdsCallback callback) { WhenReady([this, callback = ToLegacyCallback(std::move(callback))]() mutable { report()->GetAllMonthlyIds(std::move(callback)); }); } -void LedgerImpl::GetAllPromotions(GetAllPromotionsCallback callback) { +void RewardsEngineImpl::GetAllPromotions(GetAllPromotionsCallback callback) { WhenReady([this, callback = ToLegacyCallback(std::move(callback))]() mutable { database()->GetAllPromotions(std::move(callback)); }); } -void LedgerImpl::Shutdown(ShutdownCallback callback) { +void RewardsEngineImpl::Shutdown(ShutdownCallback callback) { if (!IsReady()) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + return std::move(callback).Run(mojom::Result::FAILED); } ready_state_ = ReadyState::kShuttingDown; - ledger_client_->ClearAllNotifications(); + client_->ClearAllNotifications(); - database()->FinishAllInProgressContributions(std::bind( - &LedgerImpl::OnAllDone, this, _1, ToLegacyCallback(std::move(callback)))); + database()->FinishAllInProgressContributions( + std::bind(&RewardsEngineImpl::OnAllDone, this, _1, + ToLegacyCallback(std::move(callback)))); } -void LedgerImpl::GetEventLogs(GetEventLogsCallback callback) { +void RewardsEngineImpl::GetEventLogs(GetEventLogsCallback callback) { WhenReady([this, callback = ToLegacyCallback(std::move(callback))]() mutable { database()->GetLastEventLogs(std::move(callback)); }); } -void LedgerImpl::GetRewardsWallet(GetRewardsWalletCallback callback) { +void RewardsEngineImpl::GetRewardsWallet(GetRewardsWalletCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { auto rewards_wallet = wallet()->GetWallet(); if (rewards_wallet) { @@ -688,106 +704,107 @@ void LedgerImpl::GetRewardsWallet(GetRewardsWalletCallback callback) { std::move(callback).Run(std::move(rewards_wallet)); }); } -// mojom::Ledger implementation end +// mojom::RewardsEngine implementation end -// mojom::LedgerClient helpers begin (in the order of appearance in Mojom) -bool LedgerImpl::IsBitFlyerRegion() { +// mojom::RewardsEngineClient helpers begin (in the order of appearance in +// Mojom) +bool RewardsEngineImpl::IsBitFlyerRegion() { bool value = false; - ledger_client_->IsBitFlyerRegion(&value); + client_->IsBitFlyerRegion(&value); return value; } -std::string LedgerImpl::GetLegacyWallet() { +std::string RewardsEngineImpl::GetLegacyWallet() { std::string wallet; - ledger_client_->GetLegacyWallet(&wallet); + client_->GetLegacyWallet(&wallet); return wallet; } -mojom::ClientInfoPtr LedgerImpl::GetClientInfo() { +mojom::ClientInfoPtr RewardsEngineImpl::GetClientInfo() { auto info = mojom::ClientInfo::New(); - ledger_client_->GetClientInfo(&info); + client_->GetClientInfo(&info); return info; } -absl::optional LedgerImpl::EncryptString( +absl::optional RewardsEngineImpl::EncryptString( const std::string& value) { absl::optional result; - ledger_client_->EncryptString(value, &result); + client_->EncryptString(value, &result); return result; } -absl::optional LedgerImpl::DecryptString( +absl::optional RewardsEngineImpl::DecryptString( const std::string& value) { absl::optional result; - ledger_client_->DecryptString(value, &result); + client_->DecryptString(value, &result); return result; } -// mojom::LedgerClient helpers end +// mojom::RewardsEngineClient helpers end -mojom::LedgerClient* LedgerImpl::client() { - return ledger_client_.get(); +mojom::RewardsEngineClient* RewardsEngineImpl::client() { + return client_.get(); } -database::Database* LedgerImpl::database() { +database::Database* RewardsEngineImpl::database() { return &database_; } -bool LedgerImpl::IsShuttingDown() const { +bool RewardsEngineImpl::IsShuttingDown() const { return ready_state_ == ReadyState::kShuttingDown; } -bool LedgerImpl::IsUninitialized() const { +bool RewardsEngineImpl::IsUninitialized() const { return ready_state_ == ReadyState::kUninitialized; } -bool LedgerImpl::IsReady() const { +bool RewardsEngineImpl::IsReady() const { return ready_state_ == ReadyState::kReady; } -void LedgerImpl::InitializeDatabase(LegacyResultCallback callback) { +void RewardsEngineImpl::InitializeDatabase(LegacyResultCallback callback) { DCHECK(ready_state_ == ReadyState::kInitializing); - LegacyResultCallback finish_callback = - std::bind(&LedgerImpl::OnInitialized, this, _1, std::move(callback)); + LegacyResultCallback finish_callback = std::bind( + &RewardsEngineImpl::OnInitialized, this, _1, std::move(callback)); - auto database_callback = - std::bind(&LedgerImpl::OnDatabaseInitialized, this, _1, finish_callback); + auto database_callback = std::bind(&RewardsEngineImpl::OnDatabaseInitialized, + this, _1, finish_callback); database()->Initialize(database_callback); } -void LedgerImpl::OnDatabaseInitialized(mojom::Result result, - LegacyResultCallback callback) { +void RewardsEngineImpl::OnDatabaseInitialized(mojom::Result result, + LegacyResultCallback callback) { DCHECK(ready_state_ == ReadyState::kInitializing); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Database could not be initialized. Error: " << result); callback(result); return; } - state()->Initialize(base::BindOnce(&LedgerImpl::OnStateInitialized, + state()->Initialize(base::BindOnce(&RewardsEngineImpl::OnStateInitialized, base::Unretained(this), std::move(callback))); } -void LedgerImpl::OnStateInitialized(LegacyResultCallback callback, - mojom::Result result) { +void RewardsEngineImpl::OnStateInitialized(LegacyResultCallback callback, + mojom::Result result) { DCHECK(ready_state_ == ReadyState::kInitializing); - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to initialize state"); callback(result); return; } - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } -void LedgerImpl::OnInitialized(mojom::Result result, - LegacyResultCallback callback) { +void RewardsEngineImpl::OnInitialized(mojom::Result result, + LegacyResultCallback callback) { DCHECK(ready_state_ == ReadyState::kInitializing); - if (result == mojom::Result::LEDGER_OK) { + if (result == mojom::Result::OK) { StartServices(); } else { BLOG(0, "Failed to initialize wallet " << result); @@ -804,7 +821,7 @@ void LedgerImpl::OnInitialized(mojom::Result result, callback(result); } -void LedgerImpl::StartServices() { +void RewardsEngineImpl::StartServices() { DCHECK(ready_state_ == ReadyState::kInitializing); publisher()->SetPublisherServerListTimer(); @@ -817,13 +834,13 @@ void LedgerImpl::StartServices() { recovery_.Check(); } -void LedgerImpl::OnAllDone(mojom::Result result, - LegacyResultCallback callback) { +void RewardsEngineImpl::OnAllDone(mojom::Result result, + LegacyResultCallback callback) { database()->Close(std::move(callback)); } template -void LedgerImpl::WhenReady(T callback) { +void RewardsEngineImpl::WhenReady(T callback) { switch (ready_state_) { case ReadyState::kReady: callback(); diff --git a/components/brave_rewards/core/ledger_impl.h b/components/brave_rewards/core/rewards_engine_impl.h similarity index 83% rename from components/brave_rewards/core/ledger_impl.h rename to components/brave_rewards/core/rewards_engine_impl.h index 50cefd92afb..4b10ef42237 100644 --- a/components/brave_rewards/core/ledger_impl.h +++ b/components/brave_rewards/core/rewards_engine_impl.h @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_IMPL_H_ -#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_IMPL_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_IMPL_H_ +#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_IMPL_H_ #include #include @@ -13,19 +13,19 @@ #include "base/containers/flat_map.h" #include "base/types/always_false.h" -#include "brave/components/brave_rewards/common/mojom/bat_ledger.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom.h" #include "brave/components/brave_rewards/core/api/api.h" #include "brave/components/brave_rewards/core/bitflyer/bitflyer.h" #include "brave/components/brave_rewards/core/contribution/contribution.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/gemini/gemini.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/legacy/media/media.h" #include "brave/components/brave_rewards/core/logging/logging.h" #include "brave/components/brave_rewards/core/promotion/promotion.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" #include "brave/components/brave_rewards/core/recovery/recovery.h" #include "brave/components/brave_rewards/core/report/report.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/uphold/uphold.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" @@ -49,18 +49,19 @@ inline constexpr uint64_t kPublisherListRefreshInterval = 3 * base::Time::kHoursPerDay * base::Time::kSecondsPerHour; #endif -class LedgerImpl : public mojom::Ledger { +class RewardsEngineImpl : public mojom::RewardsEngine { public: - explicit LedgerImpl( - mojo::PendingAssociatedRemote ledger_client_remote); + explicit RewardsEngineImpl( + mojo::PendingAssociatedRemote client_remote); - ~LedgerImpl() override; + ~RewardsEngineImpl() override; - LedgerImpl(const LedgerImpl&) = delete; + RewardsEngineImpl(const RewardsEngineImpl&) = delete; - LedgerImpl& operator=(const LedgerImpl&) = delete; + RewardsEngineImpl& operator=(const RewardsEngineImpl&) = delete; - // mojom::Ledger implementation begin (in the order of appearance in Mojom) + // mojom::RewardsEngine implementation begin (in the order of appearance in + // Mojom) void Initialize(InitializeCallback callback) override; void GetEnvironment(GetEnvironmentCallback callback) override; @@ -240,9 +241,10 @@ class LedgerImpl : public mojom::Ledger { void GetEventLogs(GetEventLogsCallback callback) override; void GetRewardsWallet(GetRewardsWalletCallback callback) override; - // mojom::Ledger implementation end + // mojom::RewardsEngine implementation end - // mojom::LedgerClient helpers begin (in the order of appearance in Mojom) + // mojom::RewardsEngineClient helpers begin (in the order of appearance in + // Mojom) template void LoadURL(mojom::UrlRequestPtr request, Callback callback) { DCHECK(request); @@ -258,15 +260,15 @@ class LedgerImpl : public mojom::Ledger { } if constexpr (std::is_same_v) { - ledger_client_->LoadURL(std::move(request), std::move(callback)); + client_->LoadURL(std::move(request), std::move(callback)); } else { - ledger_client_->LoadURL(std::move(request), - base::BindOnce( - [](LegacyLoadURLCallback callback, - mojom::UrlResponsePtr response) { - callback(std::move(response)); - }, - std::move(callback))); + client_->LoadURL(std::move(request), + base::BindOnce( + [](LegacyLoadURLCallback callback, + mojom::UrlResponsePtr response) { + callback(std::move(response)); + }, + std::move(callback))); } } @@ -275,21 +277,21 @@ class LedgerImpl : public mojom::Ledger { T value; if constexpr (std::is_same_v) { - ledger_client_->GetBooleanState(name, &value); + client_->GetBooleanState(name, &value); } else if constexpr (std::is_same_v) { - ledger_client_->GetIntegerState(name, &value); + client_->GetIntegerState(name, &value); } else if constexpr (std::is_same_v) { - ledger_client_->GetDoubleState(name, &value); + client_->GetDoubleState(name, &value); } else if constexpr (std::is_same_v) { - ledger_client_->GetStringState(name, &value); + client_->GetStringState(name, &value); } else if constexpr (std::is_same_v) { - ledger_client_->GetInt64State(name, &value); + client_->GetInt64State(name, &value); } else if constexpr (std::is_same_v) { - ledger_client_->GetUint64State(name, &value); + client_->GetUint64State(name, &value); } else if constexpr (std::is_same_v) { - ledger_client_->GetValueState(name, &value); + client_->GetValueState(name, &value); } else if constexpr (std::is_same_v) { - ledger_client_->GetTimeState(name, &value); + client_->GetTimeState(name, &value); } else { static_assert(base::AlwaysFalse, "Unsupported type!"); } @@ -300,21 +302,21 @@ class LedgerImpl : public mojom::Ledger { template void SetState(const std::string& name, T value) { if constexpr (std::is_same_v) { - ledger_client_->SetBooleanState(name, std::move(value)); + client_->SetBooleanState(name, std::move(value)); } else if constexpr (std::is_same_v) { - ledger_client_->SetIntegerState(name, std::move(value)); + client_->SetIntegerState(name, std::move(value)); } else if constexpr (std::is_same_v) { - ledger_client_->SetDoubleState(name, std::move(value)); + client_->SetDoubleState(name, std::move(value)); } else if constexpr (std::is_same_v) { - ledger_client_->SetStringState(name, std::move(value)); + client_->SetStringState(name, std::move(value)); } else if constexpr (std::is_same_v) { - ledger_client_->SetInt64State(name, std::move(value)); + client_->SetInt64State(name, std::move(value)); } else if constexpr (std::is_same_v) { - ledger_client_->SetUint64State(name, std::move(value)); + client_->SetUint64State(name, std::move(value)); } else if constexpr (std::is_same_v) { - ledger_client_->SetValueState(name, std::move(value)); + client_->SetValueState(name, std::move(value)); } else if constexpr (std::is_same_v) { - ledger_client_->SetTimeState(name, std::move(value)); + client_->SetTimeState(name, std::move(value)); } else { static_assert(base::AlwaysFalse, "Unsupported type!"); } @@ -330,26 +332,24 @@ class LedgerImpl : public mojom::Ledger { void RunDBTransaction(mojom::DBTransactionPtr transaction, Callback callback) { if constexpr (std::is_same_v) { - ledger_client_->RunDBTransaction(std::move(transaction), - std::move(callback)); + client_->RunDBTransaction(std::move(transaction), std::move(callback)); } else { - ledger_client_->RunDBTransaction( - std::move(transaction), - base::BindOnce( - [](LegacyRunDBTransactionCallback callback, - mojom::DBCommandResponsePtr response) { - callback(std::move(response)); - }, - std::move(callback))); + client_->RunDBTransaction(std::move(transaction), + base::BindOnce( + [](LegacyRunDBTransactionCallback callback, + mojom::DBCommandResponsePtr response) { + callback(std::move(response)); + }, + std::move(callback))); } } absl::optional EncryptString(const std::string& value); absl::optional DecryptString(const std::string& value); - // mojom::LedgerClient helpers end + // mojom::RewardsEngineClient helpers end - mojom::LedgerClient* client(); + mojom::RewardsEngineClient* client(); promotion::Promotion* promotion() { return &promotion_; } @@ -408,7 +408,7 @@ class LedgerImpl : public mojom::Ledger { template void WhenReady(T callback); - mojo::AssociatedRemote ledger_client_; + mojo::AssociatedRemote client_; promotion::Promotion promotion_; publisher::Publisher publisher_; @@ -433,4 +433,4 @@ class LedgerImpl : public mojom::Ledger { } // namespace brave_rewards::internal -#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_LEDGER_IMPL_H_ +#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_IMPL_H_ diff --git a/components/brave_rewards/core/rewards_engine_impl_mock.cc b/components/brave_rewards/core/rewards_engine_impl_mock.cc new file mode 100644 index 00000000000..5be201d67ff --- /dev/null +++ b/components/brave_rewards/core/rewards_engine_impl_mock.cc @@ -0,0 +1,40 @@ +/* Copyright (c) 2019 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom-test-utils.h" + +using ::testing::_; +using ::testing::Return; + +namespace brave_rewards::internal { + +AddMockRewardsClient::AddMockRewardsClient() = default; + +AddMockRewardsClient::~AddMockRewardsClient() = default; + +MockRewardsEngineImpl::MockRewardsEngineImpl() + : RewardsEngineImpl( + mock_client_receiver_.BindNewEndpointAndPassDedicatedRemote()) { + ON_CALL(*this, InitializeDatabase(_)) + .WillByDefault( + [](LegacyResultCallback callback) { callback(mojom::Result::OK); }); + ON_CALL(*this, database()).WillByDefault(Return(&mock_database_)); + + const auto result = mojom::RewardsEngineAsyncWaiter(this).Initialize(); + DCHECK(result == mojom::Result::OK); +} + +MockRewardsEngineImpl::~MockRewardsEngineImpl() = default; + +MockRewardsEngineClient* MockRewardsEngineImpl::mock_client() { + return &mock_client_; +} + +database::MockDatabase* MockRewardsEngineImpl::mock_database() { + return &mock_database_; +} + +} // namespace brave_rewards::internal diff --git a/components/brave_rewards/core/rewards_engine_impl_mock.h b/components/brave_rewards/core/rewards_engine_impl_mock.h new file mode 100644 index 00000000000..be92d132bd2 --- /dev/null +++ b/components/brave_rewards/core/rewards_engine_impl_mock.h @@ -0,0 +1,49 @@ +/* Copyright (c) 2019 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_IMPL_MOCK_H_ +#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_IMPL_MOCK_H_ + +#include "brave/components/brave_rewards/core/database/database_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "mojo/public/cpp/bindings/associated_receiver.h" +#include "testing/gmock/include/gmock/gmock.h" + +namespace brave_rewards::internal { + +class AddMockRewardsClient { + protected: + AddMockRewardsClient(); + + ~AddMockRewardsClient(); + + MockRewardsEngineClient mock_client_; + mojo::AssociatedReceiver mock_client_receiver_{ + &mock_client_}; +}; + +class MockRewardsEngineImpl : private AddMockRewardsClient, + public RewardsEngineImpl { + public: + MockRewardsEngineImpl(); + + ~MockRewardsEngineImpl() override; + + MockRewardsEngineClient* mock_client(); + + database::MockDatabase* mock_database(); + + MOCK_METHOD1(InitializeDatabase, void(LegacyResultCallback)); + + MOCK_METHOD0(database, database::Database*()); + + private: + database::MockDatabase mock_database_{*this}; +}; + +} // namespace brave_rewards::internal + +#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_IMPL_MOCK_H_ diff --git a/components/brave_rewards/core/sku/sku.cc b/components/brave_rewards/core/sku/sku.cc index 75174ec99dc..c520d87a3e2 100644 --- a/components/brave_rewards/core/sku/sku.cc +++ b/components/brave_rewards/core/sku/sku.cc @@ -7,7 +7,7 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/sku/sku.h" #include "brave/components/brave_rewards/core/sku/sku_util.h" @@ -17,7 +17,7 @@ using std::placeholders::_2; namespace brave_rewards::internal { namespace sku { -SKU::SKU(LedgerImpl& ledger) : ledger_(ledger), common_(ledger) {} +SKU::SKU(RewardsEngineImpl& engine) : engine_(engine), common_(engine) {} SKU::~SKU() = default; @@ -36,7 +36,7 @@ void SKU::OrderCreated(const mojom::Result result, const std::string& wallet_type, const std::string& contribution_id, SKUOrderCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Order was not successful"); callback(result, ""); return; @@ -45,7 +45,7 @@ void SKU::OrderCreated(const mojom::Result result, auto save_callback = std::bind(&SKU::ContributionIdSaved, this, _1, order_id, wallet_type, callback); - ledger_->database()->SaveContributionIdForSKUOrder(order_id, contribution_id, + engine_->database()->SaveContributionIdForSKUOrder(order_id, contribution_id, save_callback); } @@ -53,7 +53,7 @@ void SKU::ContributionIdSaved(const mojom::Result result, const std::string& order_id, const std::string& wallet_type, SKUOrderCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Contribution id not saved"); callback(result, ""); return; @@ -62,7 +62,7 @@ void SKU::ContributionIdSaved(const mojom::Result result, auto get_callback = std::bind(&SKU::CreateTransaction, this, _1, wallet_type, callback); - ledger_->database()->GetSKUOrder(order_id, get_callback); + engine_->database()->GetSKUOrder(order_id, get_callback); } void SKU::CreateTransaction(mojom::SKUOrderPtr order, @@ -70,7 +70,7 @@ void SKU::CreateTransaction(mojom::SKUOrderPtr order, SKUOrderCallback callback) { if (!order) { BLOG(0, "Order not found"); - callback(mojom::Result::LEDGER_ERROR, ""); + callback(mojom::Result::FAILED, ""); return; } @@ -85,13 +85,13 @@ void SKU::Retry(const std::string& order_id, SKUOrderCallback callback) { if (order_id.empty()) { BLOG(0, "Order id is empty"); - callback(mojom::Result::LEDGER_ERROR, ""); + callback(mojom::Result::FAILED, ""); return; } auto get_callback = std::bind(&SKU::OnOrder, this, _1, wallet_type, callback); - ledger_->database()->GetSKUOrder(order_id, get_callback); + engine_->database()->GetSKUOrder(order_id, get_callback); } void SKU::OnOrder(mojom::SKUOrderPtr order, @@ -99,14 +99,14 @@ void SKU::OnOrder(mojom::SKUOrderPtr order, SKUOrderCallback callback) { if (!order) { BLOG(0, "Order is null"); - callback(mojom::Result::LEDGER_ERROR, ""); + callback(mojom::Result::FAILED, ""); return; } switch (order->status) { case mojom::SKUOrderStatus::PENDING: { - ContributionIdSaved(mojom::Result::LEDGER_OK, order->order_id, - wallet_type, callback); + ContributionIdSaved(mojom::Result::OK, order->order_id, wallet_type, + callback); return; } case mojom::SKUOrderStatus::PAID: { @@ -114,12 +114,12 @@ void SKU::OnOrder(mojom::SKUOrderPtr order, return; } case mojom::SKUOrderStatus::FULFILLED: { - callback(mojom::Result::LEDGER_OK, order->order_id); + callback(mojom::Result::OK, order->order_id); return; } case mojom::SKUOrderStatus::CANCELED: case mojom::SKUOrderStatus::NONE: { - callback(mojom::Result::LEDGER_ERROR, ""); + callback(mojom::Result::FAILED, ""); return; } } diff --git a/components/brave_rewards/core/sku/sku.h b/components/brave_rewards/core/sku/sku.h index a343edbc79a..d43c77b52d8 100644 --- a/components/brave_rewards/core/sku/sku.h +++ b/components/brave_rewards/core/sku/sku.h @@ -10,17 +10,17 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/sku/sku_common.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace sku { class SKU { public: - explicit SKU(LedgerImpl& ledger); + explicit SKU(RewardsEngineImpl& engine); ~SKU(); void Process(const std::vector& items, @@ -52,7 +52,7 @@ class SKU { const std::string& wallet_type, SKUOrderCallback callback); - const raw_ref ledger_; + const raw_ref engine_; SKUCommon common_; }; diff --git a/components/brave_rewards/core/sku/sku_common.cc b/components/brave_rewards/core/sku/sku_common.cc index f61f71cd8d5..547b3a90608 100644 --- a/components/brave_rewards/core/sku/sku_common.cc +++ b/components/brave_rewards/core/sku/sku_common.cc @@ -7,7 +7,7 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/sku/sku_common.h" using std::placeholders::_1; @@ -15,8 +15,8 @@ using std::placeholders::_1; namespace brave_rewards::internal { namespace sku { -SKUCommon::SKUCommon(LedgerImpl& ledger) - : ledger_(ledger), order_(ledger), transaction_(ledger) {} +SKUCommon::SKUCommon(RewardsEngineImpl& engine) + : engine_(engine), order_(engine), transaction_(engine) {} SKUCommon::~SKUCommon() = default; @@ -31,7 +31,7 @@ void SKUCommon::CreateTransaction(mojom::SKUOrderPtr order, SKUOrderCallback callback) { if (!order) { BLOG(0, "Order not found"); - callback(mojom::Result::LEDGER_ERROR, ""); + callback(mojom::Result::FAILED, ""); return; } @@ -44,27 +44,27 @@ void SKUCommon::CreateTransaction(mojom::SKUOrderPtr order, void SKUCommon::OnTransactionCompleted(const mojom::Result result, const std::string& order_id, SKUOrderCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Order status was not updated"); callback(result, ""); return; } - callback(mojom::Result::LEDGER_OK, order_id); + callback(mojom::Result::OK, order_id); } void SKUCommon::SendExternalTransaction(const std::string& order_id, SKUOrderCallback callback) { if (order_id.empty()) { BLOG(0, "Order id is empty"); - callback(mojom::Result::LEDGER_ERROR, ""); + callback(mojom::Result::FAILED, ""); return; } auto get_callback = std::bind(&SKUCommon::GetSKUTransactionByOrderId, this, _1, callback); - ledger_->database()->GetSKUTransactionByOrderId(order_id, get_callback); + engine_->database()->GetSKUTransactionByOrderId(order_id, get_callback); } void SKUCommon::GetSKUTransactionByOrderId( @@ -76,11 +76,11 @@ void SKUCommon::GetSKUTransactionByOrderId( BLOG(0, "Failed to get SKU transaction from database, or there's no " "transaction with this order_id!"); - return callback(mojom::Result::LEDGER_ERROR, ""); + return callback(mojom::Result::FAILED, ""); } transaction_.SendExternalTransaction( - mojom::Result::LEDGER_OK, *transaction, + mojom::Result::OK, *transaction, std::bind(&SKUCommon::OnTransactionCompleted, this, _1, transaction->order_id, std::move(callback))); } diff --git a/components/brave_rewards/core/sku/sku_common.h b/components/brave_rewards/core/sku/sku_common.h index 609954bd1ac..710733ce768 100644 --- a/components/brave_rewards/core/sku/sku_common.h +++ b/components/brave_rewards/core/sku/sku_common.h @@ -12,18 +12,18 @@ #include "base/memory/raw_ref.h" #include "base/types/expected.h" #include "brave/components/brave_rewards/core/database/database_sku_transaction.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/sku/sku_order.h" #include "brave/components/brave_rewards/core/sku/sku_transaction.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace sku { class SKUCommon { public: - explicit SKUCommon(LedgerImpl& ledger); + explicit SKUCommon(RewardsEngineImpl& engine); ~SKUCommon(); void CreateOrder(const std::vector& items, @@ -47,7 +47,7 @@ class SKUCommon { result, SKUOrderCallback callback); - const raw_ref ledger_; + const raw_ref engine_; SKUOrder order_; SKUTransaction transaction_; }; diff --git a/components/brave_rewards/core/sku/sku_order.cc b/components/brave_rewards/core/sku/sku_order.cc index c2bb2729c27..4c746577fb3 100644 --- a/components/brave_rewards/core/sku/sku_order.cc +++ b/components/brave_rewards/core/sku/sku_order.cc @@ -8,7 +8,7 @@ #include "base/json/json_writer.h" #include "base/values.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/sku/sku_order.h" #include "brave/components/brave_rewards/core/sku/sku_util.h" @@ -19,8 +19,8 @@ using std::placeholders::_3; namespace brave_rewards::internal { namespace sku { -SKUOrder::SKUOrder(LedgerImpl& ledger) - : ledger_(ledger), payment_server_(ledger) {} +SKUOrder::SKUOrder(RewardsEngineImpl& engine) + : engine_(engine), payment_server_(engine) {} SKUOrder::~SKUOrder() = default; @@ -28,7 +28,7 @@ void SKUOrder::Create(const std::vector& items, SKUOrderCallback callback) { if (items.empty()) { BLOG(0, "List is empty"); - callback(mojom::Result::LEDGER_ERROR, ""); + callback(mojom::Result::FAILED, ""); return; } @@ -40,28 +40,28 @@ void SKUOrder::Create(const std::vector& items, void SKUOrder::OnCreate(const mojom::Result result, mojom::SKUOrderPtr order, SKUOrderCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Order response could not be parsed"); - callback(mojom::Result::LEDGER_ERROR, ""); + callback(mojom::Result::FAILED, ""); return; } auto save_callback = std::bind(&SKUOrder::OnCreateSave, this, _1, order->order_id, callback); - ledger_->database()->SaveSKUOrder(order->Clone(), save_callback); + engine_->database()->SaveSKUOrder(order->Clone(), save_callback); } void SKUOrder::OnCreateSave(const mojom::Result result, const std::string& order_id, SKUOrderCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Order couldn't be saved"); callback(result, ""); return; } - callback(mojom::Result::LEDGER_OK, order_id); + callback(mojom::Result::OK, order_id); } } // namespace sku diff --git a/components/brave_rewards/core/sku/sku_order.h b/components/brave_rewards/core/sku/sku_order.h index 5157f29809b..1a490d7f122 100644 --- a/components/brave_rewards/core/sku/sku_order.h +++ b/components/brave_rewards/core/sku/sku_order.h @@ -12,16 +12,16 @@ #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/endpoint/payment/payment_server.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace sku { class SKUOrder { public: - explicit SKUOrder(LedgerImpl& ledger); + explicit SKUOrder(RewardsEngineImpl& engine); ~SKUOrder(); void Create(const std::vector& items, @@ -36,7 +36,7 @@ class SKUOrder { const std::string& order_id, SKUOrderCallback callback); - const raw_ref ledger_; + const raw_ref engine_; endpoint::PaymentServer payment_server_; }; diff --git a/components/brave_rewards/core/sku/sku_transaction.cc b/components/brave_rewards/core/sku/sku_transaction.cc index 660aa8bb5a3..7499edbc328 100644 --- a/components/brave_rewards/core/sku/sku_transaction.cc +++ b/components/brave_rewards/core/sku/sku_transaction.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/contribution/contribution.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/sku/sku_transaction.h" #include "brave/components/brave_rewards/core/sku/sku_util.h" @@ -46,8 +46,8 @@ mojom::SKUTransactionType GetTransactionTypeFromWalletType( namespace sku { -SKUTransaction::SKUTransaction(LedgerImpl& ledger) - : ledger_(ledger), payment_server_(ledger) {} +SKUTransaction::SKUTransaction(RewardsEngineImpl& engine) + : engine_(engine), payment_server_(engine) {} SKUTransaction::~SKUTransaction() = default; @@ -57,7 +57,7 @@ void SKUTransaction::Run(mojom::SKUOrderPtr order, LegacyResultCallback callback) { if (!order) { BLOG(0, "Order is null!"); - return callback(mojom::Result::LEDGER_ERROR); + return callback(mojom::Result::FAILED); } DCHECK(!order->contribution_id.empty()); @@ -74,7 +74,7 @@ void SKUTransaction::MaybeCreateTransaction( const std::string& wallet_type, MaybeCreateTransactionCallback callback) { DCHECK(order); - ledger_->database()->GetSKUTransactionByOrderId( + engine_->database()->GetSKUTransactionByOrderId( order->order_id, std::bind(&SKUTransaction::OnGetSKUTransactionByOrderId, this, std::move(callback), order->order_id, wallet_type, order->total_amount, _1)); @@ -89,13 +89,13 @@ void SKUTransaction::OnGetSKUTransactionByOrderId( result) { if (result.has_value()) { DCHECK(result.value()); - return callback(mojom::Result::LEDGER_OK, *result.value()); + return callback(mojom::Result::OK, *result.value()); } switch (result.error()) { case database::GetSKUTransactionError::kDatabaseError: BLOG(0, "Failed to get SKU transaction from database!"); - return callback(mojom::Result::LEDGER_ERROR, {}); + return callback(mojom::Result::FAILED, {}); case database::GetSKUTransactionError::kTransactionNotFound: break; } @@ -111,7 +111,7 @@ void SKUTransaction::OnGetSKUTransactionByOrderId( auto on_save_sku_transaction = std::bind(std::move(callback), _1, *transaction); - ledger_->database()->SaveSKUTransaction(std::move(transaction), + engine_->database()->SaveSKUTransaction(std::move(transaction), std::move(on_save_sku_transaction)); } @@ -122,7 +122,7 @@ void SKUTransaction::OnTransactionSaved( const std::string& wallet_type, const std::string& contribution_id, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Transaction was not saved"); callback(result); return; @@ -132,7 +132,7 @@ void SKUTransaction::OnTransactionSaved( std::bind(&SKUTransaction::OnTransfer, this, _1, transaction, contribution_id, destination, callback); - ledger_->contribution()->TransferFunds(transaction, destination, wallet_type, + engine_->contribution()->TransferFunds(transaction, destination, wallet_type, contribution_id, transfer_callback); } @@ -141,13 +141,13 @@ void SKUTransaction::OnTransfer(mojom::Result result, const std::string& contribution_id, const std::string& destination, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Transaction for order failed " << transaction.order_id); callback(result); return; } - ledger_->database()->GetExternalTransaction( + engine_->database()->GetExternalTransaction( contribution_id, destination, base::BindOnce(&SKUTransaction::OnGetExternalTransaction, base::Unretained(this), std::move(callback), transaction)); @@ -160,7 +160,7 @@ void SKUTransaction::OnGetExternalTransaction( database::GetExternalTransactionError> external_transaction) { if (!external_transaction.has_value()) { - return callback(mojom::Result::LEDGER_OK); + return callback(mojom::Result::OK); } DCHECK(external_transaction.value()); @@ -172,7 +172,7 @@ void SKUTransaction::OnGetExternalTransaction( this, _1, transaction, std::move(callback)); // We save SKUTransactionStatus::COMPLETED status in this call - ledger_->database()->SaveSKUExternalTransaction( + engine_->database()->SaveSKUExternalTransaction( transaction.transaction_id, transaction.external_transaction_id, std::move(save_callback)); } @@ -181,7 +181,7 @@ void SKUTransaction::OnSaveSKUExternalTransaction( mojom::Result result, const mojom::SKUTransaction& transaction, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "External transaction was not saved"); callback(result); return; @@ -190,7 +190,7 @@ void SKUTransaction::OnSaveSKUExternalTransaction( auto save_callback = std::bind(&SKUTransaction::SendExternalTransaction, this, _1, transaction, callback); - ledger_->database()->UpdateSKUOrderStatus( + engine_->database()->UpdateSKUOrderStatus( transaction.order_id, mojom::SKUOrderStatus::PAID, save_callback); } @@ -198,7 +198,7 @@ void SKUTransaction::SendExternalTransaction( mojom::Result result, const mojom::SKUTransaction& transaction, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Order status not updated"); callback(mojom::Result::RETRY); return; @@ -209,7 +209,7 @@ void SKUTransaction::SendExternalTransaction( if (transaction.external_transaction_id.empty()) { BLOG(0, "External transaction id is empty for transaction id " << transaction.transaction_id); - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); return; } @@ -237,13 +237,13 @@ void SKUTransaction::SendExternalTransaction( void SKUTransaction::OnSendExternalTransaction(mojom::Result result, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "External transaction not sent"); callback(mojom::Result::RETRY); return; } - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } } // namespace sku diff --git a/components/brave_rewards/core/sku/sku_transaction.h b/components/brave_rewards/core/sku/sku_transaction.h index 908f52d9529..0af49d0e547 100644 --- a/components/brave_rewards/core/sku/sku_transaction.h +++ b/components/brave_rewards/core/sku/sku_transaction.h @@ -14,16 +14,16 @@ #include "brave/components/brave_rewards/core/database/database_external_transactions.h" #include "brave/components/brave_rewards/core/database/database_sku_transaction.h" #include "brave/components/brave_rewards/core/endpoint/payment/payment_server.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace sku { class SKUTransaction { public: - explicit SKUTransaction(LedgerImpl& ledger); + explicit SKUTransaction(RewardsEngineImpl& engine); ~SKUTransaction(); void Run(mojom::SKUOrderPtr order, @@ -77,7 +77,7 @@ class SKUTransaction { void OnSendExternalTransaction(mojom::Result result, LegacyResultCallback callback); - const raw_ref ledger_; + const raw_ref engine_; endpoint::PaymentServer payment_server_; }; diff --git a/components/brave_rewards/core/sku/sku_util.cc b/components/brave_rewards/core/sku/sku_util.cc index aa719055256..c99f7334063 100644 --- a/components/brave_rewards/core/sku/sku_util.cc +++ b/components/brave_rewards/core/sku/sku_util.cc @@ -6,7 +6,7 @@ #include #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/sku/sku_util.h" namespace brave_rewards::internal { diff --git a/components/brave_rewards/core/state/state.cc b/components/brave_rewards/core/state/state.cc index 55ad5eee046..bbd5dfd6274 100644 --- a/components/brave_rewards/core/state/state.cc +++ b/components/brave_rewards/core/state/state.cc @@ -15,8 +15,8 @@ #include "brave/components/brave_rewards/core/constants.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/endpoints/get_parameters/get_parameters_utils.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/state/state_migration.h" @@ -154,7 +154,7 @@ std::string ConvertInlineTipPlatformToKey( namespace state { -State::State(LedgerImpl& ledger) : ledger_(ledger), migration_(ledger) {} +State::State(RewardsEngineImpl& engine) : engine_(engine), migration_(engine) {} State::~State() = default; @@ -163,82 +163,82 @@ void State::Initialize(ResultCallback callback) { } void State::SetVersion(const int version) { - ledger_->database()->SaveEventLog(kVersion, std::to_string(version)); - ledger_->SetState(kVersion, version); + engine_->database()->SaveEventLog(kVersion, std::to_string(version)); + engine_->SetState(kVersion, version); } int State::GetVersion() { - return ledger_->GetState(kVersion); + return engine_->GetState(kVersion); } void State::SetPublisherMinVisitTime(const int duration) { - ledger_->database()->SaveEventLog(kMinVisitTime, std::to_string(duration)); - ledger_->SetState(kMinVisitTime, duration); - ledger_->publisher()->CalcScoreConsts(duration); - ledger_->publisher()->SynopsisNormalizer(); + engine_->database()->SaveEventLog(kMinVisitTime, std::to_string(duration)); + engine_->SetState(kMinVisitTime, duration); + engine_->publisher()->CalcScoreConsts(duration); + engine_->publisher()->SynopsisNormalizer(); } int State::GetPublisherMinVisitTime() { - return ledger_->GetState(kMinVisitTime); + return engine_->GetState(kMinVisitTime); } void State::SetPublisherMinVisits(const int visits) { - ledger_->database()->SaveEventLog(kMinVisits, std::to_string(visits)); - ledger_->SetState(kMinVisits, visits); - ledger_->publisher()->SynopsisNormalizer(); + engine_->database()->SaveEventLog(kMinVisits, std::to_string(visits)); + engine_->SetState(kMinVisits, visits); + engine_->publisher()->SynopsisNormalizer(); } int State::GetPublisherMinVisits() { - return ledger_->GetState(kMinVisits); + return engine_->GetState(kMinVisits); } void State::SetScoreValues(double a, double b) { - ledger_->database()->SaveEventLog(kScoreA, std::to_string(a)); - ledger_->database()->SaveEventLog(kScoreB, std::to_string(b)); - ledger_->SetState(kScoreA, a); - ledger_->SetState(kScoreB, b); + engine_->database()->SaveEventLog(kScoreA, std::to_string(a)); + engine_->database()->SaveEventLog(kScoreB, std::to_string(b)); + engine_->SetState(kScoreA, a); + engine_->SetState(kScoreB, b); } void State::GetScoreValues(double* a, double* b) { DCHECK(a && b); - *a = ledger_->GetState(kScoreA); - *b = ledger_->GetState(kScoreB); + *a = engine_->GetState(kScoreA); + *b = engine_->GetState(kScoreB); } void State::SetAutoContributeEnabled(bool enabled) { // Auto-contribute is not supported for regions where bitFlyer is the external // wallet provider. If AC is not supported, then always set the pref to false. - if (ledger_->IsBitFlyerRegion()) { + if (engine_->IsBitFlyerRegion()) { enabled = false; } - ledger_->database()->SaveEventLog(kAutoContributeEnabled, + engine_->database()->SaveEventLog(kAutoContributeEnabled, std::to_string(enabled)); - ledger_->SetState(kAutoContributeEnabled, enabled); + engine_->SetState(kAutoContributeEnabled, enabled); if (enabled) { - ledger_->publisher()->CalcScoreConsts(GetPublisherMinVisitTime()); + engine_->publisher()->CalcScoreConsts(GetPublisherMinVisitTime()); } } bool State::GetAutoContributeEnabled() { // Auto-contribute is not supported for regions where bitFlyer is the external // wallet provider. If AC is not supported, then always report AC as disabled. - if (ledger_->IsBitFlyerRegion()) { + if (engine_->IsBitFlyerRegion()) { return false; } - return ledger_->GetState(kAutoContributeEnabled); + return engine_->GetState(kAutoContributeEnabled); } void State::SetAutoContributionAmount(const double amount) { - ledger_->database()->SaveEventLog(kAutoContributeAmount, + engine_->database()->SaveEventLog(kAutoContributeAmount, std::to_string(amount)); - ledger_->SetState(kAutoContributeAmount, amount); + engine_->SetState(kAutoContributeAmount, amount); } double State::GetAutoContributionAmount() { - double amount = ledger_->GetState(kAutoContributeAmount); + double amount = engine_->GetState(kAutoContributeAmount); if (amount == 0.0) { amount = GetAutoContributeChoice(); } @@ -247,10 +247,10 @@ double State::GetAutoContributionAmount() { } uint64_t State::GetReconcileStamp() { - auto stamp = ledger_->GetState(kNextReconcileStamp); + auto stamp = engine_->GetState(kNextReconcileStamp); if (stamp == 0) { ResetReconcileStamp(); - stamp = ledger_->GetState(kNextReconcileStamp); + stamp = engine_->GetState(kNextReconcileStamp); } return stamp; @@ -264,54 +264,54 @@ void State::SetReconcileStamp(const int reconcile_interval) { reconcile_stamp += constant::kReconcileInterval; } - ledger_->database()->SaveEventLog(kNextReconcileStamp, + engine_->database()->SaveEventLog(kNextReconcileStamp, std::to_string(reconcile_stamp)); - ledger_->SetState(kNextReconcileStamp, reconcile_stamp); - ledger_->client()->ReconcileStampReset(); + engine_->SetState(kNextReconcileStamp, reconcile_stamp); + engine_->client()->ReconcileStampReset(); } void State::ResetReconcileStamp() { SetReconcileStamp(reconcile_interval); } uint64_t State::GetCreationStamp() { - return ledger_->GetState(kCreationStamp); + return engine_->GetState(kCreationStamp); } void State::SetCreationStamp(const uint64_t stamp) { - ledger_->database()->SaveEventLog(kCreationStamp, std::to_string(stamp)); - ledger_->SetState(kCreationStamp, stamp); + engine_->database()->SaveEventLog(kCreationStamp, std::to_string(stamp)); + engine_->SetState(kCreationStamp, stamp); } bool State::GetInlineTippingPlatformEnabled( const mojom::InlineTipsPlatforms platform) { - return ledger_->GetState(ConvertInlineTipPlatformToKey(platform)); + return engine_->GetState(ConvertInlineTipPlatformToKey(platform)); } void State::SetInlineTippingPlatformEnabled( const mojom::InlineTipsPlatforms platform, const bool enabled) { const std::string platform_string = ConvertInlineTipPlatformToKey(platform); - ledger_->database()->SaveEventLog(platform_string, std::to_string(enabled)); - ledger_->SetState(platform_string, enabled); + engine_->database()->SaveEventLog(platform_string, std::to_string(enabled)); + engine_->SetState(platform_string, enabled); } void State::SetRewardsParameters(const mojom::RewardsParameters& parameters) { - ledger_->SetState(kParametersRate, parameters.rate); - ledger_->SetState(kParametersAutoContributeChoice, + engine_->SetState(kParametersRate, parameters.rate); + engine_->SetState(kParametersAutoContributeChoice, parameters.auto_contribute_choice); - ledger_->SetState(kParametersAutoContributeChoices, + engine_->SetState(kParametersAutoContributeChoices, VectorDoubleToString(parameters.auto_contribute_choices)); - ledger_->SetState(kParametersTipChoices, + engine_->SetState(kParametersTipChoices, VectorDoubleToString(parameters.tip_choices)); - ledger_->SetState(kParametersMonthlyTipChoices, + engine_->SetState(kParametersMonthlyTipChoices, VectorDoubleToString(parameters.monthly_tip_choices)); - ledger_->SetState(kParametersPayoutStatus, + engine_->SetState(kParametersPayoutStatus, PayoutStatusToString(parameters.payout_status)); - ledger_->SetState( + engine_->SetState( kParametersWalletProviderRegions, WalletProviderRegionsToValue(parameters.wallet_provider_regions)); - ledger_->SetState(kParametersVBatDeadline, parameters.vbat_deadline); - ledger_->SetState(kParametersVBatExpired, parameters.vbat_expired); + engine_->SetState(kParametersVBatDeadline, parameters.vbat_deadline); + engine_->SetState(kParametersVBatExpired, parameters.vbat_expired); } mojom::RewardsParametersPtr State::GetRewardsParameters() { @@ -330,16 +330,16 @@ mojom::RewardsParametersPtr State::GetRewardsParameters() { } double State::GetRate() { - return ledger_->GetState(kParametersRate); + return engine_->GetState(kParametersRate); } double State::GetAutoContributeChoice() { - return ledger_->GetState(kParametersAutoContributeChoice); + return engine_->GetState(kParametersAutoContributeChoice); } std::vector State::GetAutoContributeChoices() { const std::string amounts_string = - ledger_->GetState(kParametersAutoContributeChoices); + engine_->GetState(kParametersAutoContributeChoices); std::vector amounts = StringToVectorDouble(amounts_string); const double current_amount = GetAutoContributionAmount(); @@ -353,71 +353,71 @@ std::vector State::GetAutoContributeChoices() { std::vector State::GetTipChoices() { return StringToVectorDouble( - ledger_->GetState(kParametersTipChoices)); + engine_->GetState(kParametersTipChoices)); } std::vector State::GetMonthlyTipChoices() { return StringToVectorDouble( - ledger_->GetState(kParametersMonthlyTipChoices)); + engine_->GetState(kParametersMonthlyTipChoices)); } base::flat_map State::GetPayoutStatus() { return StringToPayoutStatus( - ledger_->GetState(kParametersPayoutStatus)); + engine_->GetState(kParametersPayoutStatus)); } base::flat_map State::GetWalletProviderRegions() { return ValueToWalletProviderRegions( - ledger_->GetState(kParametersWalletProviderRegions)); + engine_->GetState(kParametersWalletProviderRegions)); } base::Time State::GetVBatDeadline() { - return ledger_->GetState(kParametersVBatDeadline); + return engine_->GetState(kParametersVBatDeadline); } bool State::GetVBatExpired() { - return ledger_->GetState(kParametersVBatExpired); + return engine_->GetState(kParametersVBatExpired); } void State::SetEmptyBalanceChecked(const bool checked) { - ledger_->database()->SaveEventLog(kEmptyBalanceChecked, + engine_->database()->SaveEventLog(kEmptyBalanceChecked, std::to_string(checked)); - ledger_->SetState(kEmptyBalanceChecked, checked); + engine_->SetState(kEmptyBalanceChecked, checked); } bool State::GetEmptyBalanceChecked() { - return ledger_->GetState(kEmptyBalanceChecked); + return engine_->GetState(kEmptyBalanceChecked); } void State::SetServerPublisherListStamp(const uint64_t stamp) { - ledger_->SetState(kServerPublisherListStamp, stamp); + engine_->SetState(kServerPublisherListStamp, stamp); } uint64_t State::GetServerPublisherListStamp() { - return ledger_->GetState(kServerPublisherListStamp); + return engine_->GetState(kServerPublisherListStamp); } void State::SetPromotionCorruptedMigrated(const bool migrated) { - ledger_->database()->SaveEventLog(kPromotionCorruptedMigrated, + engine_->database()->SaveEventLog(kPromotionCorruptedMigrated, std::to_string(migrated)); - ledger_->SetState(kPromotionCorruptedMigrated, migrated); + engine_->SetState(kPromotionCorruptedMigrated, migrated); } bool State::GetPromotionCorruptedMigrated() { - return ledger_->GetState(kPromotionCorruptedMigrated); + return engine_->GetState(kPromotionCorruptedMigrated); } void State::SetPromotionLastFetchStamp(const uint64_t stamp) { - ledger_->SetState(kPromotionLastFetchStamp, stamp); + engine_->SetState(kPromotionLastFetchStamp, stamp); } uint64_t State::GetPromotionLastFetchStamp() { - return ledger_->GetState(kPromotionLastFetchStamp); + return engine_->GetState(kPromotionLastFetchStamp); } absl::optional State::GetEncryptedString(const std::string& key) { - std::string value = ledger_->GetState(key); + std::string value = engine_->GetState(key); // If the state value is empty, then we consider this a successful read of a // default empty string. @@ -430,7 +430,7 @@ absl::optional State::GetEncryptedString(const std::string& key) { return {}; } - auto decrypted = ledger_->DecryptString(value); + auto decrypted = engine_->DecryptString(value); if (!decrypted) { BLOG(0, "Decryption failed for " << key); return {}; @@ -441,7 +441,7 @@ absl::optional State::GetEncryptedString(const std::string& key) { bool State::SetEncryptedString(const std::string& key, const std::string& value) { - auto encrypted = ledger_->EncryptString(value); + auto encrypted = engine_->EncryptString(value); if (!encrypted) { BLOG(0, "Encryption failed for " << key); return false; @@ -450,7 +450,7 @@ bool State::SetEncryptedString(const std::string& key, std::string base64_string; base::Base64Encode(*encrypted, &base64_string); - ledger_->SetState(key, std::move(base64_string)); + engine_->SetState(key, std::move(base64_string)); return true; } diff --git a/components/brave_rewards/core/state/state.h b/components/brave_rewards/core/state/state.h index c6a46991892..d63d71e57c3 100644 --- a/components/brave_rewards/core/state/state.h +++ b/components/brave_rewards/core/state/state.h @@ -15,13 +15,13 @@ #include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace state { class State { public: - explicit State(LedgerImpl& ledger); + explicit State(RewardsEngineImpl& engine); ~State(); void Initialize(ResultCallback callback); @@ -110,7 +110,7 @@ class State { bool SetEncryptedString(const std::string& key, const std::string& value); private: - const raw_ref ledger_; + const raw_ref engine_; StateMigration migration_; }; diff --git a/components/brave_rewards/core/state/state_migration.cc b/components/brave_rewards/core/state/state_migration.cc index 27914799a3c..14f89265fdc 100644 --- a/components/brave_rewards/core/state/state_migration.cc +++ b/components/brave_rewards/core/state/state_migration.cc @@ -6,7 +6,7 @@ #include #include "brave/components/brave_rewards/core/common/legacy_callback_helpers.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/state/state_migration.h" @@ -21,19 +21,19 @@ const int kCurrentVersionNumber = 13; namespace brave_rewards::internal { namespace state { -StateMigration::StateMigration(LedgerImpl& ledger) - : ledger_(ledger), - v1_(ledger), - v2_(ledger), - v4_(ledger), - v5_(ledger), - v6_(ledger), - v7_(ledger), - v8_(ledger), - v10_(ledger), - v11_(ledger), - v12_(ledger), - v13_(ledger) {} +StateMigration::StateMigration(RewardsEngineImpl& engine) + : engine_(engine), + v1_(engine), + v2_(engine), + v4_(engine), + v5_(engine), + v6_(engine), + v7_(engine), + v8_(engine), + v10_(engine), + v11_(engine), + v12_(engine), + v13_(engine) {} StateMigration::~StateMigration() = default; @@ -43,25 +43,25 @@ void StateMigration::Start(ResultCallback callback) { void StateMigration::FreshInstall(ResultCallback callback) { BLOG(1, "Fresh install, state version set to " << kCurrentVersionNumber); - ledger_->state()->SetVersion(kCurrentVersionNumber); - std::move(callback).Run(mojom::Result::LEDGER_OK); + engine_->state()->SetVersion(kCurrentVersionNumber); + std::move(callback).Run(mojom::Result::OK); } void StateMigration::Migrate(ResultCallback callback) { - int current_version = ledger_->state()->GetVersion(); + int current_version = engine_->state()->GetVersion(); if (current_version < 0) { - ledger_->state()->SetVersion(0); + engine_->state()->SetVersion(0); current_version = 0; } if (is_testing && current_version == state_migration_target_version_for_testing) { - return std::move(callback).Run(mojom::Result::LEDGER_OK); + return std::move(callback).Run(mojom::Result::OK); } if (current_version == kCurrentVersionNumber) { - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); return; } @@ -133,15 +133,15 @@ void StateMigration::Migrate(ResultCallback callback) { void StateMigration::OnMigration(ResultCallback callback, int version, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "State: Error with migration from " << (version - 1) << " to " << version); - std::move(callback).Run(mojom::Result::LEDGER_ERROR); + std::move(callback).Run(mojom::Result::FAILED); return; } BLOG(1, "State: Migrated to version " << version); - ledger_->state()->SetVersion(version); + engine_->state()->SetVersion(version); // If the user did not previously have a state version and the initial // migration did not find any rewards data stored in JSON files, assume that diff --git a/components/brave_rewards/core/state/state_migration.h b/components/brave_rewards/core/state/state_migration.h index e7bbc931999..4c6aceaea28 100644 --- a/components/brave_rewards/core/state/state_migration.h +++ b/components/brave_rewards/core/state/state_migration.h @@ -7,7 +7,7 @@ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_STATE_STATE_MIGRATION_H_ #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/state/state_migration_v1.h" #include "brave/components/brave_rewards/core/state/state_migration_v10.h" #include "brave/components/brave_rewards/core/state/state_migration_v11.h" @@ -23,13 +23,13 @@ #include "brave/components/brave_rewards/core/state/state_migration_v9.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace state { class StateMigration { public: - explicit StateMigration(LedgerImpl& ledger); + explicit StateMigration(RewardsEngineImpl& engine); ~StateMigration(); void Start(ResultCallback callback); @@ -41,7 +41,7 @@ class StateMigration { void OnMigration(ResultCallback callback, int version, mojom::Result result); - const raw_ref ledger_; + const raw_ref engine_; StateMigrationV1 v1_; StateMigrationV2 v2_; StateMigrationV3 v3_; diff --git a/components/brave_rewards/core/state/state_migration_v1.cc b/components/brave_rewards/core/state/state_migration_v1.cc index 5b33ffa0503..3d1e296bbb3 100644 --- a/components/brave_rewards/core/state/state_migration_v1.cc +++ b/components/brave_rewards/core/state/state_migration_v1.cc @@ -6,8 +6,8 @@ #include #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/state/state_migration_v1.h" @@ -16,13 +16,14 @@ using std::placeholders::_1; namespace brave_rewards::internal { namespace state { -StateMigrationV1::StateMigrationV1(LedgerImpl& ledger) : ledger_(ledger) {} +StateMigrationV1::StateMigrationV1(RewardsEngineImpl& engine) + : engine_(engine) {} StateMigrationV1::~StateMigrationV1() = default; void StateMigrationV1::Migrate(LegacyResultCallback callback) { legacy_publisher_ = - std::make_unique(*ledger_); + std::make_unique(*engine_); auto load_callback = std::bind(&StateMigrationV1::OnLoadState, this, _1, callback); @@ -34,30 +35,30 @@ void StateMigrationV1::OnLoadState(mojom::Result result, LegacyResultCallback callback) { if (result == mojom::Result::NO_PUBLISHER_STATE) { BLOG(1, "No publisher state"); - ledger_->publisher()->CalcScoreConsts( - ledger_->GetState(kMinVisitTime)); + engine_->publisher()->CalcScoreConsts( + engine_->GetState(kMinVisitTime)); - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); return; } - if (result != mojom::Result::LEDGER_OK) { - ledger_->publisher()->CalcScoreConsts( - ledger_->GetState(kMinVisitTime)); + if (result != mojom::Result::OK) { + engine_->publisher()->CalcScoreConsts( + engine_->GetState(kMinVisitTime)); BLOG(0, "Failed to load publisher state file, setting default values"); - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); return; } legacy_data_migrated_ = true; - ledger_->SetState( + engine_->SetState( kMinVisitTime, static_cast(legacy_publisher_->GetPublisherMinVisitTime())); - ledger_->publisher()->CalcScoreConsts(ledger_->GetState(kMinVisitTime)); + engine_->publisher()->CalcScoreConsts(engine_->GetState(kMinVisitTime)); - ledger_->SetState( + engine_->SetState( kMinVisits, static_cast(legacy_publisher_->GetPublisherMinVisits())); std::vector reports; @@ -66,19 +67,19 @@ void StateMigrationV1::OnLoadState(mojom::Result result, auto save_callback = std::bind(&StateMigrationV1::BalanceReportsSaved, this, _1, callback); - ledger_->database()->SaveBalanceReportInfoList(std::move(reports), + engine_->database()->SaveBalanceReportInfoList(std::move(reports), save_callback); } } void StateMigrationV1::BalanceReportsSaved(mojom::Result result, LegacyResultCallback callback) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Balance report save failed"); callback(result); return; } - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v1.h b/components/brave_rewards/core/state/state_migration_v1.h index 5d8c1917c2d..2d5b277d189 100644 --- a/components/brave_rewards/core/state/state_migration_v1.h +++ b/components/brave_rewards/core/state/state_migration_v1.h @@ -11,17 +11,17 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/legacy/publisher_state.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace state { class StateMigrationV1 { public: - explicit StateMigrationV1(LedgerImpl& ledger); + explicit StateMigrationV1(RewardsEngineImpl& engine); ~StateMigrationV1(); void Migrate(LegacyResultCallback callback); @@ -34,7 +34,7 @@ class StateMigrationV1 { void BalanceReportsSaved(mojom::Result result, LegacyResultCallback callback); std::unique_ptr legacy_publisher_; - const raw_ref ledger_; + const raw_ref engine_; bool legacy_data_migrated_ = false; }; diff --git a/components/brave_rewards/core/state/state_migration_v10.cc b/components/brave_rewards/core/state/state_migration_v10.cc index eae20b710f6..3bb75e68fe0 100644 --- a/components/brave_rewards/core/state/state_migration_v10.cc +++ b/components/brave_rewards/core/state/state_migration_v10.cc @@ -9,7 +9,7 @@ #include #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/uphold/uphold.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" @@ -20,9 +20,9 @@ using std::placeholders::_3; namespace brave_rewards::internal { namespace state { -StateMigrationV10::StateMigrationV10(LedgerImpl& ledger) - : ledger_(ledger), - get_wallet_{std::make_unique(ledger)} {} +StateMigrationV10::StateMigrationV10(RewardsEngineImpl& engine) + : engine_(engine), + get_wallet_{std::make_unique(engine)} {} StateMigrationV10::~StateMigrationV10() = default; @@ -38,10 +38,10 @@ StateMigrationV10::~StateMigrationV10() = default; // mojom::WalletStatus::kLoggedOut (4). void StateMigrationV10::Migrate(LegacyResultCallback callback) { - auto uphold_wallet = ledger_->uphold()->GetWallet(); + auto uphold_wallet = engine_->uphold()->GetWallet(); if (!uphold_wallet) { BLOG(1, "Uphold wallet is null."); - return callback(mojom::Result::LEDGER_OK); + return callback(mojom::Result::OK); } switch (static_cast>( @@ -71,7 +71,7 @@ void StateMigrationV10::Migrate(LegacyResultCallback callback) { &StateMigrationV10::OnGetWallet, this, _1, _2, _3, callback); if (is_testing) { - return wallet_info_endpoint_callback(mojom::Result::LEDGER_ERROR, + return wallet_info_endpoint_callback(mojom::Result::FAILED, std::string{}, false); } else { return get_wallet_->Request(std::move(wallet_info_endpoint_callback)); @@ -99,19 +99,19 @@ void StateMigrationV10::Migrate(LegacyResultCallback callback) { } uphold_wallet = uphold::GenerateLinks(std::move(uphold_wallet)); - callback(ledger_->uphold()->SetWallet(std::move(uphold_wallet)) - ? mojom::Result::LEDGER_OK - : mojom::Result::LEDGER_ERROR); + callback(engine_->uphold()->SetWallet(std::move(uphold_wallet)) + ? mojom::Result::OK + : mojom::Result::FAILED); } void StateMigrationV10::OnGetWallet(mojom::Result result, const std::string& custodian, bool linked, LegacyResultCallback callback) { - auto uphold_wallet = ledger_->uphold()->GetWallet(); + auto uphold_wallet = engine_->uphold()->GetWallet(); if (!uphold_wallet) { BLOG(0, "Uphold wallet is null!"); - return callback(mojom::Result::LEDGER_ERROR); + return callback(mojom::Result::FAILED); } DCHECK(uphold_wallet->status == @@ -119,8 +119,7 @@ void StateMigrationV10::OnGetWallet(mojom::Result result, DCHECK(!uphold_wallet->token.empty()); DCHECK(!uphold_wallet->address.empty()); - if (result != mojom::Result::LEDGER_OK || - custodian != constant::kWalletUphold || + if (result != mojom::Result::OK || custodian != constant::kWalletUphold || !linked) { // deemed semi-VERIFIED || semi-VERIFIED uphold_wallet->status = static_cast(5); // mojom::WalletStatus::PENDING @@ -128,9 +127,9 @@ void StateMigrationV10::OnGetWallet(mojom::Result result, } uphold_wallet = uphold::GenerateLinks(std::move(uphold_wallet)); - callback(ledger_->uphold()->SetWallet(std::move(uphold_wallet)) - ? mojom::Result::LEDGER_OK - : mojom::Result::LEDGER_ERROR); + callback(engine_->uphold()->SetWallet(std::move(uphold_wallet)) + ? mojom::Result::OK + : mojom::Result::FAILED); } } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v10.h b/components/brave_rewards/core/state/state_migration_v10.h index db000f136c5..9de05cad447 100644 --- a/components/brave_rewards/core/state/state_migration_v10.h +++ b/components/brave_rewards/core/state/state_migration_v10.h @@ -11,16 +11,16 @@ #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/endpoint/promotion/get_wallet/get_wallet.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace state { class StateMigrationV10 { public: - explicit StateMigrationV10(LedgerImpl& ledger); + explicit StateMigrationV10(RewardsEngineImpl& engine); ~StateMigrationV10(); void Migrate(LegacyResultCallback callback); @@ -31,7 +31,7 @@ class StateMigrationV10 { bool linked, LegacyResultCallback callback); - const raw_ref ledger_; + const raw_ref engine_; std::unique_ptr get_wallet_; }; diff --git a/components/brave_rewards/core/state/state_migration_v11.cc b/components/brave_rewards/core/state/state_migration_v11.cc index f957219eb1a..7dfd453cbb6 100644 --- a/components/brave_rewards/core/state/state_migration_v11.cc +++ b/components/brave_rewards/core/state/state_migration_v11.cc @@ -6,14 +6,15 @@ #include "brave/components/brave_rewards/core/state/state_migration_v11.h" #include "base/check.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/state/state_keys.h" namespace brave_rewards::internal { namespace state { -StateMigrationV11::StateMigrationV11(LedgerImpl& ledger) : ledger_(ledger) {} +StateMigrationV11::StateMigrationV11(RewardsEngineImpl& engine) + : engine_(engine) {} StateMigrationV11::~StateMigrationV11() = default; @@ -23,12 +24,12 @@ void StateMigrationV11::Migrate(LegacyResultCallback callback) { // their operating system we are reverting this change const auto decrypted_wallet = - ledger_->state()->GetEncryptedString(kWalletBrave); + engine_->state()->GetEncryptedString(kWalletBrave); if (decrypted_wallet) { - ledger_->SetState(kWalletBrave, decrypted_wallet.value()); + engine_->SetState(kWalletBrave, decrypted_wallet.value()); } - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v11.h b/components/brave_rewards/core/state/state_migration_v11.h index fb91c57321d..79549c070ce 100644 --- a/components/brave_rewards/core/state/state_migration_v11.h +++ b/components/brave_rewards/core/state/state_migration_v11.h @@ -7,22 +7,22 @@ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_STATE_STATE_MIGRATION_V11_H_ #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace state { class StateMigrationV11 { public: - explicit StateMigrationV11(LedgerImpl& ledger); + explicit StateMigrationV11(RewardsEngineImpl& engine); ~StateMigrationV11(); void Migrate(LegacyResultCallback callback); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v12.cc b/components/brave_rewards/core/state/state_migration_v12.cc index 841c9d03ff0..bb81f6f83b6 100644 --- a/components/brave_rewards/core/state/state_migration_v12.cc +++ b/components/brave_rewards/core/state/state_migration_v12.cc @@ -11,12 +11,13 @@ #include "base/ranges/algorithm.h" #include "brave/components/brave_rewards/core/common/random_util.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" namespace brave_rewards::internal::state { -StateMigrationV12::StateMigrationV12(LedgerImpl& ledger) : ledger_(ledger) {} +StateMigrationV12::StateMigrationV12(RewardsEngineImpl& engine) + : engine_(engine) {} StateMigrationV12::~StateMigrationV12() = default; @@ -38,7 +39,7 @@ StateMigrationV12::~StateMigrationV12() = default; // }; bool StateMigrationV12::MigrateExternalWallet(const std::string& wallet_type) { - auto wallet = wallet::GetWallet(*ledger_, wallet_type); + auto wallet = wallet::GetWallet(*engine_, wallet_type); if (!wallet) { BLOG(1, "User doesn't have a(n) " << wallet_type << " wallet."); return true; @@ -89,7 +90,7 @@ bool StateMigrationV12::MigrateExternalWallet(const std::string& wallet_type) { return false; } - if (!wallet::SetWallet(*ledger_, std::move(wallet))) { + if (!wallet::SetWallet(*engine_, std::move(wallet))) { BLOG(0, "Failed to set " << wallet_type << " wallet!"); return false; } @@ -104,8 +105,8 @@ void StateMigrationV12::Migrate(LegacyResultCallback callback) { [this](const std::string& wallet_type) { return MigrateExternalWallet(wallet_type); }) - ? mojom::Result::LEDGER_OK - : mojom::Result::LEDGER_ERROR); + ? mojom::Result::OK + : mojom::Result::FAILED); } } // namespace brave_rewards::internal::state diff --git a/components/brave_rewards/core/state/state_migration_v12.h b/components/brave_rewards/core/state/state_migration_v12.h index 5c2bb287046..adee85c48be 100644 --- a/components/brave_rewards/core/state/state_migration_v12.h +++ b/components/brave_rewards/core/state/state_migration_v12.h @@ -9,16 +9,16 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace state { class StateMigrationV12 { public: - explicit StateMigrationV12(LedgerImpl& ledger); + explicit StateMigrationV12(RewardsEngineImpl& engine); ~StateMigrationV12(); void Migrate(LegacyResultCallback); @@ -26,7 +26,7 @@ class StateMigrationV12 { private: bool MigrateExternalWallet(const std::string& wallet_type); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v13.cc b/components/brave_rewards/core/state/state_migration_v13.cc index cdece70375e..d96dc8f84f6 100644 --- a/components/brave_rewards/core/state/state_migration_v13.cc +++ b/components/brave_rewards/core/state/state_migration_v13.cc @@ -9,21 +9,22 @@ #include "base/ranges/algorithm.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" namespace brave_rewards::internal::state { -StateMigrationV13::StateMigrationV13(LedgerImpl& ledger) : ledger_(ledger) {} +StateMigrationV13::StateMigrationV13(RewardsEngineImpl& engine) + : engine_(engine) {} StateMigrationV13::~StateMigrationV13() = default; bool StateMigrationV13::MigrateExternalWallet(const std::string& wallet_type) { - if (!wallet::GetWalletIf(*ledger_, wallet_type, + if (!wallet::GetWalletIf(*engine_, wallet_type, {mojom::WalletStatus::kConnected})) { BLOG(1, "User doesn't have a connected " << wallet_type << " wallet."); } else { - ledger_->client()->ExternalWalletConnected(); + engine_->client()->ExternalWalletConnected(); } return true; @@ -36,8 +37,8 @@ void StateMigrationV13::Migrate(LegacyResultCallback callback) { [this](const std::string& wallet_type) { return MigrateExternalWallet(wallet_type); }) - ? mojom::Result::LEDGER_OK - : mojom::Result::LEDGER_ERROR); + ? mojom::Result::OK + : mojom::Result::FAILED); } } // namespace brave_rewards::internal::state diff --git a/components/brave_rewards/core/state/state_migration_v13.h b/components/brave_rewards/core/state/state_migration_v13.h index c92074f06d6..805e49eae14 100644 --- a/components/brave_rewards/core/state/state_migration_v13.h +++ b/components/brave_rewards/core/state/state_migration_v13.h @@ -9,16 +9,16 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace state { class StateMigrationV13 { public: - explicit StateMigrationV13(LedgerImpl& ledger); + explicit StateMigrationV13(RewardsEngineImpl& engine); ~StateMigrationV13(); void Migrate(LegacyResultCallback); @@ -26,7 +26,7 @@ class StateMigrationV13 { private: bool MigrateExternalWallet(const std::string& wallet_type); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v2.cc b/components/brave_rewards/core/state/state_migration_v2.cc index 138ae63fc0e..c1171bbf022 100644 --- a/components/brave_rewards/core/state/state_migration_v2.cc +++ b/components/brave_rewards/core/state/state_migration_v2.cc @@ -6,7 +6,7 @@ #include #include "base/base64.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/state/state_migration_v2.h" @@ -15,12 +15,13 @@ using std::placeholders::_1; namespace brave_rewards::internal { namespace state { -StateMigrationV2::StateMigrationV2(LedgerImpl& ledger) : ledger_(ledger) {} +StateMigrationV2::StateMigrationV2(RewardsEngineImpl& engine) + : engine_(engine) {} StateMigrationV2::~StateMigrationV2() = default; void StateMigrationV2::Migrate(LegacyResultCallback callback) { - legacy_state_ = std::make_unique(*ledger_); + legacy_state_ = std::make_unique(*engine_); auto load_callback = std::bind(&StateMigrationV2::OnLoadState, this, _1, callback); @@ -30,47 +31,47 @@ void StateMigrationV2::Migrate(LegacyResultCallback callback) { void StateMigrationV2::OnLoadState(mojom::Result result, LegacyResultCallback callback) { - if (result == mojom::Result::NO_LEDGER_STATE) { - BLOG(1, "No ledger state"); - callback(mojom::Result::LEDGER_OK); + if (result == mojom::Result::NO_LEGACY_STATE) { + BLOG(1, "No engine state"); + callback(mojom::Result::OK); return; } - if (result != mojom::Result::LEDGER_OK) { - BLOG(0, "Failed to load ledger state file, setting default values"); - callback(mojom::Result::LEDGER_OK); + if (result != mojom::Result::OK) { + BLOG(0, "Failed to load engine state file, setting default values"); + callback(mojom::Result::OK); return; } - ledger_->SetState("enabled", legacy_state_->GetRewardsMainEnabled()); + engine_->SetState("enabled", legacy_state_->GetRewardsMainEnabled()); - ledger_->SetState(kAutoContributeEnabled, + engine_->SetState(kAutoContributeEnabled, legacy_state_->GetAutoContributeEnabled()); if (legacy_state_->GetUserChangedContribution()) { - ledger_->SetState(kAutoContributeAmount, + engine_->SetState(kAutoContributeAmount, legacy_state_->GetAutoContributionAmount()); } - ledger_->SetState(kNextReconcileStamp, legacy_state_->GetReconcileStamp()); + engine_->SetState(kNextReconcileStamp, legacy_state_->GetReconcileStamp()); - ledger_->SetState(kCreationStamp, legacy_state_->GetCreationStamp()); + engine_->SetState(kCreationStamp, legacy_state_->GetCreationStamp()); const auto seed = legacy_state_->GetRecoverySeed(); - ledger_->SetState(kRecoverySeed, base::Base64Encode(seed)); + engine_->SetState(kRecoverySeed, base::Base64Encode(seed)); - ledger_->SetState(kPaymentId, legacy_state_->GetPaymentId()); + engine_->SetState(kPaymentId, legacy_state_->GetPaymentId()); - ledger_->SetState(kInlineTipRedditEnabled, + engine_->SetState(kInlineTipRedditEnabled, legacy_state_->GetInlineTipSetting("reddit")); - ledger_->SetState(kInlineTipTwitterEnabled, + engine_->SetState(kInlineTipTwitterEnabled, legacy_state_->GetInlineTipSetting("twitter")); - ledger_->SetState(kInlineTipGithubEnabled, + engine_->SetState(kInlineTipGithubEnabled, legacy_state_->GetInlineTipSetting("github")); - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v2.h b/components/brave_rewards/core/state/state_migration_v2.h index f4bf7451312..92ff4b45a51 100644 --- a/components/brave_rewards/core/state/state_migration_v2.h +++ b/components/brave_rewards/core/state/state_migration_v2.h @@ -10,17 +10,17 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" #include "brave/components/brave_rewards/core/legacy/bat_state.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace state { class StateMigrationV2 { public: - explicit StateMigrationV2(LedgerImpl& ledger); + explicit StateMigrationV2(RewardsEngineImpl& engine); ~StateMigrationV2(); void Migrate(LegacyResultCallback callback); @@ -29,7 +29,7 @@ class StateMigrationV2 { void OnLoadState(mojom::Result result, LegacyResultCallback callback); std::unique_ptr legacy_state_; - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v3.cc b/components/brave_rewards/core/state/state_migration_v3.cc index 0dbf5c0bb55..0b0e9b1b6e5 100644 --- a/components/brave_rewards/core/state/state_migration_v3.cc +++ b/components/brave_rewards/core/state/state_migration_v3.cc @@ -16,7 +16,7 @@ void StateMigrationV3::Migrate(LegacyResultCallback callback) { // In this migration we migrated anon address to uphold wallet in preferences // because anon address was removed we can also remove this step // Ref: https://github.com/brave/brave-browser/issues/11150 - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v3.h b/components/brave_rewards/core/state/state_migration_v3.h index b1daf347871..bcbe0c6338e 100644 --- a/components/brave_rewards/core/state/state_migration_v3.h +++ b/components/brave_rewards/core/state/state_migration_v3.h @@ -6,7 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_STATE_STATE_MIGRATION_V3_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_STATE_STATE_MIGRATION_V3_H_ -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { namespace state { diff --git a/components/brave_rewards/core/state/state_migration_v4.cc b/components/brave_rewards/core/state/state_migration_v4.cc index 57e347ac74d..e90c166e727 100644 --- a/components/brave_rewards/core/state/state_migration_v4.cc +++ b/components/brave_rewards/core/state/state_migration_v4.cc @@ -7,17 +7,18 @@ #include -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace state { -StateMigrationV4::StateMigrationV4(LedgerImpl& ledger) : ledger_(ledger) {} +StateMigrationV4::StateMigrationV4(RewardsEngineImpl& engine) + : engine_(engine) {} StateMigrationV4::~StateMigrationV4() = default; void StateMigrationV4::Migrate(ResultCallback callback) { - ledger_->client()->DeleteLog(std::move(callback)); + engine_->client()->DeleteLog(std::move(callback)); } } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v4.h b/components/brave_rewards/core/state/state_migration_v4.h index 940c3274dfe..8b9ec8e2d6e 100644 --- a/components/brave_rewards/core/state/state_migration_v4.h +++ b/components/brave_rewards/core/state/state_migration_v4.h @@ -7,22 +7,22 @@ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_STATE_STATE_MIGRATION_V4_H_ #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace state { class StateMigrationV4 { public: - explicit StateMigrationV4(LedgerImpl& ledger); + explicit StateMigrationV4(RewardsEngineImpl& engine); ~StateMigrationV4(); void Migrate(ResultCallback callback); private: - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v5.cc b/components/brave_rewards/core/state/state_migration_v5.cc index ff12f6f24a8..2f24d300142 100644 --- a/components/brave_rewards/core/state/state_migration_v5.cc +++ b/components/brave_rewards/core/state/state_migration_v5.cc @@ -9,27 +9,28 @@ #include #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" namespace brave_rewards::internal { namespace state { -StateMigrationV5::StateMigrationV5(LedgerImpl& ledger) : ledger_(ledger) {} +StateMigrationV5::StateMigrationV5(RewardsEngineImpl& engine) + : engine_(engine) {} StateMigrationV5::~StateMigrationV5() = default; void StateMigrationV5::Migrate(LegacyResultCallback callback) { - const auto seed = ledger_->GetState(kRecoverySeed); + const auto seed = engine_->GetState(kRecoverySeed); if (seed.empty()) { - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); return; } std::map events; // Auto contribute - auto enabled = ledger_->GetState(kAutoContributeEnabled); + auto enabled = engine_->GetState(kAutoContributeEnabled); events.insert( std::make_pair(kAutoContributeEnabled, std::to_string(enabled))); @@ -41,22 +42,22 @@ void StateMigrationV5::Migrate(LegacyResultCallback callback) { // Payment id events.insert( - std::make_pair(kPaymentId, ledger_->GetState(kPaymentId))); + std::make_pair(kPaymentId, engine_->GetState(kPaymentId))); // Enabled - enabled = ledger_->GetState("enabled"); + enabled = engine_->GetState("enabled"); events.insert(std::make_pair("enabled", std::to_string(enabled))); // Next reconcile - const auto reconcile_stamp = ledger_->GetState(kNextReconcileStamp); + const auto reconcile_stamp = engine_->GetState(kNextReconcileStamp); events.insert( std::make_pair(kNextReconcileStamp, std::to_string(reconcile_stamp))); // Creation stamp - const auto creation_stamp = ledger_->GetState(kCreationStamp); + const auto creation_stamp = engine_->GetState(kCreationStamp); events.insert(std::make_pair(kCreationStamp, std::to_string(creation_stamp))); - ledger_->database()->SaveEventLogs(events, callback); + engine_->database()->SaveEventLogs(events, callback); } } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v5.h b/components/brave_rewards/core/state/state_migration_v5.h index ffa53206188..c278d51a496 100644 --- a/components/brave_rewards/core/state/state_migration_v5.h +++ b/components/brave_rewards/core/state/state_migration_v5.h @@ -7,22 +7,22 @@ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_STATE_STATE_MIGRATION_V5_H_ #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace state { class StateMigrationV5 { public: - explicit StateMigrationV5(LedgerImpl& ledger); + explicit StateMigrationV5(RewardsEngineImpl& engine); ~StateMigrationV5(); void Migrate(LegacyResultCallback callback); private: - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v6.cc b/components/brave_rewards/core/state/state_migration_v6.cc index 2e8eddfd3fe..23ad4368389 100644 --- a/components/brave_rewards/core/state/state_migration_v6.cc +++ b/components/brave_rewards/core/state/state_migration_v6.cc @@ -10,30 +10,31 @@ #include #include "base/json/json_writer.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" namespace brave_rewards::internal { namespace state { -StateMigrationV6::StateMigrationV6(LedgerImpl& ledger) : ledger_(ledger) {} +StateMigrationV6::StateMigrationV6(RewardsEngineImpl& engine) + : engine_(engine) {} StateMigrationV6::~StateMigrationV6() = default; void StateMigrationV6::Migrate(LegacyResultCallback callback) { - auto uphold_wallet = ledger_->GetLegacyWallet(); - ledger_->SetState(kWalletUphold, uphold_wallet); - ledger_->client()->ClearState("external_wallets"); + auto uphold_wallet = engine_->GetLegacyWallet(); + engine_->SetState(kWalletUphold, uphold_wallet); + engine_->client()->ClearState("external_wallets"); base::Value::Dict brave; - brave.Set("payment_id", ledger_->GetState(kPaymentId)); - brave.Set("recovery_seed", ledger_->GetState(kRecoverySeed)); + brave.Set("payment_id", engine_->GetState(kPaymentId)); + brave.Set("recovery_seed", engine_->GetState(kRecoverySeed)); std::string brave_json; base::JSONWriter::Write(brave, &brave_json); - ledger_->SetState(kWalletBrave, std::move(brave_json)); + engine_->SetState(kWalletBrave, std::move(brave_json)); - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v6.h b/components/brave_rewards/core/state/state_migration_v6.h index d70aea0a237..071a0453358 100644 --- a/components/brave_rewards/core/state/state_migration_v6.h +++ b/components/brave_rewards/core/state/state_migration_v6.h @@ -7,22 +7,22 @@ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_STATE_STATE_MIGRATION_V6_H_ #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace state { class StateMigrationV6 { public: - explicit StateMigrationV6(LedgerImpl& ledger); + explicit StateMigrationV6(RewardsEngineImpl& engine); ~StateMigrationV6(); void Migrate(LegacyResultCallback callback); private: - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v7.cc b/components/brave_rewards/core/state/state_migration_v7.cc index 7ba08b473ac..fbde847990a 100644 --- a/components/brave_rewards/core/state/state_migration_v7.cc +++ b/components/brave_rewards/core/state/state_migration_v7.cc @@ -6,33 +6,34 @@ #include -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/state/state_keys.h" namespace brave_rewards::internal { namespace state { -StateMigrationV7::StateMigrationV7(LedgerImpl& ledger) : ledger_(ledger) {} +StateMigrationV7::StateMigrationV7(RewardsEngineImpl& engine) + : engine_(engine) {} StateMigrationV7::~StateMigrationV7() = default; void StateMigrationV7::Migrate(LegacyResultCallback callback) { - const std::string brave = ledger_->GetState(kWalletBrave); + const std::string brave = engine_->GetState(kWalletBrave); - if (!ledger_->state()->SetEncryptedString(kWalletBrave, brave)) { - callback(mojom::Result::LEDGER_ERROR); + if (!engine_->state()->SetEncryptedString(kWalletBrave, brave)) { + callback(mojom::Result::FAILED); return; } - const std::string uphold = ledger_->GetState(kWalletUphold); + const std::string uphold = engine_->GetState(kWalletUphold); - if (!ledger_->state()->SetEncryptedString(kWalletUphold, uphold)) { - callback(mojom::Result::LEDGER_ERROR); + if (!engine_->state()->SetEncryptedString(kWalletUphold, uphold)) { + callback(mojom::Result::FAILED); return; } - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v7.h b/components/brave_rewards/core/state/state_migration_v7.h index c2764f3952c..8e3f3c7e349 100644 --- a/components/brave_rewards/core/state/state_migration_v7.h +++ b/components/brave_rewards/core/state/state_migration_v7.h @@ -7,22 +7,22 @@ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_STATE_STATE_MIGRATION_V7_H_ #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace state { class StateMigrationV7 { public: - explicit StateMigrationV7(LedgerImpl& ledger); + explicit StateMigrationV7(RewardsEngineImpl& engine); ~StateMigrationV7(); void Migrate(LegacyResultCallback callback); private: - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v8.cc b/components/brave_rewards/core/state/state_migration_v8.cc index 538a9fb0329..9ddbcd4194e 100644 --- a/components/brave_rewards/core/state/state_migration_v8.cc +++ b/components/brave_rewards/core/state/state_migration_v8.cc @@ -6,24 +6,25 @@ #include -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" namespace brave_rewards::internal { namespace state { -StateMigrationV8::StateMigrationV8(LedgerImpl& ledger) : ledger_(ledger) {} +StateMigrationV8::StateMigrationV8(RewardsEngineImpl& engine) + : engine_(engine) {} StateMigrationV8::~StateMigrationV8() = default; void StateMigrationV8::Migrate(LegacyResultCallback callback) { - const bool enabled = ledger_->GetState("enabled"); + const bool enabled = engine_->GetState("enabled"); if (!enabled) { - ledger_->SetState(kAutoContributeEnabled, false); + engine_->SetState(kAutoContributeEnabled, false); } - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v8.h b/components/brave_rewards/core/state/state_migration_v8.h index 92f890ad86d..1c35929dea1 100644 --- a/components/brave_rewards/core/state/state_migration_v8.h +++ b/components/brave_rewards/core/state/state_migration_v8.h @@ -7,22 +7,22 @@ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_STATE_STATE_MIGRATION_V8_H_ #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace state { class StateMigrationV8 { public: - explicit StateMigrationV8(LedgerImpl& ledger); + explicit StateMigrationV8(RewardsEngineImpl& engine); ~StateMigrationV8(); void Migrate(LegacyResultCallback callback); private: - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v9.cc b/components/brave_rewards/core/state/state_migration_v9.cc index 54f48830c9d..e4b33f25311 100644 --- a/components/brave_rewards/core/state/state_migration_v9.cc +++ b/components/brave_rewards/core/state/state_migration_v9.cc @@ -17,7 +17,7 @@ void StateMigrationV9::Migrate(LegacyResultCallback callback) { // in Japan as part of bitFlyer feature support. Later, it was determined // that Android users in Japan *should* be allowed to AC and this migration // was removed. - callback(mojom::Result::LEDGER_OK); + callback(mojom::Result::OK); } } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v9.h b/components/brave_rewards/core/state/state_migration_v9.h index 06f5b4f9055..df5f56b4b74 100644 --- a/components/brave_rewards/core/state/state_migration_v9.h +++ b/components/brave_rewards/core/state/state_migration_v9.h @@ -6,7 +6,7 @@ #ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_STATE_STATE_MIGRATION_V9_H_ #define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_STATE_STATE_MIGRATION_V9_H_ -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal::state { diff --git a/components/brave_rewards/core/test/BUILD.gn b/components/brave_rewards/core/test/BUILD.gn index f3919b6b144..bf7a9fd1eef 100644 --- a/components/brave_rewards/core/test/BUILD.gn +++ b/components/brave_rewards/core/test/BUILD.gn @@ -75,10 +75,6 @@ source_set("test") { "//brave/components/brave_rewards/core/endpoints/uphold/post_create_transaction/post_create_transaction_uphold_unittest.cc", "//brave/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold_unittest.cc", "//brave/components/brave_rewards/core/gemini/gemini_util_unittest.cc", - "//brave/components/brave_rewards/core/ledger_client_mock.cc", - "//brave/components/brave_rewards/core/ledger_client_mock.h", - "//brave/components/brave_rewards/core/ledger_impl_mock.cc", - "//brave/components/brave_rewards/core/ledger_impl_mock.h", "//brave/components/brave_rewards/core/legacy/bat_helper_unittest.cc", "//brave/components/brave_rewards/core/legacy/bat_util_unittest.cc", "//brave/components/brave_rewards/core/legacy/client_state_unittest.cc", @@ -92,11 +88,15 @@ source_set("test") { "//brave/components/brave_rewards/core/promotion/promotion_unittest.cc", "//brave/components/brave_rewards/core/publisher/prefix_list_reader_unittest.cc", "//brave/components/brave_rewards/core/publisher/publisher_unittest.cc", - "//brave/components/brave_rewards/core/test/bat_ledger_test.cc", - "//brave/components/brave_rewards/core/test/bat_ledger_test.h", - "//brave/components/brave_rewards/core/test/test_ledger_client.cc", - "//brave/components/brave_rewards/core/test/test_ledger_client.h", - "//brave/components/brave_rewards/core/test/test_ledger_client_unittest.cc", + "//brave/components/brave_rewards/core/rewards_engine_client_mock.cc", + "//brave/components/brave_rewards/core/rewards_engine_client_mock.h", + "//brave/components/brave_rewards/core/rewards_engine_impl_mock.cc", + "//brave/components/brave_rewards/core/rewards_engine_impl_mock.h", + "//brave/components/brave_rewards/core/test/rewards_engine_test.cc", + "//brave/components/brave_rewards/core/test/rewards_engine_test.h", + "//brave/components/brave_rewards/core/test/test_rewards_engine_client.cc", + "//brave/components/brave_rewards/core/test/test_rewards_engine_client.h", + "//brave/components/brave_rewards/core/test/test_rewards_engine_client_unittest.cc", "//brave/components/brave_rewards/core/uphold/uphold_util_unittest.cc", "//brave/components/brave_rewards/core/wallet/wallet_unittest.cc", "//brave/components/brave_rewards/core/wallet/wallet_utils_unittest.cc", diff --git a/components/brave_rewards/core/test/bat_ledger_test.cc b/components/brave_rewards/core/test/bat_ledger_test.cc deleted file mode 100644 index 66241639513..00000000000 --- a/components/brave_rewards/core/test/bat_ledger_test.cc +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -#include "brave/components/brave_rewards/core/test/bat_ledger_test.h" -#include "brave/components/brave_rewards/common/mojom/bat_ledger.mojom-test-utils.h" - -namespace brave_rewards::internal { - -BATLedgerTest::BATLedgerTest() - : ledger_(client_receiver_.BindNewEndpointAndPassDedicatedRemote()) {} - -BATLedgerTest::~BATLedgerTest() = default; - -void BATLedgerTest::InitializeLedger() { - const auto result = mojom::LedgerAsyncWaiter(&ledger_).Initialize(); - DCHECK(result == mojom::Result::LEDGER_OK); -} - -void BATLedgerTest::AddNetworkResultForTesting(const std::string& url, - mojom::UrlMethod method, - mojom::UrlResponsePtr response) { - DCHECK(response); - client_.AddNetworkResultForTesting(url, method, std::move(response)); -} - -void BATLedgerTest::SetLogCallbackForTesting( - TestLedgerClient::LogCallback callback) { - client_.SetLogCallbackForTesting(callback); -} - -} // namespace brave_rewards::internal diff --git a/components/brave_rewards/core/test/bat_ledger_test.h b/components/brave_rewards/core/test/bat_ledger_test.h deleted file mode 100644 index 35d52012aef..00000000000 --- a/components/brave_rewards/core/test/bat_ledger_test.h +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_TEST_BAT_LEDGER_TEST_H_ -#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_TEST_BAT_LEDGER_TEST_H_ - -#include - -#include "base/test/bind.h" -#include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" -#include "brave/components/brave_rewards/core/test/test_ledger_client.h" -#include "mojo/public/cpp/bindings/associated_receiver.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace brave_rewards::internal { - -// Base class for unit tests. |BATLedgerTest| provides a task environment and a -// test implementation of |LedgerClient|. -class BATLedgerTest : public testing::Test { - public: - BATLedgerTest(); - ~BATLedgerTest() override; - - void InitializeLedger(); - - protected: - // Returns the |TaskEnvironment| for this test. - base::test::TaskEnvironment* task_environment() { return &task_environment_; } - - // Returns the |TestLedgerClient| instance for this test. - TestLedgerClient* GetTestLedgerClient() { return &client_; } - - // Returns the |LedgerImpl| instance for this test. - LedgerImpl* GetLedgerImpl() { return &ledger_; } - - // Adds a mock network response for the specified URL and HTTP method. - void AddNetworkResultForTesting(const std::string& url, - mojom::UrlMethod method, - mojom::UrlResponsePtr response); - - // Sets a callback that is executed when a message is logged to the client. - void SetLogCallbackForTesting(TestLedgerClient::LogCallback callback); - - private: - base::test::TaskEnvironment task_environment_; - TestLedgerClient client_; - mojo::AssociatedReceiver client_receiver_{&client_}; - LedgerImpl ledger_; -}; - -} // namespace brave_rewards::internal - -#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_TEST_BAT_LEDGER_TEST_H_ diff --git a/components/brave_rewards/core/test/rewards_engine_test.cc b/components/brave_rewards/core/test/rewards_engine_test.cc new file mode 100644 index 00000000000..463908714ee --- /dev/null +++ b/components/brave_rewards/core/test/rewards_engine_test.cc @@ -0,0 +1,34 @@ +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#include "brave/components/brave_rewards/core/test/rewards_engine_test.h" +#include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom-test-utils.h" + +namespace brave_rewards::internal { + +RewardsEngineTest::RewardsEngineTest() + : engine_(client_receiver_.BindNewEndpointAndPassDedicatedRemote()) {} + +RewardsEngineTest::~RewardsEngineTest() = default; + +void RewardsEngineTest::InitializeEngine() { + const auto result = mojom::RewardsEngineAsyncWaiter(&engine_).Initialize(); + DCHECK(result == mojom::Result::OK); +} + +void RewardsEngineTest::AddNetworkResultForTesting( + const std::string& url, + mojom::UrlMethod method, + mojom::UrlResponsePtr response) { + DCHECK(response); + client_.AddNetworkResultForTesting(url, method, std::move(response)); +} + +void RewardsEngineTest::SetLogCallbackForTesting( + TestRewardsEngineClient::LogCallback callback) { + client_.SetLogCallbackForTesting(callback); +} + +} // namespace brave_rewards::internal diff --git a/components/brave_rewards/core/test/rewards_engine_test.h b/components/brave_rewards/core/test/rewards_engine_test.h new file mode 100644 index 00000000000..e157c17fbc7 --- /dev/null +++ b/components/brave_rewards/core/test/rewards_engine_test.h @@ -0,0 +1,57 @@ +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_TEST_REWARDS_ENGINE_TEST_H_ +#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_TEST_REWARDS_ENGINE_TEST_H_ + +#include + +#include "base/test/bind.h" +#include "base/test/task_environment.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" +#include "mojo/public/cpp/bindings/associated_receiver.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace brave_rewards::internal { + +// Base class for unit tests. |RewardsEngineTest| provides a task environment +// and a test implementation of |mojom::RewardsEngineClient|. +class RewardsEngineTest : public testing::Test { + public: + RewardsEngineTest(); + ~RewardsEngineTest() override; + + void InitializeEngine(); + + protected: + // Returns the |TaskEnvironment| for this test. + base::test::TaskEnvironment* task_environment() { return &task_environment_; } + + // Returns the |TestRewardsEngineClient| instance for this test. + TestRewardsEngineClient* GetTestClient() { return &client_; } + + // Returns the |RewardsEngineImpl| instance for this test. + RewardsEngineImpl* GetEngineImpl() { return &engine_; } + + // Adds a mock network response for the specified URL and HTTP method. + void AddNetworkResultForTesting(const std::string& url, + mojom::UrlMethod method, + mojom::UrlResponsePtr response); + + // Sets a callback that is executed when a message is logged to the client. + void SetLogCallbackForTesting(TestRewardsEngineClient::LogCallback callback); + + private: + base::test::TaskEnvironment task_environment_; + TestRewardsEngineClient client_; + mojo::AssociatedReceiver client_receiver_{ + &client_}; + RewardsEngineImpl engine_; +}; + +} // namespace brave_rewards::internal + +#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_TEST_REWARDS_ENGINE_TEST_H_ diff --git a/components/brave_rewards/core/test/test_ledger_client.cc b/components/brave_rewards/core/test/test_rewards_engine_client.cc similarity index 51% rename from components/brave_rewards/core/test/test_ledger_client.cc rename to components/brave_rewards/core/test/test_rewards_engine_client.cc index bb173dccb66..d93dd396af4 100644 --- a/components/brave_rewards/core/test/test_ledger_client.cc +++ b/components/brave_rewards/core/test/test_rewards_engine_client.cc @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "brave/components/brave_rewards/core/test/test_ledger_client.h" +#include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" #include @@ -18,7 +18,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/task/sequenced_task_runner.h" -#include "brave/components/brave_rewards/common/mojom/ledger.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { @@ -73,37 +73,40 @@ base::FilePath GetTestDataPath() { return path; } -TestLedgerClient::TestLedgerClient() : ledger_database_(base::FilePath()) { - CHECK(ledger_database_.GetInternalDatabaseForTesting()->OpenInMemory()); +TestRewardsEngineClient::TestRewardsEngineClient() + : engine_database_(base::FilePath()) { + CHECK(engine_database_.GetInternalDatabaseForTesting()->OpenInMemory()); } -TestLedgerClient::~TestLedgerClient() = default; +TestRewardsEngineClient::~TestRewardsEngineClient() = default; -void TestLedgerClient::LoadLedgerState(LoadLedgerStateCallback callback) { - std::move(callback).Run(mojom::Result::NO_LEDGER_STATE, ""); +void TestRewardsEngineClient::LoadLegacyState( + LoadLegacyStateCallback callback) { + std::move(callback).Run(mojom::Result::NO_LEGACY_STATE, ""); } -void TestLedgerClient::LoadPublisherState(LoadPublisherStateCallback callback) { +void TestRewardsEngineClient::LoadPublisherState( + LoadPublisherStateCallback callback) { std::move(callback).Run(mojom::Result::NO_PUBLISHER_STATE, ""); } -void TestLedgerClient::OnReconcileComplete( +void TestRewardsEngineClient::OnReconcileComplete( mojom::Result result, mojom::ContributionInfoPtr contribution) {} -void TestLedgerClient::OnPanelPublisherInfo( +void TestRewardsEngineClient::OnPanelPublisherInfo( mojom::Result result, mojom::PublisherInfoPtr publisher_info, uint64_t window_id) {} -void TestLedgerClient::FetchFavIcon(const std::string& url, - const std::string& favicon_key, - FetchFavIconCallback callback) { +void TestRewardsEngineClient::FetchFavIcon(const std::string& url, + const std::string& favicon_key, + FetchFavIconCallback callback) { std::move(callback).Run(true, favicon_key); } -void TestLedgerClient::LoadURL(mojom::UrlRequestPtr request, - LoadURLCallback callback) { +void TestRewardsEngineClient::LoadURL(mojom::UrlRequestPtr request, + LoadURLCallback callback) { DCHECK(request); auto iter = base::ranges::find_if(network_results_, [&request](auto& result) { return request->url == result.url && request->method == result.method; @@ -124,66 +127,71 @@ void TestLedgerClient::LoadURL(mojom::UrlRequestPtr request, std::move(callback).Run(std::move(response)); } -void TestLedgerClient::PublisherListNormalized( +void TestRewardsEngineClient::PublisherListNormalized( std::vector list) {} -void TestLedgerClient::OnPublisherRegistryUpdated() {} +void TestRewardsEngineClient::OnPublisherRegistryUpdated() {} -void TestLedgerClient::OnPublisherUpdated(const std::string& publisher_id) {} +void TestRewardsEngineClient::OnPublisherUpdated( + const std::string& publisher_id) {} -void TestLedgerClient::GetBooleanState(const std::string& name, - GetBooleanStateCallback callback) { +void TestRewardsEngineClient::GetBooleanState( + const std::string& name, + GetBooleanStateCallback callback) { std::move(callback).Run( state_store_.FindBoolByDottedPath(name).value_or(false)); } -void TestLedgerClient::SetBooleanState(const std::string& name, - bool value, - SetBooleanStateCallback callback) { +void TestRewardsEngineClient::SetBooleanState( + const std::string& name, + bool value, + SetBooleanStateCallback callback) { state_store_.SetByDottedPath(name, value); std::move(callback).Run(); } -void TestLedgerClient::GetIntegerState(const std::string& name, - GetIntegerStateCallback callback) { +void TestRewardsEngineClient::GetIntegerState( + const std::string& name, + GetIntegerStateCallback callback) { std::move(callback).Run(state_store_.FindIntByDottedPath(name).value_or(0)); } -void TestLedgerClient::SetIntegerState(const std::string& name, - int32_t value, - SetIntegerStateCallback callback) { +void TestRewardsEngineClient::SetIntegerState( + const std::string& name, + int32_t value, + SetIntegerStateCallback callback) { state_store_.SetByDottedPath(name, value); std::move(callback).Run(); } -void TestLedgerClient::GetDoubleState(const std::string& name, - GetDoubleStateCallback callback) { +void TestRewardsEngineClient::GetDoubleState(const std::string& name, + GetDoubleStateCallback callback) { std::move(callback).Run( state_store_.FindDoubleByDottedPath(name).value_or(0.0)); } -void TestLedgerClient::SetDoubleState(const std::string& name, - double value, - SetDoubleStateCallback callback) { +void TestRewardsEngineClient::SetDoubleState(const std::string& name, + double value, + SetDoubleStateCallback callback) { state_store_.SetByDottedPath(name, value); std::move(callback).Run(); } -void TestLedgerClient::GetStringState(const std::string& name, - GetStringStateCallback callback) { +void TestRewardsEngineClient::GetStringState(const std::string& name, + GetStringStateCallback callback) { const auto* value = state_store_.FindStringByDottedPath(name); std::move(callback).Run(value ? *value : base::EmptyString()); } -void TestLedgerClient::SetStringState(const std::string& name, - const std::string& value, - SetStringStateCallback callback) { +void TestRewardsEngineClient::SetStringState(const std::string& name, + const std::string& value, + SetStringStateCallback callback) { state_store_.SetByDottedPath(name, value); std::move(callback).Run(); } -void TestLedgerClient::GetInt64State(const std::string& name, - GetInt64StateCallback callback) { +void TestRewardsEngineClient::GetInt64State(const std::string& name, + GetInt64StateCallback callback) { if (const std::string* opt = state_store_.FindStringByDottedPath(name)) { int64_t value; if (base::StringToInt64(*opt, &value)) { @@ -194,15 +202,15 @@ void TestLedgerClient::GetInt64State(const std::string& name, std::move(callback).Run(0); } -void TestLedgerClient::SetInt64State(const std::string& name, - int64_t value, - SetInt64StateCallback callback) { +void TestRewardsEngineClient::SetInt64State(const std::string& name, + int64_t value, + SetInt64StateCallback callback) { state_store_.SetByDottedPath(name, base::NumberToString(value)); std::move(callback).Run(); } -void TestLedgerClient::GetUint64State(const std::string& name, - GetUint64StateCallback callback) { +void TestRewardsEngineClient::GetUint64State(const std::string& name, + GetUint64StateCallback callback) { if (const std::string* opt = state_store_.FindStringByDottedPath(name)) { uint64_t value; if (base::StringToUint64(*opt, &value)) { @@ -212,28 +220,28 @@ void TestLedgerClient::GetUint64State(const std::string& name, std::move(callback).Run(0); } -void TestLedgerClient::SetUint64State(const std::string& name, - uint64_t value, - SetUint64StateCallback callback) { +void TestRewardsEngineClient::SetUint64State(const std::string& name, + uint64_t value, + SetUint64StateCallback callback) { state_store_.SetByDottedPath(name, base::NumberToString(value)); std::move(callback).Run(); } -void TestLedgerClient::GetValueState(const std::string& name, - GetValueStateCallback callback) { +void TestRewardsEngineClient::GetValueState(const std::string& name, + GetValueStateCallback callback) { const auto* value = state_store_.FindByDottedPath(name); std::move(callback).Run(value ? value->Clone() : base::Value()); } -void TestLedgerClient::SetValueState(const std::string& name, - base::Value value, - SetValueStateCallback callback) { +void TestRewardsEngineClient::SetValueState(const std::string& name, + base::Value value, + SetValueStateCallback callback) { state_store_.SetByDottedPath(name, std::move(value)); std::move(callback).Run(); } -void TestLedgerClient::GetTimeState(const std::string& name, - GetTimeStateCallback callback) { +void TestRewardsEngineClient::GetTimeState(const std::string& name, + GetTimeStateCallback callback) { const auto* value = state_store_.FindByDottedPath(name); DCHECK(value); if (!value) { @@ -245,52 +253,56 @@ void TestLedgerClient::GetTimeState(const std::string& name, std::move(callback).Run(time.value_or(base::Time())); } -void TestLedgerClient::SetTimeState(const std::string& name, - base::Time value, - SetTimeStateCallback callback) { +void TestRewardsEngineClient::SetTimeState(const std::string& name, + base::Time value, + SetTimeStateCallback callback) { state_store_.SetByDottedPath(name, base::TimeToValue(value)); std::move(callback).Run(); } -void TestLedgerClient::ClearState(const std::string& name, - ClearStateCallback callback) { +void TestRewardsEngineClient::ClearState(const std::string& name, + ClearStateCallback callback) { state_store_.RemoveByDottedPath(name); std::move(callback).Run(); } -void TestLedgerClient::IsBitFlyerRegion(IsBitFlyerRegionCallback callback) { +void TestRewardsEngineClient::IsBitFlyerRegion( + IsBitFlyerRegionCallback callback) { std::move(callback).Run(is_bitflyer_region_); } -void TestLedgerClient::GetLegacyWallet(GetLegacyWalletCallback callback) { +void TestRewardsEngineClient::GetLegacyWallet( + GetLegacyWalletCallback callback) { std::move(callback).Run(""); } -void TestLedgerClient::ShowNotification(const std::string& type, - const std::vector& args, - ShowNotificationCallback callback) {} +void TestRewardsEngineClient::ShowNotification( + const std::string& type, + const std::vector& args, + ShowNotificationCallback callback) {} -void TestLedgerClient::GetClientInfo(GetClientInfoCallback callback) { +void TestRewardsEngineClient::GetClientInfo(GetClientInfoCallback callback) { auto info = mojom::ClientInfo::New(); info->platform = mojom::Platform::DESKTOP; info->os = mojom::OperatingSystem::UNDEFINED; std::move(callback).Run(std::move(info)); } -void TestLedgerClient::UnblindedTokensReady() {} +void TestRewardsEngineClient::UnblindedTokensReady() {} -void TestLedgerClient::ReconcileStampReset() {} +void TestRewardsEngineClient::ReconcileStampReset() {} -void TestLedgerClient::RunDBTransaction(mojom::DBTransactionPtr transaction, - RunDBTransactionCallback callback) { - auto response = ledger_database_.RunTransaction(std::move(transaction)); +void TestRewardsEngineClient::RunDBTransaction( + mojom::DBTransactionPtr transaction, + RunDBTransactionCallback callback) { + auto response = engine_database_.RunTransaction(std::move(transaction)); std::move(callback).Run(std::move(response)); } -void TestLedgerClient::Log(const std::string& file, - int32_t line, - int32_t verbose_level, - const std::string& message) { +void TestRewardsEngineClient::Log(const std::string& file, + int32_t line, + int32_t verbose_level, + const std::string& message) { int vlog_level = logging::GetVlogLevelHelper(file.c_str(), strlen(file.c_str())); if (verbose_level <= vlog_level) { @@ -302,40 +314,41 @@ void TestLedgerClient::Log(const std::string& file, } } -void TestLedgerClient::ClearAllNotifications() {} +void TestRewardsEngineClient::ClearAllNotifications() {} -void TestLedgerClient::ExternalWalletConnected() {} +void TestRewardsEngineClient::ExternalWalletConnected() {} -void TestLedgerClient::ExternalWalletLoggedOut() {} +void TestRewardsEngineClient::ExternalWalletLoggedOut() {} -void TestLedgerClient::ExternalWalletReconnected() {} +void TestRewardsEngineClient::ExternalWalletReconnected() {} -void TestLedgerClient::DeleteLog(DeleteLogCallback callback) { - std::move(callback).Run(mojom::Result::LEDGER_OK); +void TestRewardsEngineClient::DeleteLog(DeleteLogCallback callback) { + std::move(callback).Run(mojom::Result::OK); } -void TestLedgerClient::EncryptString(const std::string& value, - EncryptStringCallback callback) { +void TestRewardsEngineClient::EncryptString(const std::string& value, + EncryptStringCallback callback) { std::move(callback).Run(FakeEncryption::EncryptString(value)); } -void TestLedgerClient::DecryptString(const std::string& value, - DecryptStringCallback callback) { +void TestRewardsEngineClient::DecryptString(const std::string& value, + DecryptStringCallback callback) { std::move(callback).Run(FakeEncryption::DecryptString(value)); } -void TestLedgerClient::SetIsBitFlyerRegionForTesting(bool is_bitflyer_region) { +void TestRewardsEngineClient::SetIsBitFlyerRegionForTesting( + bool is_bitflyer_region) { is_bitflyer_region_ = is_bitflyer_region; } -void TestLedgerClient::AddNetworkResultForTesting( +void TestRewardsEngineClient::AddNetworkResultForTesting( const std::string& url, mojom::UrlMethod method, mojom::UrlResponsePtr response) { network_results_.emplace_back(url, method, std::move(response)); } -void TestLedgerClient::SetLogCallbackForTesting(LogCallback callback) { +void TestRewardsEngineClient::SetLogCallbackForTesting(LogCallback callback) { log_callback_ = std::move(callback); } diff --git a/components/brave_rewards/core/test/test_ledger_client.h b/components/brave_rewards/core/test/test_rewards_engine_client.h similarity index 87% rename from components/brave_rewards/core/test/test_ledger_client.h rename to components/brave_rewards/core/test/test_rewards_engine_client.h index 5ac481f3c97..13fd252d653 100644 --- a/components/brave_rewards/core/test/test_ledger_client.h +++ b/components/brave_rewards/core/test/test_rewards_engine_client.h @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_TEST_TEST_LEDGER_CLIENT_H_ -#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_TEST_TEST_LEDGER_CLIENT_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_TEST_TEST_REWARDS_ENGINE_CLIENT_H_ +#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_TEST_TEST_REWARDS_ENGINE_CLIENT_H_ #include #include @@ -16,8 +16,8 @@ #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/values.h" -#include "brave/components/brave_rewards/common/mojom/bat_ledger.mojom.h" -#include "brave/components/brave_rewards/core/ledger_database.h" +#include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom.h" +#include "brave/components/brave_rewards/core/rewards_database.h" namespace brave_rewards::internal { @@ -45,18 +45,18 @@ struct TestNetworkResult { // Returns the file path of the directory containing test data base::FilePath GetTestDataPath(); -// An implementation of mojom::LedgerClient useful for unit testing. +// An implementation of mojom::RewardsEngineClient useful for unit testing. // A full SQLite database is provided, loaded in memory. -class TestLedgerClient : public mojom::LedgerClient { +class TestRewardsEngineClient : public mojom::RewardsEngineClient { public: - TestLedgerClient(); + TestRewardsEngineClient(); - TestLedgerClient(const TestLedgerClient&) = delete; - TestLedgerClient& operator=(const TestLedgerClient&) = delete; + TestRewardsEngineClient(const TestRewardsEngineClient&) = delete; + TestRewardsEngineClient& operator=(const TestRewardsEngineClient&) = delete; - ~TestLedgerClient() override; + ~TestRewardsEngineClient() override; - void LoadLedgerState(LoadLedgerStateCallback callback) override; + void LoadLegacyState(LoadLegacyStateCallback callback) override; void LoadPublisherState(LoadPublisherStateCallback callback) override; @@ -188,10 +188,10 @@ class TestLedgerClient : public mojom::LedgerClient { using LogCallback = base::RepeatingCallback; void SetLogCallbackForTesting(LogCallback callback); - LedgerDatabase* database() { return &ledger_database_; } + RewardsDatabase* database() { return &engine_database_; } private: - LedgerDatabase ledger_database_; + RewardsDatabase engine_database_; base::Value::Dict state_store_; bool is_bitflyer_region_{false}; std::list network_results_; @@ -200,4 +200,4 @@ class TestLedgerClient : public mojom::LedgerClient { } // namespace brave_rewards::internal -#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_TEST_TEST_LEDGER_CLIENT_H_ +#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_TEST_TEST_REWARDS_ENGINE_CLIENT_H_ diff --git a/components/brave_rewards/core/test/test_ledger_client_unittest.cc b/components/brave_rewards/core/test/test_rewards_engine_client_unittest.cc similarity index 70% rename from components/brave_rewards/core/test/test_ledger_client_unittest.cc rename to components/brave_rewards/core/test/test_rewards_engine_client_unittest.cc index feb74ef99b2..4ad62485072 100644 --- a/components/brave_rewards/core/test/test_ledger_client_unittest.cc +++ b/components/brave_rewards/core/test/test_rewards_engine_client_unittest.cc @@ -3,24 +3,24 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "brave/components/brave_rewards/core/test/test_ledger_client.h" +#include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" #include "base/test/bind.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/common/mojom/ledger.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" #include "sql/statement.h" #include "testing/gtest/include/gtest/gtest.h" -// npm run test -- brave_unit_tests --filter=TestLedgerClientTest.* +// npm run test -- brave_unit_tests --filter=TestRewardsEngineClientTest.* namespace brave_rewards::internal { -class TestLedgerClientTest : public testing::Test { +class TestRewardsEngineClientTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - TestLedgerClient client_; + TestRewardsEngineClient client_; }; -TEST_F(TestLedgerClientTest, CanAccessDatabaseDirectly) { +TEST_F(TestRewardsEngineClientTest, CanAccessDatabaseDirectly) { sql::Database* db = client_.database()->GetInternalDatabaseForTesting(); ASSERT_TRUE(db->Execute("CREATE TABLE test_table (num INTEGER);")); ASSERT_TRUE(db->Execute("INSERT INTO test_table VALUES (42);")); diff --git a/components/brave_rewards/core/uphold/uphold.cc b/components/brave_rewards/core/uphold/uphold.cc index e922d231336..32d5268bc27 100644 --- a/components/brave_rewards/core/uphold/uphold.cc +++ b/components/brave_rewards/core/uphold/uphold.cc @@ -15,7 +15,7 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/endpoint/uphold/uphold_server.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/uphold/uphold_card.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" @@ -27,13 +27,13 @@ namespace brave_rewards::internal::uphold { -Uphold::Uphold(LedgerImpl& ledger) - : ledger_(ledger), - card_(ledger), - connect_wallet_(ledger), - get_wallet_(ledger), - transfer_(ledger), - uphold_server_(ledger) {} +Uphold::Uphold(RewardsEngineImpl& engine) + : engine_(engine), + card_(engine), + connect_wallet_(engine), + get_wallet_(engine), + transfer_(engine), + uphold_server_(engine) {} Uphold::~Uphold() = default; @@ -54,7 +54,7 @@ void Uphold::StartContribution(const std::string& contribution_id, LegacyResultCallback callback) { if (!info) { BLOG(0, "Publisher info is null"); - return callback(mojom::Result::LEDGER_ERROR); + return callback(mojom::Result::FAILED); } const double fee = amount * 0.05; @@ -70,11 +70,11 @@ void Uphold::ContributionCompleted(LegacyResultCallback callback, double fee, const std::string& publisher_key, mojom::Result result) { - if (result == mojom::Result::LEDGER_OK) { + if (result == mojom::Result::OK) { SaveTransferFee(contribution_id, fee); if (!publisher_key.empty()) { - ledger_->database()->UpdateContributionInfoContributedAmount( + engine_->database()->UpdateContributionInfoContributedAmount( contribution_id, publisher_key, callback); return; } @@ -86,7 +86,7 @@ void Uphold::ContributionCompleted(LegacyResultCallback callback, void Uphold::FetchBalance(FetchBalanceCallback callback) { auto wallet = GetWalletIf({mojom::WalletStatus::kConnected}); if (!wallet) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR, 0.0); + return std::move(callback).Run(mojom::Result::FAILED, 0.0); } auto url_callback = base::BindOnce( @@ -100,25 +100,25 @@ void Uphold::OnFetchBalance(FetchBalanceCallback callback, const mojom::Result result, const double available) { if (!GetWalletIf({mojom::WalletStatus::kConnected})) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR, 0.0); + return std::move(callback).Run(mojom::Result::FAILED, 0.0); } if (result == mojom::Result::EXPIRED_TOKEN) { BLOG(0, "Expired token"); if (!LogOutWallet()) { BLOG(0, "Failed to disconnect " << constant::kWalletUphold << " wallet!"); - return std::move(callback).Run(mojom::Result::LEDGER_ERROR, 0.0); + return std::move(callback).Run(mojom::Result::FAILED, 0.0); } return std::move(callback).Run(mojom::Result::EXPIRED_TOKEN, 0.0); } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Couldn't get balance"); - return std::move(callback).Run(mojom::Result::LEDGER_ERROR, 0.0); + return std::move(callback).Run(mojom::Result::FAILED, 0.0); } - std::move(callback).Run(mojom::Result::LEDGER_OK, available); + std::move(callback).Run(mojom::Result::OK, available); } void Uphold::TransferFunds(double amount, @@ -186,7 +186,7 @@ void Uphold::StartTransferFeeTimer(const std::string& fee_id, int attempts) { void Uphold::OnTransferFeeCompleted(const std::string& contribution_id, int attempts, mojom::Result result) { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { if (attempts < 3) { BLOG(0, "Transaction fee failed, retrying"); StartTransferFeeTimer(contribution_id, attempts + 1); @@ -226,26 +226,26 @@ void Uphold::OnTransferFeeTimerElapsed(const std::string& id, int attempts) { } mojom::ExternalWalletPtr Uphold::GetWallet() { - return wallet::GetWallet(*ledger_, constant::kWalletUphold); + return wallet::GetWallet(*engine_, constant::kWalletUphold); } mojom::ExternalWalletPtr Uphold::GetWalletIf( const std::set& statuses) { - return wallet::GetWalletIf(*ledger_, constant::kWalletUphold, statuses); + return wallet::GetWalletIf(*engine_, constant::kWalletUphold, statuses); } bool Uphold::SetWallet(mojom::ExternalWalletPtr wallet) { - return wallet::SetWallet(*ledger_, std::move(wallet)); + return wallet::SetWallet(*engine_, std::move(wallet)); } mojom::ExternalWalletPtr Uphold::TransitionWallet( mojom::ExternalWalletPtr wallet, mojom::WalletStatus to) { - return wallet::TransitionWallet(*ledger_, std::move(wallet), to); + return wallet::TransitionWallet(*engine_, std::move(wallet), to); } bool Uphold::LogOutWallet(const std::string& notification) { - return wallet::LogOutWallet(*ledger_, constant::kWalletUphold, notification); + return wallet::LogOutWallet(*engine_, constant::kWalletUphold, notification); } void Uphold::RemoveTransferFee(const std::string& contribution_id) { diff --git a/components/brave_rewards/core/uphold/uphold.h b/components/brave_rewards/core/uphold/uphold.h index 045c1fdb496..fd584cd112c 100644 --- a/components/brave_rewards/core/uphold/uphold.h +++ b/components/brave_rewards/core/uphold/uphold.h @@ -19,7 +19,7 @@ #include "brave/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.h" #include "brave/components/brave_rewards/core/endpoint/uphold/get_me/get_me.h" #include "brave/components/brave_rewards/core/endpoint/uphold/uphold_server.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/uphold/uphold_card.h" #include "brave/components/brave_rewards/core/uphold/uphold_user.h" #include "brave/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.h" @@ -27,7 +27,7 @@ #include "brave/components/brave_rewards/core/wallet_provider/uphold/uphold_transfer.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace uphold { @@ -37,7 +37,7 @@ using endpoint::uphold::GetMeCallback; class Uphold { public: - explicit Uphold(LedgerImpl& ledger); + explicit Uphold(RewardsEngineImpl& engine); ~Uphold(); @@ -104,7 +104,7 @@ class Uphold { void RemoveTransferFee(const std::string& contribution_id); - const raw_ref ledger_; + const raw_ref engine_; UpholdCard card_; ConnectUpholdWallet connect_wallet_; GetUpholdWallet get_wallet_; diff --git a/components/brave_rewards/core/uphold/uphold_card.cc b/components/brave_rewards/core/uphold/uphold_card.cc index d312aaf7566..1fbd8d20f43 100644 --- a/components/brave_rewards/core/uphold/uphold_card.cc +++ b/components/brave_rewards/core/uphold/uphold_card.cc @@ -12,7 +12,7 @@ namespace brave_rewards::internal::uphold { -UpholdCard::UpholdCard(LedgerImpl& ledger) : uphold_server_(ledger) {} +UpholdCard::UpholdCard(RewardsEngineImpl& engine) : uphold_server_(engine) {} UpholdCard::~UpholdCard() = default; @@ -32,8 +32,8 @@ void UpholdCard::OnGetBATCardId(CreateCardCallback callback, return std::move(callback).Run(mojom::Result::EXPIRED_TOKEN, ""); } - if (result == mojom::Result::LEDGER_OK && !id.empty()) { - return std::move(callback).Run(mojom::Result::LEDGER_OK, std::move(id)); + if (result == mojom::Result::OK && !id.empty()) { + return std::move(callback).Run(mojom::Result::OK, std::move(id)); } BLOG(1, "Couldn't get BAT card ID!"); @@ -52,14 +52,14 @@ void UpholdCard::OnCreateBATCard(CreateCardCallback callback, return std::move(callback).Run(mojom::Result::EXPIRED_TOKEN, ""); } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Couldn't create BAT card!"); return std::move(callback).Run(result, ""); } if (id.empty()) { BLOG(0, "BAT card ID is empty!"); - return std::move(callback).Run(mojom::Result::LEDGER_ERROR, ""); + return std::move(callback).Run(mojom::Result::FAILED, ""); } uphold_server_.patch_card().Request( @@ -75,13 +75,13 @@ void UpholdCard::OnUpdateBATCardSettings(CreateCardCallback callback, return std::move(callback).Run(mojom::Result::EXPIRED_TOKEN, ""); } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Couldn't update BAT card settings!"); return std::move(callback).Run(result, ""); } DCHECK(!id.empty()); - std::move(callback).Run(mojom::Result::LEDGER_OK, std::move(id)); + std::move(callback).Run(mojom::Result::OK, std::move(id)); } } // namespace brave_rewards::internal::uphold diff --git a/components/brave_rewards/core/uphold/uphold_card.h b/components/brave_rewards/core/uphold/uphold_card.h index 3a38af4d901..e6e8ba4d3c8 100644 --- a/components/brave_rewards/core/uphold/uphold_card.h +++ b/components/brave_rewards/core/uphold/uphold_card.h @@ -9,11 +9,11 @@ #include #include "base/functional/callback_forward.h" -#include "brave/components/brave_rewards/common/mojom/ledger.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" #include "brave/components/brave_rewards/core/endpoint/uphold/uphold_server.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace uphold { @@ -24,7 +24,7 @@ using CreateCardCallback = class UpholdCard { public: - explicit UpholdCard(LedgerImpl& ledger); + explicit UpholdCard(RewardsEngineImpl& engine); ~UpholdCard(); diff --git a/components/brave_rewards/core/uphold/uphold_util.cc b/components/brave_rewards/core/uphold/uphold_util.cc index b3c14d3d83f..e1af21d4416 100644 --- a/components/brave_rewards/core/uphold/uphold_util.cc +++ b/components/brave_rewards/core/uphold/uphold_util.cc @@ -8,7 +8,7 @@ #include "base/base64.h" #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/buildflags.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { namespace { diff --git a/components/brave_rewards/core/uphold/uphold_util.h b/components/brave_rewards/core/uphold/uphold_util.h index 7a60a113ea1..0b8b0af138e 100644 --- a/components/brave_rewards/core/uphold/uphold_util.h +++ b/components/brave_rewards/core/uphold/uphold_util.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom.h" namespace brave_rewards::internal::uphold { diff --git a/components/brave_rewards/core/uphold/uphold_util_unittest.cc b/components/brave_rewards/core/uphold/uphold_util_unittest.cc index 1881d6d4836..db0c76e07f9 100644 --- a/components/brave_rewards/core/uphold/uphold_util_unittest.cc +++ b/components/brave_rewards/core/uphold/uphold_util_unittest.cc @@ -12,11 +12,11 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/buildflags.h" #include "brave/components/brave_rewards/core/common/random_util.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" -#include "brave/components/brave_rewards/core/test/test_ledger_client.h" +#include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" #include "brave/components/brave_rewards/core/uphold/uphold.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" #include "testing/gmock/include/gmock/gmock.h" @@ -83,18 +83,18 @@ TEST_F(UpholdUtilTest, GetServerUrl) { TEST_F(UpholdUtilTest, GetWallet) { base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; // no wallet - ON_CALL(*mock_ledger_impl_.mock_client(), + ON_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletUphold, _)) .WillByDefault([](const std::string&, auto callback) { std::move(callback).Run(""); }); - auto result = mock_ledger_impl_.uphold()->GetWallet(); + auto result = mock_engine_impl_.uphold()->GetWallet(); EXPECT_FALSE(result); - ON_CALL(*mock_ledger_impl_.mock_client(), + ON_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletUphold, _)) .WillByDefault([](const std::string&, auto callback) { std::string wallet = FakeEncryption::Base64EncryptString(R"({ @@ -111,7 +111,7 @@ TEST_F(UpholdUtilTest, GetWallet) { }); // uphold wallet - result = mock_ledger_impl_.uphold()->GetWallet(); + result = mock_engine_impl_.uphold()->GetWallet(); EXPECT_TRUE(result); EXPECT_EQ(result->address, "2323dff2ba-d0d1-4dfw-8e56-a2605bcaf4af"); EXPECT_EQ(result->user_name, "test"); diff --git a/components/brave_rewards/core/wallet/wallet.cc b/components/brave_rewards/core/wallet/wallet.cc index 16cee659866..9a05b48c778 100644 --- a/components/brave_rewards/core/wallet/wallet.cc +++ b/components/brave_rewards/core/wallet/wallet.cc @@ -14,8 +14,8 @@ #include "base/values.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" @@ -24,11 +24,11 @@ namespace brave_rewards::internal { namespace wallet { -Wallet::Wallet(LedgerImpl& ledger) - : ledger_(ledger), - create_(ledger), - balance_(ledger), - promotion_server_(ledger) {} +Wallet::Wallet(RewardsEngineImpl& engine) + : engine_(engine), + create_(engine), + balance_(engine), + promotion_server_(engine) {} Wallet::~Wallet() = default; @@ -45,7 +45,7 @@ mojom::RewardsWalletPtr Wallet::GetWallet(bool* corrupted) { DCHECK(corrupted); *corrupted = false; - const std::string json = ledger_->GetState(state::kWalletBrave); + const std::string json = engine_->GetState(state::kWalletBrave); if (json.empty()) { return nullptr; @@ -112,12 +112,12 @@ bool Wallet::SetWallet(mojom::RewardsWalletPtr wallet) { std::string json; base::JSONWriter::Write(new_wallet, &json); - ledger_->SetState(state::kWalletBrave, std::move(json)); + engine_->SetState(state::kWalletBrave, std::move(json)); - ledger_->database()->SaveEventLog(state::kRecoverySeed, event_string); + engine_->database()->SaveEventLog(state::kRecoverySeed, event_string); if (!wallet->payment_id.empty()) { - ledger_->database()->SaveEventLog(state::kPaymentId, wallet->payment_id); + engine_->database()->SaveEventLog(state::kPaymentId, wallet->payment_id); } return true; diff --git a/components/brave_rewards/core/wallet/wallet.h b/components/brave_rewards/core/wallet/wallet.h index 4572c90794f..9cfed05b4fe 100644 --- a/components/brave_rewards/core/wallet/wallet.h +++ b/components/brave_rewards/core/wallet/wallet.h @@ -13,19 +13,19 @@ #include "base/containers/flat_map.h" #include "base/memory/raw_ref.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotion_server.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/wallet/wallet_balance.h" #include "brave/components/brave_rewards/core/wallet/wallet_create.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace wallet { class Wallet { public: - explicit Wallet(LedgerImpl& ledger); + explicit Wallet(RewardsEngineImpl& engine); ~Wallet(); void CreateWalletIfNecessary(absl::optional&& geo_country, @@ -39,7 +39,7 @@ class Wallet { bool SetWallet(mojom::RewardsWalletPtr wallet); private: - const raw_ref ledger_; + const raw_ref engine_; WalletCreate create_; WalletBalance balance_; endpoint::PromotionServer promotion_server_; diff --git a/components/brave_rewards/core/wallet/wallet_balance.cc b/components/brave_rewards/core/wallet/wallet_balance.cc index d9767073230..4aeff7c77db 100644 --- a/components/brave_rewards/core/wallet/wallet_balance.cc +++ b/components/brave_rewards/core/wallet/wallet_balance.cc @@ -11,28 +11,28 @@ #include "brave/components/brave_rewards/core/constants.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" namespace brave_rewards::internal::wallet { namespace { -std::string GetConnectedWalletType(LedgerImpl& ledger) { - return GetWalletIf(ledger, constant::kWalletBitflyer, +std::string GetConnectedWalletType(RewardsEngineImpl& engine) { + return GetWalletIf(engine, constant::kWalletBitflyer, {mojom::WalletStatus::kConnected}) ? constant::kWalletBitflyer - : GetWalletIf(ledger, constant::kWalletGemini, + : GetWalletIf(engine, constant::kWalletGemini, {mojom::WalletStatus::kConnected}) ? constant::kWalletGemini - : GetWalletIf(ledger, constant::kWalletUphold, + : GetWalletIf(engine, constant::kWalletUphold, {mojom::WalletStatus::kConnected}) ? constant::kWalletUphold : ""; } } // namespace -WalletBalance::WalletBalance(LedgerImpl& ledger) : ledger_(ledger) {} +WalletBalance::WalletBalance(RewardsEngineImpl& engine) : engine_(engine) {} WalletBalance::~WalletBalance() = default; @@ -41,7 +41,7 @@ void WalletBalance::Fetch(FetchBalanceCallback callback) { base::BindOnce(&WalletBalance::OnGetUnblindedTokens, base::Unretained(this), std::move(callback)); - ledger_->database()->GetSpendableUnblindedTokensByBatchTypes( + engine_->database()->GetSpendableUnblindedTokensByBatchTypes( {mojom::CredsBatchType::PROMOTION}, [callback = std::make_shared(std::move( tokens_callback))](std::vector list) { @@ -61,13 +61,13 @@ void WalletBalance::OnGetUnblindedTokens( balance->total = total; balance->wallets.emplace(constant::kWalletUnBlinded, balance->total); - const auto wallet_type = GetConnectedWalletType(*ledger_); + const auto wallet_type = GetConnectedWalletType(*engine_); if (wallet_type.empty()) { return std::move(callback).Run(std::move(balance)); } wallet::FetchBalance( - *ledger_, wallet_type, + *engine_, wallet_type, base::BindOnce(&WalletBalance::OnFetchExternalWalletBalance, base::Unretained(this), wallet_type, std::move(balance), std::move(callback))); @@ -78,7 +78,7 @@ void WalletBalance::OnFetchExternalWalletBalance(const std::string& wallet_type, FetchBalanceCallback callback, mojom::Result result, double balance) { - if (result == mojom::Result::LEDGER_OK) { + if (result == mojom::Result::OK) { DCHECK(balance_ptr); balance_ptr->total += balance; balance_ptr->wallets.emplace(wallet_type, balance); diff --git a/components/brave_rewards/core/wallet/wallet_balance.h b/components/brave_rewards/core/wallet/wallet_balance.h index b14c331fb39..e89ff2cf51c 100644 --- a/components/brave_rewards/core/wallet/wallet_balance.h +++ b/components/brave_rewards/core/wallet/wallet_balance.h @@ -10,16 +10,16 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace wallet { class WalletBalance { public: - explicit WalletBalance(LedgerImpl& ledger); + explicit WalletBalance(RewardsEngineImpl& engine); ~WalletBalance(); void Fetch(FetchBalanceCallback callback); @@ -34,7 +34,7 @@ class WalletBalance { mojom::Result result, double balance); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace wallet diff --git a/components/brave_rewards/core/wallet/wallet_create.cc b/components/brave_rewards/core/wallet/wallet_create.cc index 704d84f7477..4af6be4bada 100644 --- a/components/brave_rewards/core/wallet/wallet_create.cc +++ b/components/brave_rewards/core/wallet/wallet_create.cc @@ -13,8 +13,8 @@ #include "brave/components/brave_rewards/core/endpoints/patch_wallets/patch_wallets.h" #include "brave/components/brave_rewards/core/endpoints/post_wallets/post_wallets.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" @@ -48,24 +48,24 @@ mojom::CreateRewardsWalletResult MapEndpointError(PatchWallets::Error error) { } // namespace -WalletCreate::WalletCreate(LedgerImpl& ledger) : ledger_(ledger) {} +WalletCreate::WalletCreate(RewardsEngineImpl& engine) : engine_(engine) {} void WalletCreate::CreateWallet(absl::optional&& geo_country, CreateRewardsWalletCallback callback) { bool corrupted = false; - auto wallet = ledger_->wallet()->GetWallet(&corrupted); + auto wallet = engine_->wallet()->GetWallet(&corrupted); if (corrupted) { DCHECK(!wallet); BLOG(0, "Rewards wallet data is corrupted - generating a new wallet!"); - ledger_->database()->SaveEventLog(log::kWalletCorrupted, ""); + engine_->database()->SaveEventLog(log::kWalletCorrupted, ""); } if (!wallet) { wallet = mojom::RewardsWallet::New(); wallet->recovery_seed = util::Security::GenerateSeed(); - if (!ledger_->wallet()->SetWallet(std::move(wallet))) { + if (!engine_->wallet()->SetWallet(std::move(wallet))) { BLOG(0, "Failed to set Rewards wallet!"); return std::move(callback).Run( mojom::CreateRewardsWalletResult::kUnexpected); @@ -77,7 +77,7 @@ void WalletCreate::CreateWallet(absl::optional&& geo_country, &WalletCreate::OnResult, base::Unretained(this), std::move(callback), geo_country); - return RequestFor(*ledger_, std::move(*geo_country)) + return RequestFor(*engine_, std::move(*geo_country)) .Send(std::move(on_update_wallet)); } else { BLOG(1, "Rewards wallet already exists."); @@ -90,7 +90,7 @@ void WalletCreate::CreateWallet(absl::optional&& geo_country, base::BindOnce(&WalletCreate::OnResult, base::Unretained(this), std::move(callback), geo_country); - RequestFor(*ledger_, std::move(geo_country)) + RequestFor(*engine_, std::move(geo_country)) .Send(std::move(on_create_wallet)); } @@ -116,26 +116,26 @@ void WalletCreate::OnResult(CreateRewardsWalletCallback callback, return std::move(callback).Run(MapEndpointError(result.error())); } - auto wallet = ledger_->wallet()->GetWallet(); + auto wallet = engine_->wallet()->GetWallet(); DCHECK(wallet); if constexpr (std::is_same_v) { DCHECK(!result.value().empty()); wallet->payment_id = std::move(result.value()); } - if (!ledger_->wallet()->SetWallet(std::move(wallet))) { + if (!engine_->wallet()->SetWallet(std::move(wallet))) { BLOG(0, "Failed to set Rewards wallet!"); return std::move(callback).Run( mojom::CreateRewardsWalletResult::kUnexpected); } if constexpr (std::is_same_v) { - ledger_->state()->ResetReconcileStamp(); + engine_->state()->ResetReconcileStamp(); if (!is_testing) { - ledger_->state()->SetEmptyBalanceChecked(true); - ledger_->state()->SetPromotionCorruptedMigrated(true); + engine_->state()->SetEmptyBalanceChecked(true); + engine_->state()->SetPromotionCorruptedMigrated(true); } - ledger_->state()->SetCreationStamp(util::GetCurrentTimeStamp()); + engine_->state()->SetCreationStamp(util::GetCurrentTimeStamp()); } std::move(callback).Run(mojom::CreateRewardsWalletResult::kSuccess); diff --git a/components/brave_rewards/core/wallet/wallet_create.h b/components/brave_rewards/core/wallet/wallet_create.h index 00b3e427b34..1c01fd5a4a3 100644 --- a/components/brave_rewards/core/wallet/wallet_create.h +++ b/components/brave_rewards/core/wallet/wallet_create.h @@ -9,17 +9,17 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace wallet { class WalletCreate { public: - explicit WalletCreate(LedgerImpl& ledger); + explicit WalletCreate(RewardsEngineImpl& engine); void CreateWallet(absl::optional&& geo_country, CreateRewardsWalletCallback callback); @@ -30,7 +30,7 @@ class WalletCreate { absl::optional&& geo_country, Result&&); - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace wallet diff --git a/components/brave_rewards/core/wallet/wallet_unittest.cc b/components/brave_rewards/core/wallet/wallet_unittest.cc index 91d1adfa53e..6fa5b337978 100644 --- a/components/brave_rewards/core/wallet/wallet_unittest.cc +++ b/components/brave_rewards/core/wallet/wallet_unittest.cc @@ -7,11 +7,11 @@ #include #include "base/test/bind.h" -#include "brave/components/brave_rewards/common/mojom/bat_ledger.mojom-test-utils.h" +#include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom-test-utils.h" #include "brave/components/brave_rewards/core/endpoint/promotion/promotions_util.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state_keys.h" -#include "brave/components/brave_rewards/core/test/bat_ledger_test.h" +#include "brave/components/brave_rewards/core/test/rewards_engine_test.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -19,10 +19,10 @@ namespace brave_rewards::internal { -class WalletTest : public BATLedgerTest { +class WalletTest : public RewardsEngineTest { protected: mojom::CreateRewardsWalletResult CreateWalletIfNecessary() { - auto* ledger = GetLedgerImpl(); + auto* engine = GetEngineImpl(); auto response = mojom::UrlResponse::New(); response->status_code = net::HTTP_CREATED; @@ -35,7 +35,7 @@ class WalletTest : public BATLedgerTest { base::RunLoop run_loop; mojom::CreateRewardsWalletResult result; - ledger->wallet()->CreateWalletIfNecessary( + engine->wallet()->CreateWalletIfNecessary( absl::nullopt, base::BindLambdaForTesting( [&result, &run_loop](mojom::CreateRewardsWalletResult r) { @@ -49,49 +49,49 @@ class WalletTest : public BATLedgerTest { }; TEST_F(WalletTest, GetWallet) { - auto* ledger = GetLedgerImpl(); + auto* engine = GetEngineImpl(); bool corrupted = false; // When there is no current wallet information, `GetWallet` returns empty and // sets the corrupted flag to false. - mojom::LedgerClientAsyncWaiter(GetTestLedgerClient()) + mojom::RewardsEngineClientAsyncWaiter(GetTestClient()) .SetStringState(state::kWalletBrave, ""); corrupted = true; - mojom::RewardsWalletPtr wallet = ledger->wallet()->GetWallet(&corrupted); + mojom::RewardsWalletPtr wallet = engine->wallet()->GetWallet(&corrupted); EXPECT_FALSE(wallet); EXPECT_FALSE(corrupted); // When there is invalid wallet information, `GetWallet` returns empty, sets // the corrupted flag to true, and does not modify prefs. - mojom::LedgerClientAsyncWaiter(GetTestLedgerClient()) + mojom::RewardsEngineClientAsyncWaiter(GetTestClient()) .SetStringState(state::kWalletBrave, "BAD-DATA"); - wallet = ledger->wallet()->GetWallet(&corrupted); + wallet = engine->wallet()->GetWallet(&corrupted); EXPECT_FALSE(wallet); EXPECT_TRUE(corrupted); - EXPECT_EQ(mojom::LedgerClientAsyncWaiter(GetTestLedgerClient()) + EXPECT_EQ(mojom::RewardsEngineClientAsyncWaiter(GetTestClient()) .GetStringState(state::kWalletBrave), "BAD-DATA"); } TEST_F(WalletTest, CreateWallet) { - auto* ledger = GetLedgerImpl(); + auto* engine = GetEngineImpl(); // Create a wallet when there is no current wallet information. - mojom::LedgerClientAsyncWaiter(GetTestLedgerClient()) + mojom::RewardsEngineClientAsyncWaiter(GetTestClient()) .SetStringState(state::kWalletBrave, ""); mojom::CreateRewardsWalletResult result = CreateWalletIfNecessary(); EXPECT_EQ(result, mojom::CreateRewardsWalletResult::kSuccess); - mojom::RewardsWalletPtr wallet = ledger->wallet()->GetWallet(); + mojom::RewardsWalletPtr wallet = engine->wallet()->GetWallet(); ASSERT_TRUE(wallet); EXPECT_TRUE(!wallet->payment_id.empty()); EXPECT_TRUE(!wallet->recovery_seed.empty()); // Create a wallet when there is corrupted wallet information. - mojom::LedgerClientAsyncWaiter(GetTestLedgerClient()) + mojom::RewardsEngineClientAsyncWaiter(GetTestClient()) .SetStringState(state::kWalletBrave, "BAD-DATA"); result = CreateWalletIfNecessary(); EXPECT_EQ(result, mojom::CreateRewardsWalletResult::kSuccess); - wallet = ledger->wallet()->GetWallet(); + wallet = engine->wallet()->GetWallet(); ASSERT_TRUE(wallet); EXPECT_TRUE(!wallet->payment_id.empty()); EXPECT_TRUE(!wallet->recovery_seed.empty()); diff --git a/components/brave_rewards/core/wallet/wallet_util.cc b/components/brave_rewards/core/wallet/wallet_util.cc index 7bcafde3c8c..9f33eeff721 100644 --- a/components/brave_rewards/core/wallet/wallet_util.cc +++ b/components/brave_rewards/core/wallet/wallet_util.cc @@ -21,9 +21,9 @@ #include "brave/components/brave_rewards/core/gemini/gemini.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" #include "brave/components/brave_rewards/core/notifications/notification_keys.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/uphold/uphold.h" @@ -48,7 +48,7 @@ std::string WalletTypeToState(const std::string& wallet_type) { } } -void OnWalletStatusChange(LedgerImpl& ledger, +void OnWalletStatusChange(RewardsEngineImpl& engine, const std::string& wallet_type, absl::optional from, mojom::WalletStatus to) { @@ -58,7 +58,7 @@ void OnWalletStatusChange(LedgerImpl& ledger, } oss << "==> " << to; - ledger.database()->SaveEventLog(log::kWalletStatusChange, + engine.database()->SaveEventLog(log::kWalletStatusChange, oss.str() + " (" + wallet_type + ')'); } @@ -139,14 +139,14 @@ mojom::ExternalWalletPtr ExternalWalletPtrFromJSON(std::string wallet_string, return wallet; } -mojom::ExternalWalletPtr GetWallet(LedgerImpl& ledger, +mojom::ExternalWalletPtr GetWallet(RewardsEngineImpl& engine, const std::string& wallet_type) { const auto state = WalletTypeToState(wallet_type); if (state.empty()) { return nullptr; } - auto json = ledger.state()->GetEncryptedString(state); + auto json = engine.state()->GetEncryptedString(state); if (!json || json->empty()) { return nullptr; } @@ -155,14 +155,14 @@ mojom::ExternalWalletPtr GetWallet(LedgerImpl& ledger, } mojom::ExternalWalletPtr GetWalletIf( - LedgerImpl& ledger, + RewardsEngineImpl& engine, const std::string& wallet_type, const std::set& statuses) { if (statuses.empty()) { return nullptr; } - auto wallet = GetWallet(ledger, wallet_type); + auto wallet = GetWallet(engine, wallet_type); if (!wallet) { BLOG(9, wallet_type << " wallet is null!"); return nullptr; @@ -184,7 +184,7 @@ mojom::ExternalWalletPtr GetWalletIf( return wallet; } -bool SetWallet(LedgerImpl& ledger, mojom::ExternalWalletPtr wallet) { +bool SetWallet(RewardsEngineImpl& engine, mojom::ExternalWalletPtr wallet) { if (!wallet || wallet->type.empty()) { return false; } @@ -212,7 +212,7 @@ bool SetWallet(LedgerImpl& ledger, mojom::ExternalWalletPtr wallet) { return false; } - return ledger.state()->SetEncryptedString(WalletTypeToState(wallet->type), + return engine.state()->SetEncryptedString(WalletTypeToState(wallet->type), json); } @@ -307,7 +307,7 @@ mojom::ExternalWalletPtr EnsureValidTransition(mojom::ExternalWalletPtr wallet, } mojom::ExternalWalletPtr TransitionWallet( - LedgerImpl& ledger, + RewardsEngineImpl& engine, absl::variant wallet_info, mojom::WalletStatus to) { absl::optional from; @@ -315,7 +315,7 @@ mojom::ExternalWalletPtr TransitionWallet( auto wallet = absl::visit( base::Overloaded{ [&](const std::string& wallet_type) -> mojom::ExternalWalletPtr { - auto wallet = GetWallet(ledger, wallet_type); + auto wallet = GetWallet(engine, wallet_type); if (wallet) { BLOG(0, wallet_type << " wallet already exists!"); return nullptr; @@ -346,21 +346,21 @@ mojom::ExternalWalletPtr TransitionWallet( return nullptr; } - if (!SetWallet(ledger, wallet->Clone())) { + if (!SetWallet(engine, wallet->Clone())) { BLOG(0, "Failed to set " << wallet->type << " wallet!"); return nullptr; } - OnWalletStatusChange(ledger, wallet->type, from, to); + OnWalletStatusChange(engine, wallet->type, from, to); return wallet; } -mojom::ExternalWalletPtr MaybeCreateWallet(LedgerImpl& ledger, +mojom::ExternalWalletPtr MaybeCreateWallet(RewardsEngineImpl& engine, const std::string& wallet_type) { - auto wallet = GetWallet(ledger, wallet_type); + auto wallet = GetWallet(engine, wallet_type); if (!wallet) { - wallet = TransitionWallet(ledger, wallet_type, + wallet = TransitionWallet(engine, wallet_type, mojom::WalletStatus::kNotConnected); if (!wallet) { BLOG(0, "Failed to create " << wallet_type << " wallet!"); @@ -370,7 +370,7 @@ mojom::ExternalWalletPtr MaybeCreateWallet(LedgerImpl& ledger, return wallet; } -bool LogOutWallet(LedgerImpl& ledger, +bool LogOutWallet(RewardsEngineImpl& engine, const std::string& wallet_type, const std::string& notification) { DCHECK(!wallet_type.empty()); @@ -378,24 +378,24 @@ bool LogOutWallet(LedgerImpl& ledger, BLOG(1, "Logging out " << wallet_type << " wallet..."); auto wallet = - GetWalletIf(ledger, wallet_type, {mojom::WalletStatus::kConnected}); + GetWalletIf(engine, wallet_type, {mojom::WalletStatus::kConnected}); if (!wallet) { return false; } const std::string abbreviated_address = wallet->address.substr(0, 5); - wallet = TransitionWallet(ledger, std::move(wallet), + wallet = TransitionWallet(engine, std::move(wallet), mojom::WalletStatus::kLoggedOut); if (!wallet) { return false; } - ledger.database()->SaveEventLog(log::kWalletDisconnected, + engine.database()->SaveEventLog(log::kWalletDisconnected, wallet_type + abbreviated_address); - if (!ledger.IsShuttingDown()) { - ledger.client()->ExternalWalletLoggedOut(); - ledger.client()->ShowNotification(notification.empty() + if (!engine.IsShuttingDown()) { + engine.client()->ExternalWalletLoggedOut(); + engine.client()->ShowNotification(notification.empty() ? notifications::kWalletDisconnected : notification, {}, base::DoNothing()); @@ -419,18 +419,18 @@ mojom::ExternalWalletPtr GenerateLinks(mojom::ExternalWalletPtr wallet) { } } -void FetchBalance(LedgerImpl& ledger, +void FetchBalance(RewardsEngineImpl& engine, const std::string& wallet_type, base::OnceCallback callback) { if (wallet_type == constant::kWalletBitflyer) { - ledger.bitflyer()->FetchBalance(std::move(callback)); + engine.bitflyer()->FetchBalance(std::move(callback)); } else if (wallet_type == constant::kWalletGemini) { - ledger.gemini()->FetchBalance(std::move(callback)); + engine.gemini()->FetchBalance(std::move(callback)); } else if (wallet_type == constant::kWalletUphold) { - ledger.uphold()->FetchBalance(std::move(callback)); + engine.uphold()->FetchBalance(std::move(callback)); } else { NOTREACHED() << "Unexpected wallet type " << wallet_type << '!'; - std::move(callback).Run(mojom::Result::LEDGER_ERROR, 0.0); + std::move(callback).Run(mojom::Result::FAILED, 0.0); } } diff --git a/components/brave_rewards/core/wallet/wallet_util.h b/components/brave_rewards/core/wallet/wallet_util.h index e3e46028a72..72470140698 100644 --- a/components/brave_rewards/core/wallet/wallet_util.h +++ b/components/brave_rewards/core/wallet/wallet_util.h @@ -9,39 +9,39 @@ #include #include -#include "brave/components/brave_rewards/common/mojom/ledger.mojom.h" -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom.h" #include "third_party/abseil-cpp/absl/types/variant.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace wallet { -mojom::ExternalWalletPtr GetWallet(LedgerImpl& ledger, +mojom::ExternalWalletPtr GetWallet(RewardsEngineImpl& engine, const std::string& wallet_type); -mojom::ExternalWalletPtr GetWalletIf(LedgerImpl& ledger, +mojom::ExternalWalletPtr GetWalletIf(RewardsEngineImpl& engine, const std::string& wallet_type, const std::set&); -bool SetWallet(LedgerImpl& ledger, mojom::ExternalWalletPtr); +bool SetWallet(RewardsEngineImpl& engine, mojom::ExternalWalletPtr); mojom::ExternalWalletPtr TransitionWallet( - LedgerImpl& ledger, + RewardsEngineImpl& engine, absl::variant wallet_info, mojom::WalletStatus to); -mojom::ExternalWalletPtr MaybeCreateWallet(LedgerImpl& ledger, +mojom::ExternalWalletPtr MaybeCreateWallet(RewardsEngineImpl& engine, const std::string& wallet_type); -bool LogOutWallet(LedgerImpl& ledger, +bool LogOutWallet(RewardsEngineImpl& engine, const std::string& wallet_type, const std::string& notification = ""); mojom::ExternalWalletPtr GenerateLinks(mojom::ExternalWalletPtr); -void FetchBalance(LedgerImpl& ledger, +void FetchBalance(RewardsEngineImpl& engine, const std::string& wallet_type, base::OnceCallback callback); diff --git a/components/brave_rewards/core/wallet/wallet_utils_unittest.cc b/components/brave_rewards/core/wallet/wallet_utils_unittest.cc index dfd52ffce9c..cbacc01c20e 100644 --- a/components/brave_rewards/core/wallet/wallet_utils_unittest.cc +++ b/components/brave_rewards/core/wallet/wallet_utils_unittest.cc @@ -7,10 +7,10 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" #include "brave/components/brave_rewards/core/mojom_structs.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" -#include "brave/components/brave_rewards/core/test/test_ledger_client.h" +#include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -70,13 +70,13 @@ class TransitionWalletCreate public WithParamInterface { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(TransitionWalletCreate, Paths) { const auto& [ignore, to, wallet_already_exists, expected] = GetParam(); - EXPECT_CALL(*mock_ledger_impl_.mock_client(), + EXPECT_CALL(*mock_engine_impl_.mock_client(), GetStringState(state::kWalletUphold, _)) .Times(1) .WillOnce([&](const std::string&, auto callback) { @@ -85,13 +85,13 @@ TEST_P(TransitionWalletCreate, Paths) { : ""); }); - ON_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + ON_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .WillByDefault([](mojom::DBTransactionPtr transaction, auto callback) { std::move(callback).Run(db_error_response->Clone()); }); const auto wallet = - TransitionWallet(mock_ledger_impl_, constant::kWalletUphold, to); + TransitionWallet(mock_engine_impl_, constant::kWalletUphold, to); EXPECT_EQ(static_cast(wallet), expected); if (wallet) { @@ -158,19 +158,19 @@ class TransitionWalletTransition public WithParamInterface { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(TransitionWalletTransition, Paths) { const auto& [ignore, from_wallet, to, expected] = GetParam(); - ON_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + ON_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .WillByDefault([](mojom::DBTransactionPtr transaction, auto callback) { std::move(callback).Run(db_error_response->Clone()); }); const auto to_wallet = - TransitionWallet(mock_ledger_impl_, std::move(*from_wallet), to); + TransitionWallet(mock_engine_impl_, std::move(*from_wallet), to); EXPECT_EQ(static_cast(to_wallet), expected); if (to_wallet) { diff --git a/components/brave_rewards/core/wallet_provider/bitflyer/bitflyer_transfer.cc b/components/brave_rewards/core/wallet_provider/bitflyer/bitflyer_transfer.cc index 976d2fa58a7..0626234ce1c 100644 --- a/components/brave_rewards/core/wallet_provider/bitflyer/bitflyer_transfer.cc +++ b/components/brave_rewards/core/wallet_provider/bitflyer/bitflyer_transfer.cc @@ -11,7 +11,7 @@ #include "brave/components/brave_rewards/core/bitflyer/bitflyer_util.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { @@ -24,22 +24,22 @@ void BitFlyerTransfer::CommitTransaction( ResultCallback callback, mojom::ExternalTransactionPtr transaction) const { if (!transaction) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + return std::move(callback).Run(mojom::Result::FAILED); } DCHECK(!transaction->transaction_id.empty()); const auto wallet = - ledger_->bitflyer()->GetWalletIf({mojom::WalletStatus::kConnected}); + engine_->bitflyer()->GetWalletIf({mojom::WalletStatus::kConnected}); if (!wallet) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + return std::move(callback).Run(mojom::Result::FAILED); } auto on_commit_transaction = base::BindOnce(&BitFlyerTransfer::OnCommitTransaction, base::Unretained(this), std::move(callback)); - RequestFor(*ledger_, std::move(wallet->token), + RequestFor(*engine_, std::move(wallet->token), std::move(wallet->address), std::move(transaction)) .Send(std::move(on_commit_transaction)); @@ -48,23 +48,23 @@ void BitFlyerTransfer::CommitTransaction( void BitFlyerTransfer::OnCommitTransaction( ResultCallback callback, PostCommitTransactionBitFlyer::Result&& result) const { - if (!ledger_->bitflyer()->GetWalletIf({mojom::WalletStatus::kConnected})) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + if (!engine_->bitflyer()->GetWalletIf({mojom::WalletStatus::kConnected})) { + return std::move(callback).Run(mojom::Result::FAILED); } if (!result.has_value()) { if (result.error() == PostCommitTransactionBitFlyer::Error::kAccessTokenExpired) { - if (!ledger_->bitflyer()->LogOutWallet()) { + if (!engine_->bitflyer()->LogOutWallet()) { BLOG(0, "Failed to disconnect " << constant::kWalletBitflyer << " wallet!"); } } - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + return std::move(callback).Run(mojom::Result::FAILED); } - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); } } // namespace bitflyer diff --git a/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.cc b/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.cc index a05310b4eea..a3f2a7a2c19 100644 --- a/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.cc +++ b/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.cc @@ -16,8 +16,8 @@ #include "brave/components/brave_rewards/core/endpoints/post_connect/bitflyer/post_connect_bitflyer.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "crypto/sha2.h" @@ -29,8 +29,8 @@ using wallet_provider::ConnectExternalWallet; namespace bitflyer { -ConnectBitFlyerWallet::ConnectBitFlyerWallet(LedgerImpl& ledger) - : ConnectExternalWallet(ledger), bitflyer_server_(ledger) {} +ConnectBitFlyerWallet::ConnectBitFlyerWallet(RewardsEngineImpl& engine) + : ConnectExternalWallet(engine), bitflyer_server_(engine) {} ConnectBitFlyerWallet::~ConnectBitFlyerWallet() = default; @@ -43,7 +43,7 @@ void ConnectBitFlyerWallet::Authorize(OAuthInfo&& oauth_info, DCHECK(!oauth_info.code.empty()); DCHECK(!oauth_info.code_verifier.empty()); - const auto rewards_wallet = ledger_->wallet()->GetWallet(); + const auto rewards_wallet = engine_->wallet()->GetWallet(); if (!rewards_wallet) { BLOG(0, "Rewards wallet is null!"); return std::move(callback).Run( @@ -67,13 +67,13 @@ void ConnectBitFlyerWallet::OnAuthorize(ConnectExternalWalletCallback callback, std::string&& token, std::string&& address, std::string&& linking_info) const { - if (!ledger_->bitflyer()->GetWalletIf({mojom::WalletStatus::kNotConnected, + if (!engine_->bitflyer()->GetWalletIf({mojom::WalletStatus::kNotConnected, mojom::WalletStatus::kLoggedOut})) { return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Couldn't get token"); return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); @@ -101,7 +101,7 @@ void ConnectBitFlyerWallet::OnAuthorize(ConnectExternalWalletCallback callback, base::BindOnce(&ConnectBitFlyerWallet::OnConnect, base::Unretained(this), std::move(callback), std::move(token), std::move(address)); - RequestFor(*ledger_, std::move(linking_info)) + RequestFor(*engine_, std::move(linking_info)) .Send(std::move(on_connect)); } diff --git a/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.h b/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.h index 9ef8eb3331b..e68fcf54215 100644 --- a/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.h +++ b/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.h @@ -10,17 +10,17 @@ #include "base/containers/flat_map.h" #include "brave/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/wallet_provider/connect_external_wallet.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace bitflyer { class ConnectBitFlyerWallet : public wallet_provider::ConnectExternalWallet { public: - explicit ConnectBitFlyerWallet(LedgerImpl& ledger); + explicit ConnectBitFlyerWallet(RewardsEngineImpl& engine); ~ConnectBitFlyerWallet() override; diff --git a/components/brave_rewards/core/wallet_provider/bitflyer/get_bitflyer_wallet.cc b/components/brave_rewards/core/wallet_provider/bitflyer/get_bitflyer_wallet.cc index 0404e9d1710..f185e701af4 100644 --- a/components/brave_rewards/core/wallet_provider/bitflyer/get_bitflyer_wallet.cc +++ b/components/brave_rewards/core/wallet_provider/bitflyer/get_bitflyer_wallet.cc @@ -9,8 +9,8 @@ namespace brave_rewards::internal::bitflyer { -GetBitFlyerWallet::GetBitFlyerWallet(LedgerImpl& ledger) - : wallet_provider::GetExternalWallet(ledger) {} +GetBitFlyerWallet::GetBitFlyerWallet(RewardsEngineImpl& engine) + : wallet_provider::GetExternalWallet(engine) {} GetBitFlyerWallet::~GetBitFlyerWallet() = default; diff --git a/components/brave_rewards/core/wallet_provider/bitflyer/get_bitflyer_wallet.h b/components/brave_rewards/core/wallet_provider/bitflyer/get_bitflyer_wallet.h index 5d6127b3fa1..d9fa4ca6370 100644 --- a/components/brave_rewards/core/wallet_provider/bitflyer/get_bitflyer_wallet.h +++ b/components/brave_rewards/core/wallet_provider/bitflyer/get_bitflyer_wallet.h @@ -9,13 +9,13 @@ #include "brave/components/brave_rewards/core/wallet_provider/get_external_wallet.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace bitflyer { class GetBitFlyerWallet : public wallet_provider::GetExternalWallet { public: - explicit GetBitFlyerWallet(LedgerImpl& ledger); + explicit GetBitFlyerWallet(RewardsEngineImpl& engine); ~GetBitFlyerWallet() override; diff --git a/components/brave_rewards/core/wallet_provider/connect_external_wallet.cc b/components/brave_rewards/core/wallet_provider/connect_external_wallet.cc index 6b1fc044908..03c2dd6218c 100644 --- a/components/brave_rewards/core/wallet_provider/connect_external_wallet.cc +++ b/components/brave_rewards/core/wallet_provider/connect_external_wallet.cc @@ -10,9 +10,9 @@ #include "base/containers/contains.h" #include "brave/components/brave_rewards/core/common/random_util.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" #include "brave/components/brave_rewards/core/logging/event_log_util.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" namespace brave_rewards::internal { @@ -22,8 +22,8 @@ using wallet::GetWalletIf; namespace wallet_provider { -ConnectExternalWallet::ConnectExternalWallet(LedgerImpl& ledger) - : ledger_(ledger) {} +ConnectExternalWallet::ConnectExternalWallet(RewardsEngineImpl& engine) + : engine_(engine) {} ConnectExternalWallet::~ConnectExternalWallet() = default; @@ -31,7 +31,7 @@ void ConnectExternalWallet::Run( const base::flat_map& query_parameters, ConnectExternalWalletCallback callback) { auto wallet = GetWalletIf( - *ledger_, WalletType(), + *engine_, WalletType(), {mojom::WalletStatus::kNotConnected, mojom::WalletStatus::kLoggedOut}); if (!wallet) { return std::move(callback).Run( @@ -76,7 +76,7 @@ ConnectExternalWallet::ExchangeOAuthInfo( return absl::nullopt; } - if (!wallet::SetWallet(*ledger_, std::move(wallet))) { + if (!wallet::SetWallet(*engine_, std::move(wallet))) { BLOG(0, "Failed to save " << WalletType() << " wallet!"); return absl::nullopt; } @@ -92,10 +92,10 @@ ConnectExternalWallet::GetCode( const std::string message = query_parameters.at("error_description"); BLOG(1, message); if (base::Contains(message, "User does not meet minimum requirements")) { - ledger_->database()->SaveEventLog(log::kKYCRequired, WalletType()); + engine_->database()->SaveEventLog(log::kKYCRequired, WalletType()); return base::unexpected(mojom::ConnectExternalWalletError::kKYCRequired); } else if (base::Contains(message, "not available for user geolocation")) { - ledger_->database()->SaveEventLog(log::kRegionNotSupported, WalletType()); + engine_->database()->SaveEventLog(log::kRegionNotSupported, WalletType()); return base::unexpected( mojom::ConnectExternalWalletError::kRegionNotSupported); } @@ -123,7 +123,7 @@ void ConnectExternalWallet::OnConnect( std::string&& address, endpoints::PostConnect::Result&& result) const { auto wallet = GetWalletIf( - *ledger_, WalletType(), + *engine_, WalletType(), {mojom::WalletStatus::kNotConnected, mojom::WalletStatus::kLoggedOut}); if (!wallet) { return std::move(callback).Run( @@ -142,7 +142,7 @@ void ConnectExternalWallet::OnConnect( if (const auto key = log::GetEventLogKeyForLinkingResult( connect_external_wallet_result.error()); !key.empty()) { - ledger_->database()->SaveEventLog( + engine_->database()->SaveEventLog( key, WalletType() + std::string("/") + abbreviated_address); } @@ -153,7 +153,7 @@ void ConnectExternalWallet::OnConnect( wallet->token = std::move(token); wallet->address = std::move(address); // {kNotConnected, kLoggedOut} ==> kConnected - if (!wallet::TransitionWallet(*ledger_, std::move(wallet), + if (!wallet::TransitionWallet(*engine_, std::move(wallet), mojom::WalletStatus::kConnected)) { BLOG(0, "Failed to transition " << WalletType() << " wallet state!"); return std::move(callback).Run( @@ -161,9 +161,9 @@ void ConnectExternalWallet::OnConnect( } from_status == mojom::WalletStatus::kNotConnected - ? ledger_->client()->ExternalWalletConnected() - : ledger_->client()->ExternalWalletReconnected(); - ledger_->database()->SaveEventLog( + ? engine_->client()->ExternalWalletConnected() + : engine_->client()->ExternalWalletReconnected(); + engine_->database()->SaveEventLog( log::kWalletVerified, WalletType() + std::string("/") + abbreviated_address); std::move(callback).Run({}); diff --git a/components/brave_rewards/core/wallet_provider/connect_external_wallet.h b/components/brave_rewards/core/wallet_provider/connect_external_wallet.h index 2e9c2f39bf7..6a7ebb22795 100644 --- a/components/brave_rewards/core/wallet_provider/connect_external_wallet.h +++ b/components/brave_rewards/core/wallet_provider/connect_external_wallet.h @@ -12,16 +12,16 @@ #include "base/memory/raw_ref.h" #include "base/types/expected.h" #include "brave/components/brave_rewards/core/endpoints/post_connect/post_connect.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace wallet_provider { class ConnectExternalWallet { public: - explicit ConnectExternalWallet(LedgerImpl& ledger); + explicit ConnectExternalWallet(RewardsEngineImpl& engine); virtual ~ConnectExternalWallet(); @@ -42,7 +42,7 @@ class ConnectExternalWallet { std::string&& address, endpoints::PostConnect::Result&&) const; - const raw_ref ledger_; + const raw_ref engine_; private: absl::optional ExchangeOAuthInfo(mojom::ExternalWalletPtr) const; diff --git a/components/brave_rewards/core/wallet_provider/connect_external_wallet_unittest.cc b/components/brave_rewards/core/wallet_provider/connect_external_wallet_unittest.cc index 9c1a195291f..c99710edb6c 100644 --- a/components/brave_rewards/core/wallet_provider/connect_external_wallet_unittest.cc +++ b/components/brave_rewards/core/wallet_provider/connect_external_wallet_unittest.cc @@ -11,9 +11,9 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/database/database_mock.h" #include "brave/components/brave_rewards/core/endpoints/post_connect/post_connect.h" -#include "brave/components/brave_rewards/core/ledger_client_mock.h" -#include "brave/components/brave_rewards/core/ledger_impl_mock.h" -#include "brave/components/brave_rewards/core/test/test_ledger_client.h" +#include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" #include "brave/components/brave_rewards/core/wallet_provider/connect_external_wallet.h" #include "testing/gtest/include/gtest/gtest.h" @@ -29,8 +29,9 @@ using Result = endpoints::PostConnect::Result; class ConnectTestWallet : public wallet_provider::ConnectExternalWallet { public: - explicit ConnectTestWallet(LedgerImpl& ledger, Result post_connect_result) - : ConnectExternalWallet(ledger), + explicit ConnectTestWallet(RewardsEngineImpl& engine, + Result post_connect_result) + : ConnectExternalWallet(engine), post_connect_result_(post_connect_result) {} ~ConnectTestWallet() override = default; @@ -61,7 +62,7 @@ class ConnectExternalWalletTest : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockLedgerImpl mock_ledger_impl_; + MockRewardsEngineImpl mock_engine_impl_; }; TEST_P(ConnectExternalWalletTest, Paths) { @@ -73,12 +74,12 @@ TEST_P(ConnectExternalWalletTest, Paths) { "status": )" + std::to_string(static_cast(wallet_status)) + "}"); - ON_CALL(*mock_ledger_impl_.mock_client(), GetStringState("wallets.test", _)) + ON_CALL(*mock_engine_impl_.mock_client(), GetStringState("wallets.test", _)) .WillByDefault([&](const std::string&, auto callback) { std::move(callback).Run(test_wallet); }); - ON_CALL(*mock_ledger_impl_.mock_client(), RunDBTransaction(_, _)) + ON_CALL(*mock_engine_impl_.mock_client(), RunDBTransaction(_, _)) .WillByDefault([](mojom::DBTransactionPtr transaction, auto callback) { std::move(callback).Run(db_error_response->Clone()); }); @@ -86,7 +87,7 @@ TEST_P(ConnectExternalWalletTest, Paths) { base::MockCallback callback; EXPECT_CALL(callback, Run(expected_result)).Times(1); - ConnectTestWallet(mock_ledger_impl_, post_connect_result) + ConnectTestWallet(mock_engine_impl_, post_connect_result) .Run(query_parameters, callback.Get()); task_environment_.RunUntilIdle(); diff --git a/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.cc b/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.cc index 1c6c1e86748..57ff26d52b8 100644 --- a/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.cc +++ b/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.cc @@ -16,8 +16,8 @@ #include "brave/components/brave_rewards/core/gemini/gemini.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "crypto/sha2.h" @@ -30,8 +30,8 @@ using wallet_provider::ConnectExternalWallet; namespace gemini { -ConnectGeminiWallet::ConnectGeminiWallet(LedgerImpl& ledger) - : ConnectExternalWallet(ledger), gemini_server_(ledger) {} +ConnectGeminiWallet::ConnectGeminiWallet(RewardsEngineImpl& engine) + : ConnectExternalWallet(engine), gemini_server_(engine) {} ConnectGeminiWallet::~ConnectGeminiWallet() = default; @@ -43,7 +43,7 @@ void ConnectGeminiWallet::Authorize(OAuthInfo&& oauth_info, ConnectExternalWalletCallback callback) { DCHECK(!oauth_info.code.empty()); - const auto rewards_wallet = ledger_->wallet()->GetWallet(); + const auto rewards_wallet = engine_->wallet()->GetWallet(); if (!rewards_wallet) { BLOG(0, "Rewards wallet is null!"); return std::move(callback).Run( @@ -64,13 +64,13 @@ void ConnectGeminiWallet::Authorize(OAuthInfo&& oauth_info, void ConnectGeminiWallet::OnAuthorize(ConnectExternalWalletCallback callback, mojom::Result result, std::string&& token) { - if (!ledger_->gemini()->GetWalletIf({mojom::WalletStatus::kNotConnected, + if (!engine_->gemini()->GetWalletIf({mojom::WalletStatus::kNotConnected, mojom::WalletStatus::kLoggedOut})) { return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Couldn't get token"); return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); @@ -86,7 +86,7 @@ void ConnectGeminiWallet::OnAuthorize(ConnectExternalWalletCallback callback, base::BindOnce(&ConnectGeminiWallet::OnGetRecipientID, base::Unretained(this), std::move(callback), token); - RequestFor(*ledger_, std::move(token)) + RequestFor(*engine_, std::move(token)) .Send(std::move(on_get_recipient_id)); } @@ -94,7 +94,7 @@ void ConnectGeminiWallet::OnGetRecipientID( ConnectExternalWalletCallback callback, std::string&& token, endpoints::GetRecipientIDGemini::Result&& result) { - if (!ledger_->gemini()->GetWalletIf({mojom::WalletStatus::kNotConnected, + if (!engine_->gemini()->GetWalletIf({mojom::WalletStatus::kNotConnected, mojom::WalletStatus::kLoggedOut})) { return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); @@ -124,7 +124,7 @@ void ConnectGeminiWallet::OnPostRecipientID( std::string&& token, mojom::Result result, std::string&& recipient_id) { - if (!ledger_->gemini()->GetWalletIf({mojom::WalletStatus::kNotConnected, + if (!engine_->gemini()->GetWalletIf({mojom::WalletStatus::kNotConnected, mojom::WalletStatus::kLoggedOut})) { return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); @@ -138,13 +138,13 @@ void ConnectGeminiWallet::OnPostRecipientID( if (result == mojom::Result::NOT_FOUND) { BLOG(0, "Unverified User"); - ledger_->database()->SaveEventLog(log::kKYCRequired, + engine_->database()->SaveEventLog(log::kKYCRequired, constant::kWalletGemini); return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kKYCRequired)); } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to create recipient ID!"); return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); @@ -168,7 +168,7 @@ void ConnectGeminiWallet::OnPostAccount(ConnectExternalWalletCallback callback, mojom::Result result, std::string&& linking_info, std::string&& user_name) { - auto wallet = ledger_->gemini()->GetWalletIf( + auto wallet = engine_->gemini()->GetWalletIf( {mojom::WalletStatus::kNotConnected, mojom::WalletStatus::kLoggedOut}); if (!wallet) { return std::move(callback).Run( @@ -181,14 +181,14 @@ void ConnectGeminiWallet::OnPostAccount(ConnectExternalWalletCallback callback, base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to get account info!"); return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); } wallet->user_name = std::move(user_name); - if (!ledger_->gemini()->SetWallet(std::move(wallet))) { + if (!engine_->gemini()->SetWallet(std::move(wallet))) { BLOG(0, "Failed to save " << constant::kWalletGemini << " wallet!"); return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); @@ -198,7 +198,7 @@ void ConnectGeminiWallet::OnPostAccount(ConnectExternalWalletCallback callback, base::BindOnce(&ConnectGeminiWallet::OnConnect, base::Unretained(this), std::move(callback), std::move(token), recipient_id); - RequestFor(*ledger_, std::move(linking_info), + RequestFor(*engine_, std::move(linking_info), std::move(recipient_id)) .Send(std::move(on_connect)); } diff --git a/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.h b/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.h index 3d6fc1112d0..c005a48e643 100644 --- a/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.h +++ b/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.h @@ -11,17 +11,17 @@ #include "base/containers/flat_map.h" #include "brave/components/brave_rewards/core/endpoint/gemini/gemini_server.h" #include "brave/components/brave_rewards/core/endpoints/gemini/get_recipient_id/get_recipient_id_gemini.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/wallet_provider/connect_external_wallet.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace gemini { class ConnectGeminiWallet : public wallet_provider::ConnectExternalWallet { public: - explicit ConnectGeminiWallet(LedgerImpl& ledger); + explicit ConnectGeminiWallet(RewardsEngineImpl& engine); ~ConnectGeminiWallet() override; diff --git a/components/brave_rewards/core/wallet_provider/gemini/gemini_transfer.cc b/components/brave_rewards/core/wallet_provider/gemini/gemini_transfer.cc index 8dcca2efdfd..7e7c4f38d18 100644 --- a/components/brave_rewards/core/wallet_provider/gemini/gemini_transfer.cc +++ b/components/brave_rewards/core/wallet_provider/gemini/gemini_transfer.cc @@ -11,7 +11,7 @@ #include "brave/components/brave_rewards/core/gemini/gemini.h" #include "brave/components/brave_rewards/core/gemini/gemini_util.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { @@ -24,22 +24,22 @@ void GeminiTransfer::CommitTransaction( ResultCallback callback, mojom::ExternalTransactionPtr transaction) const { if (!transaction) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + return std::move(callback).Run(mojom::Result::FAILED); } DCHECK(!transaction->transaction_id.empty()); const auto wallet = - ledger_->gemini()->GetWalletIf({mojom::WalletStatus::kConnected}); + engine_->gemini()->GetWalletIf({mojom::WalletStatus::kConnected}); if (!wallet) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + return std::move(callback).Run(mojom::Result::FAILED); } auto on_commit_transaction = base::BindOnce(&GeminiTransfer::OnCommitTransaction, base::Unretained(this), std::move(callback)); - RequestFor(*ledger_, std::move(wallet->token), + RequestFor(*engine_, std::move(wallet->token), std::move(wallet->address), std::move(transaction)) .Send(std::move(on_commit_transaction)); @@ -48,8 +48,8 @@ void GeminiTransfer::CommitTransaction( void GeminiTransfer::OnCommitTransaction( ResultCallback callback, endpoints::PostCommitTransactionGemini::Result&& result) const { - if (!ledger_->gemini()->GetWalletIf({mojom::WalletStatus::kConnected})) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + if (!engine_->gemini()->GetWalletIf({mojom::WalletStatus::kConnected})) { + return std::move(callback).Run(mojom::Result::FAILED); } if (!result.has_value()) { @@ -58,17 +58,17 @@ void GeminiTransfer::OnCommitTransaction( return std::move(callback).Run( mojom::Result::RETRY_PENDING_TRANSACTION_LONG); case PostCommitTransactionGemini::Error::kAccessTokenExpired: - if (!ledger_->gemini()->LogOutWallet()) { + if (!engine_->gemini()->LogOutWallet()) { BLOG(0, "Failed to disconnect " << constant::kWalletGemini << " wallet!"); } ABSL_FALLTHROUGH_INTENDED; default: - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + return std::move(callback).Run(mojom::Result::FAILED); } } - std::move(callback).Run(mojom::Result::LEDGER_OK); + std::move(callback).Run(mojom::Result::OK); } } // namespace gemini diff --git a/components/brave_rewards/core/wallet_provider/gemini/get_gemini_wallet.cc b/components/brave_rewards/core/wallet_provider/gemini/get_gemini_wallet.cc index 09805238027..ae781d83d91 100644 --- a/components/brave_rewards/core/wallet_provider/gemini/get_gemini_wallet.cc +++ b/components/brave_rewards/core/wallet_provider/gemini/get_gemini_wallet.cc @@ -9,8 +9,8 @@ namespace brave_rewards::internal::gemini { -GetGeminiWallet::GetGeminiWallet(LedgerImpl& ledger) - : wallet_provider::GetExternalWallet(ledger) {} +GetGeminiWallet::GetGeminiWallet(RewardsEngineImpl& engine) + : wallet_provider::GetExternalWallet(engine) {} GetGeminiWallet::~GetGeminiWallet() = default; diff --git a/components/brave_rewards/core/wallet_provider/gemini/get_gemini_wallet.h b/components/brave_rewards/core/wallet_provider/gemini/get_gemini_wallet.h index 829297397c9..1ee59db1af7 100644 --- a/components/brave_rewards/core/wallet_provider/gemini/get_gemini_wallet.h +++ b/components/brave_rewards/core/wallet_provider/gemini/get_gemini_wallet.h @@ -9,13 +9,13 @@ #include "brave/components/brave_rewards/core/wallet_provider/get_external_wallet.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace gemini { class GetGeminiWallet : public wallet_provider::GetExternalWallet { public: - explicit GetGeminiWallet(LedgerImpl& ledger); + explicit GetGeminiWallet(RewardsEngineImpl& engine); ~GetGeminiWallet() override; diff --git a/components/brave_rewards/core/wallet_provider/get_external_wallet.cc b/components/brave_rewards/core/wallet_provider/get_external_wallet.cc index e5715e8b31d..8913d9810df 100644 --- a/components/brave_rewards/core/wallet_provider/get_external_wallet.cc +++ b/components/brave_rewards/core/wallet_provider/get_external_wallet.cc @@ -7,18 +7,19 @@ #include -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/promotion/promotion.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" namespace brave_rewards::internal::wallet_provider { -GetExternalWallet::GetExternalWallet(LedgerImpl& ledger) : ledger_(ledger) {} +GetExternalWallet::GetExternalWallet(RewardsEngineImpl& engine) + : engine_(engine) {} GetExternalWallet::~GetExternalWallet() = default; void GetExternalWallet::Run(GetExternalWalletCallback callback) const { - auto wallet = wallet::MaybeCreateWallet(*ledger_, WalletType()); + auto wallet = wallet::MaybeCreateWallet(*engine_, WalletType()); if (!wallet) { return std::move(callback).Run( base::unexpected(mojom::GetExternalWalletError::kUnexpected)); @@ -26,7 +27,7 @@ void GetExternalWallet::Run(GetExternalWalletCallback callback) const { if (wallet->status == mojom::WalletStatus::kConnected || wallet->status == mojom::WalletStatus::kLoggedOut) { - return ledger_->promotion()->TransferTokens( + return engine_->promotion()->TransferTokens( base::BindOnce(&GetExternalWallet::OnTransferTokens, base::Unretained(this), std::move(callback))); } @@ -37,11 +38,11 @@ void GetExternalWallet::Run(GetExternalWalletCallback callback) const { void GetExternalWallet::OnTransferTokens(GetExternalWalletCallback callback, mojom::Result result, std::string) const { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to transfer tokens!"); } - auto wallet = wallet::GetWallet(*ledger_, WalletType()); + auto wallet = wallet::GetWallet(*engine_, WalletType()); if (!wallet) { return std::move(callback).Run( base::unexpected(mojom::GetExternalWalletError::kUnexpected)); diff --git a/components/brave_rewards/core/wallet_provider/get_external_wallet.h b/components/brave_rewards/core/wallet_provider/get_external_wallet.h index 14272f9f1ea..ea4ee3d95f3 100644 --- a/components/brave_rewards/core/wallet_provider/get_external_wallet.h +++ b/components/brave_rewards/core/wallet_provider/get_external_wallet.h @@ -9,16 +9,16 @@ #include #include "base/memory/raw_ref.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace wallet_provider { class GetExternalWallet { public: - explicit GetExternalWallet(LedgerImpl& ledger); + explicit GetExternalWallet(RewardsEngineImpl& engine); virtual ~GetExternalWallet(); @@ -31,7 +31,7 @@ class GetExternalWallet { mojom::Result, std::string drain_id) const; - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace wallet_provider diff --git a/components/brave_rewards/core/wallet_provider/transfer.cc b/components/brave_rewards/core/wallet_provider/transfer.cc index 2ff89efc069..04ac8b04207 100644 --- a/components/brave_rewards/core/wallet_provider/transfer.cc +++ b/components/brave_rewards/core/wallet_provider/transfer.cc @@ -10,11 +10,11 @@ #include "base/strings/string_number_conversions.h" #include "base/uuid.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal::wallet_provider { -Transfer::Transfer(LedgerImpl& ledger) : ledger_(ledger) {} +Transfer::Transfer(RewardsEngineImpl& engine) : engine_(engine) {} Transfer::~Transfer() = default; @@ -36,7 +36,7 @@ void Transfer::MaybeCreateTransaction( const std::string& destination, const std::string& amount, MaybeCreateTransactionCallback callback) const { - ledger_->database()->GetExternalTransaction( + engine_->database()->GetExternalTransaction( contribution_id, destination, base::BindOnce(&Transfer::OnGetExternalTransaction, base::Unretained(this), std::move(callback), @@ -85,7 +85,7 @@ void Transfer::SaveExternalTransaction( &Transfer::OnSaveExternalTransaction, base::Unretained(this), std::move(callback), transaction->Clone()); - ledger_->database()->SaveExternalTransaction( + engine_->database()->SaveExternalTransaction( std::move(transaction), std::move(on_save_external_transaction)); } @@ -93,7 +93,7 @@ void Transfer::OnSaveExternalTransaction( MaybeCreateTransactionCallback callback, mojom::ExternalTransactionPtr transaction, mojom::Result result) const { - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Failed to save external transaction!"); return std::move(callback).Run(nullptr); } diff --git a/components/brave_rewards/core/wallet_provider/transfer.h b/components/brave_rewards/core/wallet_provider/transfer.h index 3fd935e8e88..65038d023a5 100644 --- a/components/brave_rewards/core/wallet_provider/transfer.h +++ b/components/brave_rewards/core/wallet_provider/transfer.h @@ -11,16 +11,16 @@ #include "base/memory/raw_ref.h" #include "base/types/expected.h" #include "brave/components/brave_rewards/core/database/database_external_transactions.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace wallet_provider { class Transfer { public: - explicit Transfer(LedgerImpl& ledger); + explicit Transfer(RewardsEngineImpl& engine); virtual ~Transfer(); @@ -61,7 +61,7 @@ class Transfer { virtual void CommitTransaction(ResultCallback, mojom::ExternalTransactionPtr) const = 0; - const raw_ref ledger_; + const raw_ref engine_; }; } // namespace wallet_provider diff --git a/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.cc b/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.cc index 423c579857f..b2861963d5e 100644 --- a/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.cc +++ b/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.cc @@ -12,9 +12,9 @@ #include "brave/components/brave_rewards/core/endpoints/post_connect/uphold/post_connect_uphold.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" #include "brave/components/brave_rewards/core/notifications/notification_keys.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/uphold/uphold.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" @@ -27,8 +27,8 @@ using wallet_provider::ConnectExternalWallet; namespace uphold { -ConnectUpholdWallet::ConnectUpholdWallet(LedgerImpl& ledger) - : ConnectExternalWallet(ledger) { +ConnectUpholdWallet::ConnectUpholdWallet(RewardsEngineImpl& engine) + : ConnectExternalWallet(engine) { eligibility_checker_.Start(FROM_HERE, base::Minutes(is_testing ? 3 : 15), this, &ConnectUpholdWallet::CheckEligibility); } @@ -43,14 +43,14 @@ void ConnectUpholdWallet::Authorize(OAuthInfo&& oauth_info, ConnectExternalWalletCallback callback) { DCHECK(!oauth_info.code.empty()); - RequestFor(*ledger_, std::move(oauth_info.code)) + RequestFor(*engine_, std::move(oauth_info.code)) .Send(base::BindOnce(&ConnectUpholdWallet::OnAuthorize, base::Unretained(this), std::move(callback))); } void ConnectUpholdWallet::OnAuthorize(ConnectExternalWalletCallback callback, PostOAuthUphold::Result&& result) { - if (!ledger_->uphold()->GetWalletIf({mojom::WalletStatus::kNotConnected, + if (!engine_->uphold()->GetWalletIf({mojom::WalletStatus::kNotConnected, mojom::WalletStatus::kLoggedOut})) { return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); @@ -64,7 +64,7 @@ void ConnectUpholdWallet::OnAuthorize(ConnectExternalWalletCallback callback, const std::string access_token = std::move(result.value()); - ledger_->uphold()->GetUser( + engine_->uphold()->GetUser( access_token, // NOLINTNEXTLINE base::BindOnce( @@ -78,7 +78,7 @@ void ConnectUpholdWallet::OnGetUser(ConnectExternalWalletCallback callback, const std::string& access_token, mojom::Result result, const User& user) const { - auto wallet = ledger_->uphold()->GetWalletIf( + auto wallet = engine_->uphold()->GetWalletIf( {mojom::WalletStatus::kNotConnected, mojom::WalletStatus::kLoggedOut}); if (!wallet) { return std::move(callback).Run( @@ -91,7 +91,7 @@ void ConnectUpholdWallet::OnGetUser(ConnectExternalWalletCallback callback, base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { BLOG(0, "Couldn't get user object from " << constant::kWalletUphold << '!'); return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); @@ -106,13 +106,13 @@ void ConnectUpholdWallet::OnGetUser(ConnectExternalWalletCallback callback, wallet->user_name = user.name; wallet->member_id = user.member_id; - if (!ledger_->uphold()->SetWallet(std::move(wallet))) { + if (!engine_->uphold()->SetWallet(std::move(wallet))) { BLOG(0, "Failed to save " << constant::kWalletUphold << " wallet!"); return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); } - ledger_->uphold()->GetCapabilities( + engine_->uphold()->GetCapabilities( access_token, base::BindOnce( // NOLINTNEXTLINE @@ -128,7 +128,7 @@ void ConnectUpholdWallet::OnGetCapabilities( const std::string& access_token, mojom::Result result, Capabilities capabilities) const { - auto wallet = ledger_->uphold()->GetWalletIf( + auto wallet = engine_->uphold()->GetWalletIf( {mojom::WalletStatus::kNotConnected, mojom::WalletStatus::kLoggedOut}); if (!wallet) { return std::move(callback).Run( @@ -141,7 +141,7 @@ void ConnectUpholdWallet::OnGetCapabilities( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); } - if (result != mojom::Result::LEDGER_OK || !capabilities.can_receive || + if (result != mojom::Result::OK || !capabilities.can_receive || !capabilities.can_send) { BLOG(0, "Couldn't get capabilities from " << constant::kWalletUphold << '!'); @@ -157,7 +157,7 @@ void ConnectUpholdWallet::OnGetCapabilities( mojom::ConnectExternalWalletError::kUpholdInsufficientCapabilities)); } - ledger_->uphold()->CreateCard( + engine_->uphold()->CreateCard( access_token, base::BindOnce(&ConnectUpholdWallet::OnCreateCard, base::Unretained(this), std::move(callback), access_token)); @@ -167,7 +167,7 @@ void ConnectUpholdWallet::OnCreateCard(ConnectExternalWalletCallback callback, const std::string& access_token, mojom::Result result, std::string&& id) const { - if (!ledger_->uphold()->GetWalletIf({mojom::WalletStatus::kNotConnected, + if (!engine_->uphold()->GetWalletIf({mojom::WalletStatus::kNotConnected, mojom::WalletStatus::kLoggedOut})) { return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); @@ -179,7 +179,7 @@ void ConnectUpholdWallet::OnCreateCard(ConnectExternalWalletCallback callback, base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { return std::move(callback).Run( base::unexpected(mojom::ConnectExternalWalletError::kUnexpected)); } @@ -194,18 +194,18 @@ void ConnectUpholdWallet::OnCreateCard(ConnectExternalWalletCallback callback, base::BindOnce(&ConnectUpholdWallet::OnConnect, base::Unretained(this), std::move(callback), access_token, id); - RequestFor(*ledger_, std::move(id)) + RequestFor(*engine_, std::move(id)) .Send(std::move(on_connect)); } void ConnectUpholdWallet::CheckEligibility() { auto wallet = - ledger_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected}); + engine_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected}); if (!wallet) { return; } - ledger_->uphold()->GetUser( + engine_->uphold()->GetUser( // NOLINTNEXTLINE wallet->token, base::BindOnce(static_cast( @@ -216,7 +216,7 @@ void ConnectUpholdWallet::CheckEligibility() { void ConnectUpholdWallet::OnGetUser(mojom::Result result, const User& user) const { auto wallet = - ledger_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected}); + engine_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected}); if (!wallet) { return; } @@ -224,14 +224,14 @@ void ConnectUpholdWallet::OnGetUser(mojom::Result result, if (result == mojom::Result::EXPIRED_TOKEN) { BLOG(0, "Access token expired!"); // kConnected ==> kLoggedOut - if (!ledger_->uphold()->LogOutWallet()) { + if (!engine_->uphold()->LogOutWallet()) { BLOG(0, "Failed to disconnect " << constant::kWalletUphold << " wallet!"); } return; } - if (result != mojom::Result::LEDGER_OK) { + if (result != mojom::Result::OK) { return BLOG( 0, "Couldn't get user object from " << constant::kWalletUphold << '!'); } @@ -240,14 +240,14 @@ void ConnectUpholdWallet::OnGetUser(mojom::Result result, BLOG(0, "BAT is not allowed for the user!"); // kConnected ==> kLoggedOut - if (!ledger_->uphold()->LogOutWallet(notifications::kUpholdBATNotAllowed)) { + if (!engine_->uphold()->LogOutWallet(notifications::kUpholdBATNotAllowed)) { BLOG(0, "Failed to disconnect " << constant::kWalletUphold << " wallet!"); } return; } - ledger_->uphold()->GetCapabilities( + engine_->uphold()->GetCapabilities( wallet->token, base::BindOnce( // NOLINTNEXTLINE @@ -258,21 +258,21 @@ void ConnectUpholdWallet::OnGetUser(mojom::Result result, void ConnectUpholdWallet::OnGetCapabilities(mojom::Result result, Capabilities capabilities) const { - if (!ledger_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected})) { + if (!engine_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected})) { return; } if (result == mojom::Result::EXPIRED_TOKEN) { BLOG(0, "Access token expired!"); // kConnected ==> kLoggedOut - if (!ledger_->uphold()->LogOutWallet()) { + if (!engine_->uphold()->LogOutWallet()) { BLOG(0, "Failed to disconnect " << constant::kWalletUphold << " wallet!"); } return; } - if (result != mojom::Result::LEDGER_OK || !capabilities.can_receive || + if (result != mojom::Result::OK || !capabilities.can_receive || !capabilities.can_send) { return BLOG( 0, "Couldn't get capabilities from " << constant::kWalletUphold << '!'); @@ -283,7 +283,7 @@ void ConnectUpholdWallet::OnGetCapabilities(mojom::Result result, << " capabilities!"); // kConnected ==> kLoggedOut - if (!ledger_->uphold()->LogOutWallet( + if (!engine_->uphold()->LogOutWallet( notifications::kUpholdInsufficientCapabilities)) { BLOG(0, "Failed to disconnect " << constant::kWalletUphold << " wallet!"); } diff --git a/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.h b/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.h index 81ff489a154..2b3c21a2ad6 100644 --- a/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.h +++ b/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.h @@ -11,7 +11,7 @@ #include "base/containers/flat_map.h" #include "base/timer/timer.h" #include "brave/components/brave_rewards/core/endpoints/uphold/post_oauth/post_oauth_uphold.h" -#include "brave/components/brave_rewards/core/ledger_callbacks.h" +#include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/uphold/uphold_capabilities.h" #include "brave/components/brave_rewards/core/uphold/uphold_user.h" #include "brave/components/brave_rewards/core/wallet_provider/connect_external_wallet.h" @@ -20,7 +20,7 @@ namespace brave_rewards::internal::uphold { class ConnectUpholdWallet : public wallet_provider::ConnectExternalWallet { public: - explicit ConnectUpholdWallet(LedgerImpl& ledger); + explicit ConnectUpholdWallet(RewardsEngineImpl& engine); ~ConnectUpholdWallet() override; diff --git a/components/brave_rewards/core/wallet_provider/uphold/get_uphold_wallet.cc b/components/brave_rewards/core/wallet_provider/uphold/get_uphold_wallet.cc index 4cf968f1647..35c1159c731 100644 --- a/components/brave_rewards/core/wallet_provider/uphold/get_uphold_wallet.cc +++ b/components/brave_rewards/core/wallet_provider/uphold/get_uphold_wallet.cc @@ -9,8 +9,8 @@ namespace brave_rewards::internal::uphold { -GetUpholdWallet::GetUpholdWallet(LedgerImpl& ledger) - : wallet_provider::GetExternalWallet(ledger) {} +GetUpholdWallet::GetUpholdWallet(RewardsEngineImpl& engine) + : wallet_provider::GetExternalWallet(engine) {} GetUpholdWallet::~GetUpholdWallet() = default; diff --git a/components/brave_rewards/core/wallet_provider/uphold/get_uphold_wallet.h b/components/brave_rewards/core/wallet_provider/uphold/get_uphold_wallet.h index c5033c9ef81..3fc29b0bdb8 100644 --- a/components/brave_rewards/core/wallet_provider/uphold/get_uphold_wallet.h +++ b/components/brave_rewards/core/wallet_provider/uphold/get_uphold_wallet.h @@ -9,13 +9,13 @@ #include "brave/components/brave_rewards/core/wallet_provider/get_external_wallet.h" namespace brave_rewards::internal { -class LedgerImpl; +class RewardsEngineImpl; namespace uphold { class GetUpholdWallet : public wallet_provider::GetExternalWallet { public: - explicit GetUpholdWallet(LedgerImpl& ledger); + explicit GetUpholdWallet(RewardsEngineImpl& engine); ~GetUpholdWallet() override; diff --git a/components/brave_rewards/core/wallet_provider/uphold/uphold_transfer.cc b/components/brave_rewards/core/wallet_provider/uphold/uphold_transfer.cc index a12c0ed6e01..2403a3f355a 100644 --- a/components/brave_rewards/core/wallet_provider/uphold/uphold_transfer.cc +++ b/components/brave_rewards/core/wallet_provider/uphold/uphold_transfer.cc @@ -9,7 +9,7 @@ #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" #include "brave/components/brave_rewards/core/uphold/uphold.h" #include "brave/components/brave_rewards/core/uphold/uphold_util.h" @@ -29,7 +29,7 @@ void UpholdTransfer::CreateTransaction( DCHECK(transaction->transaction_id.empty()); const auto wallet = - ledger_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected}); + engine_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected}); if (!wallet) { return std::move(callback).Run(nullptr); } @@ -38,7 +38,7 @@ void UpholdTransfer::CreateTransaction( &UpholdTransfer::OnCreateTransaction, base::Unretained(this), std::move(callback), transaction->Clone()); - RequestFor(*ledger_, std::move(wallet->token), + RequestFor(*engine_, std::move(wallet->token), std::move(wallet->address), std::move(transaction)) .Send(std::move(on_create_transaction)); @@ -50,14 +50,14 @@ void UpholdTransfer::OnCreateTransaction( PostCreateTransactionUphold::Result&& result) const { DCHECK(transaction); - if (!ledger_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected})) { + if (!engine_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected})) { return std::move(callback).Run(nullptr); } if (!result.has_value()) { if (result.error() == PostCreateTransactionUphold::Error::kAccessTokenExpired) { - if (!ledger_->uphold()->LogOutWallet()) { + if (!engine_->uphold()->LogOutWallet()) { BLOG(0, "Failed to disconnect " << constant::kWalletUphold << " wallet!"); } @@ -75,22 +75,22 @@ void UpholdTransfer::CommitTransaction( ResultCallback callback, mojom::ExternalTransactionPtr transaction) const { if (!transaction) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + return std::move(callback).Run(mojom::Result::FAILED); } DCHECK(!transaction->transaction_id.empty()); const auto wallet = - ledger_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected}); + engine_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected}); if (!wallet) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + return std::move(callback).Run(mojom::Result::FAILED); } auto on_commit_transaction = base::BindOnce( &UpholdTransfer::OnCommitTransaction, base::Unretained(this), std::move(callback), transaction->transaction_id); - RequestFor(*ledger_, std::move(wallet->token), + RequestFor(*engine_, std::move(wallet->token), std::move(wallet->address), std::move(transaction)) .Send(std::move(on_commit_transaction)); @@ -101,13 +101,13 @@ void UpholdTransfer::OnCommitTransaction( std::string&& transaction_id, PostCommitTransactionUphold::Result&& result) const { const auto wallet = - ledger_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected}); + engine_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected}); if (!wallet) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + return std::move(callback).Run(mojom::Result::FAILED); } if (result.has_value()) { - return std::move(callback).Run(mojom::Result::LEDGER_OK); + return std::move(callback).Run(mojom::Result::OK); } switch (result.error()) { @@ -117,16 +117,16 @@ void UpholdTransfer::OnCommitTransaction( return std::move(callback).Run( mojom::Result::RETRY_PENDING_TRANSACTION_SHORT); case PostCommitTransactionUphold::Error::kAccessTokenExpired: - if (!ledger_->uphold()->LogOutWallet()) { + if (!engine_->uphold()->LogOutWallet()) { BLOG(0, "Failed to disconnect " << constant::kWalletUphold << " wallet!"); } ABSL_FALLTHROUGH_INTENDED; default: - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + return std::move(callback).Run(mojom::Result::FAILED); } - RequestFor(*ledger_, std::move(wallet->token), + RequestFor(*engine_, std::move(wallet->token), std::move(transaction_id)) .Send(base::BindOnce(&UpholdTransfer::OnGetTransactionStatus, base::Unretained(this), std::move(callback))); @@ -135,12 +135,12 @@ void UpholdTransfer::OnCommitTransaction( void UpholdTransfer::OnGetTransactionStatus( ResultCallback callback, endpoints::GetTransactionStatusUphold::Result&& result) const { - if (!ledger_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected})) { - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + if (!engine_->uphold()->GetWalletIf({mojom::WalletStatus::kConnected})) { + return std::move(callback).Run(mojom::Result::FAILED); } if (result.has_value()) { - return std::move(callback).Run(mojom::Result::LEDGER_OK); + return std::move(callback).Run(mojom::Result::OK); } switch (result.error()) { @@ -148,13 +148,13 @@ void UpholdTransfer::OnGetTransactionStatus( return std::move(callback).Run( mojom::Result::RETRY_PENDING_TRANSACTION_SHORT); case GetTransactionStatusUphold::Error::kAccessTokenExpired: - if (!ledger_->uphold()->LogOutWallet()) { + if (!engine_->uphold()->LogOutWallet()) { BLOG(0, "Failed to disconnect " << constant::kWalletUphold << " wallet!"); } ABSL_FALLTHROUGH_INTENDED; default: - return std::move(callback).Run(mojom::Result::LEDGER_ERROR); + return std::move(callback).Run(mojom::Result::FAILED); } } diff --git a/components/brave_rewards/resources/internals/BUILD.gn b/components/brave_rewards/resources/internals/BUILD.gn index da4d7c05b7c..d4cba61f90f 100644 --- a/components/brave_rewards/resources/internals/BUILD.gn +++ b/components/brave_rewards/resources/internals/BUILD.gn @@ -11,7 +11,7 @@ transpile_web_ui("internals") { rebase_path("brave_rewards_internals.tsx"), ] ] - deps = [ "//brave/components/brave_rewards/common/mojom:ledger_types_js" ] + deps = [ "//brave/components/brave_rewards/common/mojom:rewards_types_js" ] resource_name = "brave_rewards_internals" } diff --git a/components/brave_rewards/resources/page/BUILD.gn b/components/brave_rewards/resources/page/BUILD.gn index 11e7e29b8ff..53114ba6f92 100644 --- a/components/brave_rewards/resources/page/BUILD.gn +++ b/components/brave_rewards/resources/page/BUILD.gn @@ -12,7 +12,7 @@ transpile_web_ui("page") { rebase_path("brave_rewards_page.tsx"), ] ] - deps = [ "//brave/components/brave_rewards/common/mojom:ledger_types_js" ] + deps = [ "//brave/components/brave_rewards/common/mojom:rewards_types_js" ] # what is the directory / pack name resource_name = "brave_rewards_page" diff --git a/components/brave_rewards/resources/page/lib/types.ts b/components/brave_rewards/resources/page/lib/types.ts index a3dcc1ce0b1..9995d83886d 100644 --- a/components/brave_rewards/resources/page/lib/types.ts +++ b/components/brave_rewards/resources/page/lib/types.ts @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -import { ConnectExternalWalletError, WalletStatus } from 'gen/brave/components/brave_rewards/common/mojom/ledger_types.mojom.m.js' +import { ConnectExternalWalletError, WalletStatus } from 'gen/brave/components/brave_rewards/common/mojom/rewards_types.mojom.m.js' import { Optional } from '../../shared/lib/optional' import { PublisherStatus } from '../../shared/lib/publisher_status' import { UserType } from '../../shared/lib/user_type' @@ -13,12 +13,11 @@ export interface ApplicationState { } export enum Result { - LEDGER_OK = 0, - LEDGER_ERROR = 1, + OK = 0, + FAILED = 1, NO_PUBLISHER_STATE = 2, - NO_LEDGER_STATE = 3, + NO_LEGACY_STATE = 3, INVALID_PUBLISHER_STATE = 4, - INVALID_LEDGER_STATE = 5, CAPTCHA_FAILED = 6, NO_PUBLISHER_LIST = 7, TOO_MANY_RESULTS = 8, diff --git a/components/brave_rewards/resources/rewards_panel/BUILD.gn b/components/brave_rewards/resources/rewards_panel/BUILD.gn index 40c05584ea0..fdd1bc567c5 100644 --- a/components/brave_rewards/resources/rewards_panel/BUILD.gn +++ b/components/brave_rewards/resources/rewards_panel/BUILD.gn @@ -13,8 +13,8 @@ transpile_web_ui("brave_rewards_panel") { ] ] resource_name = "brave_rewards_panel" deps = [ - "//brave/components/brave_rewards/common/mojom:ledger_types_js", "//brave/components/brave_rewards/common/mojom:mojom_js", + "//brave/components/brave_rewards/common/mojom:rewards_types_js", ] } diff --git a/components/brave_rewards/resources/rewards_panel/lib/notification_adapter.ts b/components/brave_rewards/resources/rewards_panel/lib/notification_adapter.ts index 528d74358c6..ae851c4fe4a 100644 --- a/components/brave_rewards/resources/rewards_panel/lib/notification_adapter.ts +++ b/components/brave_rewards/resources/rewards_panel/lib/notification_adapter.ts @@ -41,7 +41,7 @@ enum ExtensionNotificationType { GRANT = 2, GRANT_ADS = 3, TIPS_PROCESSED = 8, - GENERAL_LEDGER = 12 + GENERAL = 12 } // Ensures that the specified object literal matches some type |T| @@ -101,7 +101,7 @@ export function mapNotification ( ...baseProps, type: 'monthly-tip-completed' } - case ExtensionNotificationType.GENERAL_LEDGER: + case ExtensionNotificationType.GENERAL: switch (obj.args[0]) { case 'wallet_disconnected': return create({ diff --git a/components/brave_rewards/resources/shared/lib/mojom.ts b/components/brave_rewards/resources/shared/lib/mojom.ts index 1ab6d0109c9..578d9d265ff 100644 --- a/components/brave_rewards/resources/shared/lib/mojom.ts +++ b/components/brave_rewards/resources/shared/lib/mojom.ts @@ -3,4 +3,4 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -export * from 'gen/brave/components/brave_rewards/common/mojom/ledger_types.mojom.m.js' +export * from 'gen/brave/components/brave_rewards/common/mojom/rewards_types.mojom.m.js' diff --git a/components/brave_rewards/resources/tip_panel/lib/webui_model.ts b/components/brave_rewards/resources/tip_panel/lib/webui_model.ts index 4a40a912c26..a9e8f8ef1f8 100644 --- a/components/brave_rewards/resources/tip_panel/lib/webui_model.ts +++ b/components/brave_rewards/resources/tip_panel/lib/webui_model.ts @@ -9,8 +9,8 @@ import { createStateManager } from '../../shared/lib/state_manager' import { ExternalWalletProvider, externalWalletProviderFromString } from '../../shared/lib/external_wallet' import { optional } from '../../shared/lib/optional' -import { WalletStatus } from 'gen/brave/components/brave_rewards/common/mojom/ledger_types.mojom.m' -import { PublisherStatus } from 'gen/brave/components/brave_rewards/common/mojom/ledger.mojom.m' +import { WalletStatus } from 'gen/brave/components/brave_rewards/common/mojom/rewards_types.mojom.m' +import { PublisherStatus } from 'gen/brave/components/brave_rewards/common/mojom/rewards.mojom.m' export function createModel (): Model { const stateManager = createStateManager(defaultState()) diff --git a/components/brave_wallet_ui/common/async/brave_rewards_api_proxy.ts b/components/brave_wallet_ui/common/async/brave_rewards_api_proxy.ts index d32df09dfea..21aef2b6e95 100644 --- a/components/brave_wallet_ui/common/async/brave_rewards_api_proxy.ts +++ b/components/brave_wallet_ui/common/async/brave_rewards_api_proxy.ts @@ -127,7 +127,7 @@ export class BraveRewardsProxy { onInitialized = (callback: () => any) => chrome.braveRewards.initialized.addListener((error) => { - if (error === RewardsExtension.Result.LEDGER_OK) { + if (error === RewardsExtension.Result.OK) { callback() } else { console.error(`rewards onInitialized error: ${error}`) diff --git a/components/definitions/newTab.d.ts b/components/definitions/newTab.d.ts index 5023f88ade9..742c0699b12 100644 --- a/components/definitions/newTab.d.ts +++ b/components/definitions/newTab.d.ts @@ -173,12 +173,11 @@ declare namespace NewTab { } export const enum RewardsResult { - LEDGER_OK = 0, - LEDGER_ERROR = 1, + OK = 0, + FAILED = 1, NO_PUBLISHER_STATE = 2, - NO_LEDGER_STATE = 3, + NO_LEGACY_STATE = 3, INVALID_PUBLISHER_STATE = 4, - INVALID_LEDGER_STATE = 5, CAPTCHA_FAILED = 6, NO_PUBLISHER_LIST = 7, TOO_MANY_RESULTS = 8, diff --git a/components/definitions/rewardsExtensions.d.ts b/components/definitions/rewardsExtensions.d.ts index 494f5aed273..50a934ac2f0 100644 --- a/components/definitions/rewardsExtensions.d.ts +++ b/components/definitions/rewardsExtensions.d.ts @@ -97,12 +97,11 @@ declare namespace RewardsExtension { } export const enum Result { - LEDGER_OK = 0, - LEDGER_ERROR = 1, + OK = 0, + FAILED = 1, NO_PUBLISHER_STATE = 2, - NO_LEDGER_STATE = 3, + NO_LEGACY_STATE = 3, INVALID_PUBLISHER_STATE = 4, - INVALID_LEDGER_STATE = 5, CAPTCHA_FAILED = 6, NO_PUBLISHER_LIST = 7, TOO_MANY_RESULTS = 8, @@ -177,7 +176,7 @@ declare namespace RewardsExtension { export type TipDialogEntryPoint = 'one-time' | 'set-monthly' | 'clear-monthly' - type WalletStatus = import('gen/brave/components/brave_rewards/common/mojom/ledger_types.mojom.m.js').WalletStatus + type WalletStatus = import('gen/brave/components/brave_rewards/common/mojom/rewards_types.mojom.m.js').WalletStatus export type WalletType = 'uphold' | 'bitflyer' | 'gemini' diff --git a/components/definitions/rewardsInternals.d.ts b/components/definitions/rewardsInternals.d.ts index 4fe9b15a69f..aad439580da 100644 --- a/components/definitions/rewardsInternals.d.ts +++ b/components/definitions/rewardsInternals.d.ts @@ -10,7 +10,7 @@ declare namespace RewardsInternals { export interface State { balance: import( - 'gen/brave/components/brave_rewards/common/mojom/ledger_types.mojom.m.js' + 'gen/brave/components/brave_rewards/common/mojom/rewards_types.mojom.m.js' ).Balance info: { isKeyInfoSeedValid: boolean @@ -59,7 +59,7 @@ declare namespace RewardsInternals { version: number } - type WalletStatus = import('gen/brave/components/brave_rewards/common/mojom/ledger_types.mojom.m.js').WalletStatus + type WalletStatus = import('gen/brave/components/brave_rewards/common/mojom/rewards_types.mojom.m.js').WalletStatus export type WalletType = 'uphold' | 'bitflyer' | 'gemini' @@ -87,5 +87,5 @@ declare namespace RewardsInternals { diagnosticId: string } - type Environment = import('gen/brave/components/brave_rewards/common/mojom/ledger_types.mojom.m.js').Environment + type Environment = import('gen/brave/components/brave_rewards/common/mojom/rewards_types.mojom.m.js').Environment } diff --git a/components/services/bat_ledger/ledger_factory_impl.h b/components/services/bat_ledger/ledger_factory_impl.h deleted file mode 100644 index 23f28d63518..00000000000 --- a/components/services/bat_ledger/ledger_factory_impl.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (c) 2023 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_COMPONENTS_SERVICES_BAT_LEDGER_LEDGER_FACTORY_IMPL_H_ -#define BRAVE_COMPONENTS_SERVICES_BAT_LEDGER_LEDGER_FACTORY_IMPL_H_ - -#include "brave/components/services/bat_ledger/public/interfaces/ledger_factory.mojom.h" -#include "mojo/public/cpp/bindings/pending_associated_receiver.h" -#include "mojo/public/cpp/bindings/pending_associated_remote.h" -#include "mojo/public/cpp/bindings/pending_receiver.h" -#include "mojo/public/cpp/bindings/receiver.h" -#include "mojo/public/cpp/bindings/self_owned_associated_receiver.h" - -namespace brave_rewards::internal { - -class LedgerFactoryImpl : public mojom::LedgerFactory { - public: - explicit LedgerFactoryImpl( - mojo::PendingReceiver receiver); - - ~LedgerFactoryImpl() override; - - LedgerFactoryImpl(const LedgerFactoryImpl&) = delete; - LedgerFactoryImpl& operator=(const LedgerFactoryImpl&) = delete; - - void CreateLedger( - mojo::PendingAssociatedReceiver ledger_receiver, - mojo::PendingAssociatedRemote ledger_client_remote, - mojom::LedgerOptionsPtr options, - CreateLedgerCallback callback) override; - - private: - mojo::Receiver receiver_; - mojo::SelfOwnedAssociatedReceiverRef ledger_; -}; - -} // namespace brave_rewards::internal - -#endif // BRAVE_COMPONENTS_SERVICES_BAT_LEDGER_LEDGER_FACTORY_IMPL_H_ diff --git a/components/services/bat_ledger/BUILD.gn b/components/services/bat_rewards/BUILD.gn similarity index 88% rename from components/services/bat_ledger/BUILD.gn rename to components/services/bat_rewards/BUILD.gn index c8281abdd92..4a0c8da80ca 100644 --- a/components/services/bat_ledger/BUILD.gn +++ b/components/services/bat_rewards/BUILD.gn @@ -10,8 +10,8 @@ static_library("lib") { ] sources = [ - "ledger_factory_impl.cc", - "ledger_factory_impl.h", + "rewards_engine_factory.cc", + "rewards_engine_factory.h", ] public_deps = [ diff --git a/components/services/bat_ledger/public/interfaces/BUILD.gn b/components/services/bat_rewards/public/interfaces/BUILD.gn similarity index 90% rename from components/services/bat_ledger/public/interfaces/BUILD.gn rename to components/services/bat_rewards/public/interfaces/BUILD.gn index 0f002b4eab2..5628a5cf635 100644 --- a/components/services/bat_ledger/public/interfaces/BUILD.gn +++ b/components/services/bat_rewards/public/interfaces/BUILD.gn @@ -6,7 +6,7 @@ import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { - sources = [ "ledger_factory.mojom" ] + sources = [ "rewards_engine_factory.mojom" ] public_deps = [ "//mojo/public/mojom/base" ] diff --git a/components/services/bat_ledger/public/interfaces/ledger_factory.mojom b/components/services/bat_rewards/public/interfaces/rewards_engine_factory.mojom similarity index 53% rename from components/services/bat_ledger/public/interfaces/ledger_factory.mojom rename to components/services/bat_rewards/public/interfaces/rewards_engine_factory.mojom index b8ad4646012..afe70154013 100644 --- a/components/services/bat_ledger/public/interfaces/ledger_factory.mojom +++ b/components/services/bat_rewards/public/interfaces/rewards_engine_factory.mojom @@ -4,10 +4,10 @@ // You can obtain one at https://mozilla.org/MPL/2.0/. module brave_rewards.mojom; -import "brave/components/brave_rewards/common/mojom/bat_ledger.mojom"; -import "brave/components/brave_rewards/common/mojom/ledger_types.mojom"; +import "brave/components/brave_rewards/common/mojom/rewards_engine.mojom"; +import "brave/components/brave_rewards/common/mojom/rewards_types.mojom"; -struct LedgerOptions { +struct RewardsEngineOptions { Environment environment; bool is_testing; bool is_debug; @@ -16,9 +16,9 @@ struct LedgerOptions { int32 retry_interval; }; -interface LedgerFactory { - CreateLedger( - pending_associated_receiver ledger_receiver, - pending_associated_remote ledger_client_remote, - LedgerOptions options) => (); +interface RewardsEngineFactory { + CreateRewardsEngine( + pending_associated_receiver engine_receiver, + pending_associated_remote client_remote, + RewardsEngineOptions options) => (); }; diff --git a/components/services/bat_ledger/ledger_factory_impl.cc b/components/services/bat_rewards/rewards_engine_factory.cc similarity index 52% rename from components/services/bat_ledger/ledger_factory_impl.cc rename to components/services/bat_rewards/rewards_engine_factory.cc index d5677b01370..d03da2e00fa 100644 --- a/components/services/bat_ledger/ledger_factory_impl.cc +++ b/components/services/bat_rewards/rewards_engine_factory.cc @@ -3,29 +3,29 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "brave/components/services/bat_ledger/ledger_factory_impl.h" +#include "brave/components/services/bat_rewards/rewards_engine_factory.h" #include #include -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" namespace brave_rewards::internal { -LedgerFactoryImpl::LedgerFactoryImpl( - mojo::PendingReceiver receiver) +RewardsEngineFactory::RewardsEngineFactory( + mojo::PendingReceiver receiver) : receiver_(this, std::move(receiver)) {} -LedgerFactoryImpl::~LedgerFactoryImpl() = default; +RewardsEngineFactory::~RewardsEngineFactory() = default; -void LedgerFactoryImpl::CreateLedger( - mojo::PendingAssociatedReceiver ledger_receiver, - mojo::PendingAssociatedRemote ledger_client_remote, - mojom::LedgerOptionsPtr options, - CreateLedgerCallback callback) { - if (!ledger_) { +void RewardsEngineFactory::CreateRewardsEngine( + mojo::PendingAssociatedReceiver engine_receiver, + mojo::PendingAssociatedRemote client_remote, + mojom::RewardsEngineOptionsPtr options, + CreateRewardsEngineCallback callback) { + if (!engine_) { // Set global options for the current process. This must be done before - // the `LedgerImpl` constructor is invoked so that subobjects see the + // the `RewardsEngineImpl` constructor is invoked so that subobjects see the // correct values. _environment = options->environment; is_testing = options->is_testing; @@ -35,9 +35,9 @@ void LedgerFactoryImpl::CreateLedger( reconcile_interval = options->reconcile_interval; retry_interval = options->retry_interval; - ledger_ = mojo::MakeSelfOwnedAssociatedReceiver( - std::make_unique(std::move(ledger_client_remote)), - std::move(ledger_receiver)); + engine_ = mojo::MakeSelfOwnedAssociatedReceiver( + std::make_unique(std::move(client_remote)), + std::move(engine_receiver)); } std::move(callback).Run(); diff --git a/components/services/bat_rewards/rewards_engine_factory.h b/components/services/bat_rewards/rewards_engine_factory.h new file mode 100644 index 00000000000..07b27021df0 --- /dev/null +++ b/components/services/bat_rewards/rewards_engine_factory.h @@ -0,0 +1,41 @@ +/* Copyright (c) 2023 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_COMPONENTS_SERVICES_BAT_REWARDS_REWARDS_ENGINE_FACTORY_H_ +#define BRAVE_COMPONENTS_SERVICES_BAT_REWARDS_REWARDS_ENGINE_FACTORY_H_ + +#include "brave/components/services/bat_rewards/public/interfaces/rewards_engine_factory.mojom.h" +#include "mojo/public/cpp/bindings/pending_associated_receiver.h" +#include "mojo/public/cpp/bindings/pending_associated_remote.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" +#include "mojo/public/cpp/bindings/receiver.h" +#include "mojo/public/cpp/bindings/self_owned_associated_receiver.h" + +namespace brave_rewards::internal { + +class RewardsEngineFactory : public mojom::RewardsEngineFactory { + public: + explicit RewardsEngineFactory( + mojo::PendingReceiver receiver); + + ~RewardsEngineFactory() override; + + RewardsEngineFactory(const RewardsEngineFactory&) = delete; + RewardsEngineFactory& operator=(const RewardsEngineFactory&) = delete; + + void CreateRewardsEngine( + mojo::PendingAssociatedReceiver engine_receiver, + mojo::PendingAssociatedRemote client_remote, + mojom::RewardsEngineOptionsPtr options, + CreateRewardsEngineCallback callback) override; + + private: + mojo::Receiver receiver_; + mojo::SelfOwnedAssociatedReceiverRef engine_; +}; + +} // namespace brave_rewards::internal + +#endif // BRAVE_COMPONENTS_SERVICES_BAT_REWARDS_REWARDS_ENGINE_FACTORY_H_ diff --git a/components/test/brave_new_tab_ui/reducers/new_tab_reducer_test.ts b/components/test/brave_new_tab_ui/reducers/new_tab_reducer_test.ts index 99d8acf57d2..34918f61fe9 100644 --- a/components/test/brave_new_tab_ui/reducers/new_tab_reducer_test.ts +++ b/components/test/brave_new_tab_ui/reducers/new_tab_reducer_test.ts @@ -54,7 +54,7 @@ describe('newTabReducer', () => { describe('WALLET_CREATED', () => { // TODO }) - describe('LEDGER_OK', () => { + describe('OK', () => { // TODO }) describe('ON_ADS_ENABLED', () => { diff --git a/ios/BUILD.gn b/ios/BUILD.gn index 1ac83e7f4bf..9073bc9063d 100644 --- a/ios/BUILD.gn +++ b/ios/BUILD.gn @@ -4,13 +4,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. import("//brave/ios/browser/api/ads/headers.gni") +import("//brave/ios/browser/api/brave_rewards/headers.gni") import("//brave/ios/browser/api/brave_shields/headers.gni") import("//brave/ios/browser/api/brave_stats/headers.gni") import("//brave/ios/browser/api/brave_wallet/headers.gni") import("//brave/ios/browser/api/certificate/headers.gni") import("//brave/ios/browser/api/favicon/headers.gni") import("//brave/ios/browser/api/ipfs/headers.gni") -import("//brave/ios/browser/api/ledger/headers.gni") import("//brave/ios/browser/api/ntp_background_images/headers.gni") import("//brave/ios/browser/api/opentabs/headers.gni") import("//brave/ios/browser/api/p3a/headers.gni") @@ -71,7 +71,7 @@ brave_core_public_headers += brave_stats_public_headers brave_core_public_headers += brave_wallet_public_headers brave_core_public_headers += browser_api_certificate_public_headers brave_core_public_headers += browser_api_favicon_public_headers -brave_core_public_headers += ledger_public_headers +brave_core_public_headers += rewards_public_headers brave_core_public_headers += browser_api_opentabs_public_headers brave_core_public_headers += browser_api_qr_code_public_headers brave_core_public_headers += browser_api_session_restore_public_headers @@ -114,7 +114,7 @@ ios_framework_bundle("brave_core_ios_framework") { deps += ads_public_deps deps += brave_wallet_public_deps - deps += ledger_public_deps + deps += rewards_public_deps deps += skus_public_deps sources = brave_core_public_headers diff --git a/ios/app/BUILD.gn b/ios/app/BUILD.gn index 035ee433a0f..2f24f5f222c 100644 --- a/ios/app/BUILD.gn +++ b/ios/app/BUILD.gn @@ -38,13 +38,13 @@ source_set("app") { "//brave/ios/browser", "//brave/ios/browser/api/ads", "//brave/ios/browser/api/bookmarks", + "//brave/ios/browser/api/brave_rewards", "//brave/ios/browser/api/brave_shields", "//brave/ios/browser/api/brave_stats", "//brave/ios/browser/api/brave_wallet", "//brave/ios/browser/api/brave_wallet:wallet_mojom_wrappers", "//brave/ios/browser/api/history", "//brave/ios/browser/api/ipfs", - "//brave/ios/browser/api/ledger", "//brave/ios/browser/api/ntp_background_images", "//brave/ios/browser/api/opentabs", "//brave/ios/browser/api/p3a", diff --git a/ios/browser/api/ledger/BUILD.gn b/ios/browser/api/brave_rewards/BUILD.gn similarity index 55% rename from ios/browser/api/ledger/BUILD.gn rename to ios/browser/api/brave_rewards/BUILD.gn index b37eb3f11f2..2447201efca 100644 --- a/ios/browser/api/ledger/BUILD.gn +++ b/ios/browser/api/brave_rewards/BUILD.gn @@ -1,7 +1,7 @@ -# Copyright (c) 2021 The Brave Authors. All rights reserved. +# Copyright (c) 2023 The Brave Authors. All rights reserved. # This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at https://mozilla.org/MPL/2.0/. import("//brave/build/ios/coredata_model.gni") import("//brave/build/ios/mojom/mojom_wrappers.gni") @@ -12,29 +12,29 @@ config("external_config") { include_dirs = [ "$target_gen_dir" ] } -source_set("ledger") { +source_set("brave_rewards") { configs += [ ":external_config", "//build/config/compiler:enable_arc", ] sources = [ - "brave_ledger.h", - "brave_ledger.mm", - "brave_ledger_observer.h", - "brave_ledger_observer.mm", - "ledger_client_bridge.h", - "ledger_client_ios.h", - "ledger_client_ios.mm", + "brave_rewards_api.h", + "brave_rewards_api.mm", "promotion_solution.h", "promotion_solution.mm", + "rewards_client_bridge.h", + "rewards_client_ios.h", + "rewards_client_ios.mm", "rewards_notification.h", "rewards_notification.m", + "rewards_observer.h", + "rewards_observer.mm", ] deps = [ - ":ledger_mojom_wrappers", - ":ledger_types_mojom_wrappers", + ":rewards_mojom_wrappers", + ":rewards_types_mojom_wrappers", "//base", "//brave/components/brave_rewards/common", "//brave/components/brave_rewards/core", @@ -51,17 +51,17 @@ source_set("ledger") { ] } -ios_objc_mojom_wrappers("ledger_mojom_wrappers") { +ios_objc_mojom_wrappers("rewards_mojom_wrappers") { mojom_target = - "//brave/components/brave_rewards/common/mojom:ledger_interfaces" - sources = [ "//brave/components/brave_rewards/common/mojom/ledger.mojom" ] + "//brave/components/brave_rewards/common/mojom:rewards_interfaces" + sources = [ "//brave/components/brave_rewards/common/mojom/rewards.mojom" ] } -ios_objc_mojom_wrappers("ledger_types_mojom_wrappers") { - mojom_target = "//brave/components/brave_rewards/common/mojom:ledger_types" +ios_objc_mojom_wrappers("rewards_types_mojom_wrappers") { + mojom_target = "//brave/components/brave_rewards/common/mojom:rewards_types" - # ledger_types.mojom shares the same namespace/module as ledger.mojom + # rewards_types.mojom shares the same namespace/module as rewards.mojom generate_namespace = false sources = - [ "//brave/components/brave_rewards/common/mojom/ledger_types.mojom" ] + [ "//brave/components/brave_rewards/common/mojom/rewards_types.mojom" ] } diff --git a/ios/browser/api/ledger/DEPS b/ios/browser/api/brave_rewards/DEPS similarity index 100% rename from ios/browser/api/ledger/DEPS rename to ios/browser/api/brave_rewards/DEPS diff --git a/ios/browser/api/ledger/brave_ledger.h b/ios/browser/api/brave_rewards/brave_rewards_api.h similarity index 79% rename from ios/browser/api/ledger/brave_ledger.h rename to ios/browser/api/brave_rewards/brave_rewards_api.h index a1e01e8bb96..4a2f0d0e2d4 100644 --- a/ios/browser/api/ledger/brave_ledger.h +++ b/ios/browser/api/brave_rewards/brave_rewards_api.h @@ -1,16 +1,16 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. +/* Copyright (c) 2023 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_IOS_BROWSER_API_LEDGER_BRAVE_LEDGER_H_ -#define BRAVE_IOS_BROWSER_API_LEDGER_BRAVE_LEDGER_H_ +#ifndef BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_BRAVE_REWARDS_API_H_ +#define BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_BRAVE_REWARDS_API_H_ #import -#import "ledger.mojom.objc.h" -#import "ledger_types.mojom.objc.h" +#import "rewards.mojom.objc.h" +#import "rewards_types.mojom.objc.h" -@class BraveLedgerObserver, PromotionSolution, RewardsNotification; +@class RewardsObserver, PromotionSolution, RewardsNotification; NS_ASSUME_NONNULL_BEGIN @@ -21,43 +21,43 @@ static ExternalWalletType const ExternalWalletTypeUphold = @"uphold"; static ExternalWalletType const ExternalWalletTypeAnonymous = @"anonymous"; static ExternalWalletType const ExternalWalletTypeUnblindedTokens = @"blinded"; -/// The error domain for ledger related errors -OBJC_EXPORT NSString* const BraveLedgerErrorDomain; +/// The error domain for rewards related errors +OBJC_EXPORT NSString* const BraveRewardsErrorDomain; -OBJC_EXPORT NSNotificationName const BraveLedgerNotificationAdded - NS_SWIFT_NAME(BraveLedger.notificationAdded); +OBJC_EXPORT NSNotificationName const + BraveRewardsNotificationAdded NS_SWIFT_NAME(BraveRewardsAPI.notificationAdded); -typedef NSString* BraveGeneralLedgerNotificationID NS_STRING_ENUM; -OBJC_EXPORT BraveGeneralLedgerNotificationID const - BraveGeneralLedgerNotificationIDWalletNowVerified; -OBJC_EXPORT BraveGeneralLedgerNotificationID const - BraveGeneralLedgerNotificationIDWalletDisconnected; +typedef NSString* BraveGeneralRewardsNotificationID NS_STRING_ENUM; +OBJC_EXPORT BraveGeneralRewardsNotificationID const + BraveGeneralRewardsNotificationIDWalletNowVerified; +OBJC_EXPORT BraveGeneralRewardsNotificationID const + BraveGeneralRewardsNotificationIDWalletDisconnected; OBJC_EXPORT -@interface BraveLedger : NSObject +@interface BraveRewardsAPI : NSObject -/// Create a brave ledger that will read and write its state to the given path +/// Create a rewards engine that will read and write its state to the given path - (instancetype)initWithStateStoragePath:(NSString*)path; - (instancetype)init NS_UNAVAILABLE; #pragma mark - Initialization -/// Initialize the ledger service. +/// Initialize the rewards service. /// /// This must be called before other methods on this class are called -- (void)initializeLedgerService:(nullable void (^)())completion; +- (void)initializeRewardsService:(nullable void (^)())completion; -/// Whether or not the ledger service has been initialized already +/// Whether or not the rewards service has been initialized already @property(nonatomic, readonly, getter=isInitialized) BOOL initialized; -/// Whether or not the ledger service is currently initializing +/// Whether or not the rewards service is currently initializing @property(nonatomic, readonly, getter=isInitializing) BOOL initializing; -/// The result when initializing the ledger service. Should be -/// `BraveRewardsResultLedgerOk` if `initialized` is `true` +/// The result when initializing the rewards service. Should be +/// `BraveRewardsResultOk` if `initialized` is `true` /// -/// If this is not `BraveRewardsResultLedgerOk`, rewards is not usable for the +/// If this is not `BraveRewardsResultOk`, rewards is not usable for the /// user @property(nonatomic, readonly) BraveRewardsResult initializationResult; @@ -70,10 +70,10 @@ OBJC_EXPORT /// Add an interface to the list of observers /// /// Observers are stored weakly and do not necessarily need to be removed -- (void)addObserver:(BraveLedgerObserver*)observer; +- (void)addObserver:(RewardsObserver*)observer; /// Removes an interface from the list of observers -- (void)removeObserver:(BraveLedgerObserver*)observer; +- (void)removeObserver:(RewardsObserver*)observer; #pragma mark - Wallet @@ -124,7 +124,7 @@ OBJC_EXPORT /// Start a fetch to get a publishers activity information given a URL /// -/// Use `BraveLedgerObserver` to retrieve a panel publisher if one is found +/// Use `RewardsObserver` to retrieve a panel publisher if one is found - (void)fetchPublisherActivityFromURL:(NSURL*)URL faviconURL:(nullable NSURL*)faviconURL publisherBlob:(nullable NSString*)publisherBlob @@ -215,11 +215,11 @@ OBJC_EXPORT - (void)setContributionAmount:(double)contributionAmount; /// Whether or not the user will automatically contribute - (void)setAutoContributeEnabled:(bool)autoContributeEnabled; -/// A custom user agent for network operations on ledger +/// A custom user agent for network operations on rewards @property(nonatomic, copy, nullable) NSString* customUserAgent; @end NS_ASSUME_NONNULL_END -#endif // BRAVE_IOS_BROWSER_API_LEDGER_BRAVE_LEDGER_H_ +#endif // BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_BRAVE_REWARDS_API_H_ diff --git a/ios/browser/api/ledger/brave_ledger.mm b/ios/browser/api/brave_rewards/brave_rewards_api.mm similarity index 71% rename from ios/browser/api/ledger/brave_ledger.mm rename to ios/browser/api/brave_rewards/brave_rewards_api.mm index dbbf6cf4138..be0d38b482b 100644 --- a/ios/browser/api/ledger/brave_ledger.mm +++ b/ios/browser/api/brave_rewards/brave_rewards_api.mm @@ -1,9 +1,9 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. +/* Copyright (c) 2023 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#import "brave_ledger.h" +#import "brave_rewards_api.h" #import #include "base/base64.h" @@ -21,16 +21,16 @@ #include "brave/build/ios/mojom/cpp_transformations.h" #include "brave/components/brave_rewards/common/rewards_flags.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/ledger_database.h" -#include "brave/components/brave_rewards/core/ledger_impl.h" +#include "brave/components/brave_rewards/core/rewards_database.h" +#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#import "brave/ios/browser/api/brave_rewards/promotion_solution.h" +#import "brave/ios/browser/api/brave_rewards/rewards.mojom.objc+private.h" +#import "brave/ios/browser/api/brave_rewards/rewards_client_bridge.h" +#import "brave/ios/browser/api/brave_rewards/rewards_client_ios.h" +#import "brave/ios/browser/api/brave_rewards/rewards_notification.h" +#import "brave/ios/browser/api/brave_rewards/rewards_observer.h" +#import "brave/ios/browser/api/brave_rewards/rewards_types.mojom.objc+private.h" #import "brave/ios/browser/api/common/common_operations.h" -#import "brave/ios/browser/api/ledger/brave_ledger_observer.h" -#import "brave/ios/browser/api/ledger/ledger.mojom.objc+private.h" -#import "brave/ios/browser/api/ledger/ledger_client_bridge.h" -#import "brave/ios/browser/api/ledger/ledger_client_ios.h" -#import "brave/ios/browser/api/ledger/ledger_types.mojom.objc+private.h" -#import "brave/ios/browser/api/ledger/promotion_solution.h" -#import "brave/ios/browser/api/ledger/rewards_notification.h" #include "components/os_crypt/sync/os_crypt.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "url/gurl.h" @@ -75,12 +75,12 @@ std::unique_ptr> make_task_ptr(Args&&... args) { :base::SysNSStringToUTF8( \ [NSString stringWithFormat:(format), ##__VA_ARGS__])] -NSString* const BraveLedgerErrorDomain = @"BraveLedgerErrorDomain"; -NSNotificationName const BraveLedgerNotificationAdded = - @"BATBraveLedgerNotificationAdded"; +NSString* const BraveRewardsErrorDomain = @"BraveRewardsErrorDomain"; +NSNotificationName const BraveRewardsNotificationAdded = + @"BATBraveRewardsNotificationAdded"; -BraveGeneralLedgerNotificationID const - BATBraveGeneralLedgerNotificationIDWalletDisconnected = +BraveGeneralRewardsNotificationID const + BATBraveGeneralRewardsNotificationIDWalletDisconnected = @"wallet_disconnected"; static NSString* const kContributionQueueAutoincrementID = @@ -96,19 +96,19 @@ static const auto kOneDay = /// --- -@interface BraveLedger () { - // DO NOT ACCESS DIRECTLY, use `postLedgerTask` or ensure you are accessing - // _ledger from a task posted in `_ledgerTaskRunner` - std::unique_ptr { + // DO NOT ACCESS DIRECTLY, use `postEngineTask` or ensure you are accessing + // _engine from a task posted in `_engineTaskRunner` + std::unique_ptr> - _ledger; - std::unique_ptr> - _ledgerClient; - base::SequenceBound rewardsDatabase; + brave_rewards::internal::RewardsEngineImpl>> + _engine; + std::unique_ptr> + _rewardsClient; + base::SequenceBound rewardsDatabase; scoped_refptr databaseQueue; - scoped_refptr _ledgerTaskRunner; + scoped_refptr _engineTaskRunner; } @property(nonatomic, copy) NSString* storagePath; @@ -123,7 +123,7 @@ static const auto kOneDay = @property(nonatomic) NSMutableArray* mFinishedPromotions; -@property(nonatomic) NSHashTable* observers; +@property(nonatomic) NSHashTable* observers; @property(nonatomic, getter=isInitialized) BOOL initialized; @property(nonatomic) BOOL initializing; @@ -141,11 +141,11 @@ static const auto kOneDay = @end -@implementation BraveLedger +@implementation BraveRewardsAPI - (instancetype)initWithStateStoragePath:(NSString*)path { if ((self = [super init])) { - _ledgerTaskRunner = base::ThreadPool::CreateSequencedTaskRunner( + _engineTaskRunner = base::ThreadPool::CreateSequencedTaskRunner( {base::MayBlock(), base::WithBaseSyncPrimitives(), base::TaskPriority::USER_VISIBLE, base::TaskShutdownBehavior::BLOCK_SHUTDOWN}); @@ -153,7 +153,7 @@ static const auto kOneDay = self.storagePath = path; self.commonOps = [[BraveCommonOperations alloc] initWithStoragePath:path - taskRunner:_ledgerTaskRunner]; + taskRunner:_engineTaskRunner]; self.state = [[NSMutableDictionary alloc] initWithContentsOfFile:self.randomStatePath] ?: [[NSMutableDictionary alloc] init]; @@ -184,16 +184,16 @@ static const auto kOneDay = const auto* dbPath = [self rewardsDatabasePath].UTF8String; rewardsDatabase = - base::SequenceBound( + base::SequenceBound( databaseQueue, base::FilePath(dbPath)); - _ledgerTaskRunner->PostTask( + _engineTaskRunner->PostTask( FROM_HERE, base::BindOnce(^{ - self->_ledgerClient = - brave_rewards::internal::make_task_ptr(self); - self->_ledger = brave_rewards::internal::make_task_ptr< - brave_rewards::internal::LedgerImpl>( - self->_ledgerClient->MakeRemote()); + self->_rewardsClient = + brave_rewards::internal::make_task_ptr(self); + self->_engine = brave_rewards::internal::make_task_ptr< + brave_rewards::internal::RewardsEngineImpl>( + self->_rewardsClient->MakeRemote()); })); // Add notifications for standard app foreground/background @@ -247,31 +247,32 @@ static const auto kOneDay = } } -- (void)postLedgerTask:(void (^)(brave_rewards::internal::LedgerImpl*))task { - _ledgerTaskRunner->PostTask(FROM_HERE, base::BindOnce(^{ - CHECK(self->_ledger != nullptr); - task(self->_ledger.get()); +- (void)postEngineTask: + (void (^)(brave_rewards::internal::RewardsEngineImpl*))task { + _engineTaskRunner->PostTask(FROM_HERE, base::BindOnce(^{ + CHECK(self->_engine != nullptr); + task(self->_engine.get()); })); } -- (void)initializeLedgerService:(nullable void (^)())completion { +- (void)initializeRewardsService:(nullable void (^)())completion { if (self.initialized || self.initializing) { return; } self.initializing = YES; - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->Initialize(base::BindOnce(^(brave_rewards::mojom::Result result) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->Initialize(base::BindOnce(^(brave_rewards::mojom::Result result) { self.initialized = - (result == brave_rewards::mojom::Result::LEDGER_OK || - result == brave_rewards::mojom::Result::NO_LEDGER_STATE || + (result == brave_rewards::mojom::Result::OK || + result == brave_rewards::mojom::Result::NO_LEGACY_STATE || result == brave_rewards::mojom::Result::NO_PUBLISHER_STATE); self.initializing = NO; if (self.initialized) { [self getRewardsParameters:nil]; [self fetchBalance:nil]; } else { - LLOG(0, @"Ledger Initialization Failed with error: %d", result); + LLOG(0, @"Rewards Initialization Failed with error: %d", result); } self.initializationResult = static_cast(result); if (completion) { @@ -280,7 +281,7 @@ static const auto kOneDay = }); } dispatch_async(dispatch_get_main_queue(), ^{ - for (BraveLedgerObserver* observer in [self.observers copy]) { + for (RewardsObserver* observer in [self.observers copy]) { if (observer.walletInitalized) { observer.walletInitalized(self.initializationResult); } @@ -301,7 +302,7 @@ static const auto kOneDay = removeItemAtPath:[dbPath stringByAppendingString:@"-journal"] error:nil]; rewardsDatabase = - base::SequenceBound( + base::SequenceBound( databaseQueue, base::FilePath(base::SysNSStringToUTF8(dbPath))); } @@ -324,11 +325,11 @@ static const auto kOneDay = #pragma mark - Observers -- (void)addObserver:(BraveLedgerObserver*)observer { +- (void)addObserver:(RewardsObserver*)observer { [self.observers addObject:observer]; } -- (void)removeObserver:(BraveLedgerObserver*)observer { +- (void)removeObserver:(RewardsObserver*)observer { [self.observers removeObject:observer]; } @@ -337,14 +338,14 @@ static const auto kOneDay = - (void)createWallet:(void (^)(NSError* _Nullable))completion { const auto __weak weakSelf = self; // Results that can come from CreateRewardsWallet(): - // - LEDGER_OK: Good to go - // - LEDGER_ERROR: Already initialized + // - OK: Good to go + // - ERROR: Already initialized // - BAD_REGISTRATION_RESPONSE: Request credentials call failure or // malformed data // - REGISTRATION_VERIFICATION_FAILED: Missing master user token self.initializingWallet = YES; - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->CreateRewardsWallet( + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->CreateRewardsWallet( "", base::BindOnce(^( brave_rewards::mojom::CreateRewardsWalletResult create_result) { const auto strongSelf = weakSelf; @@ -355,14 +356,14 @@ static const auto kOneDay = brave_rewards::mojom::Result result = create_result == brave_rewards::mojom::CreateRewardsWalletResult::kSuccess - ? brave_rewards::mojom::Result::LEDGER_OK - : brave_rewards::mojom::Result::LEDGER_ERROR; + ? brave_rewards::mojom::Result::OK + : brave_rewards::mojom::Result::FAILED; NSError* error = nil; - if (result != brave_rewards::mojom::Result::LEDGER_OK) { + if (result != brave_rewards::mojom::Result::OK) { std::map errorDescriptions{ - {brave_rewards::mojom::Result::LEDGER_ERROR, + {brave_rewards::mojom::Result::FAILED, "The wallet was already initialized"}, {brave_rewards::mojom::Result::BAD_REGISTRATION_RESPONSE, "Request credentials call failure or malformed data"}, @@ -379,7 +380,7 @@ static const auto kOneDay = NSLocalizedDescriptionKey : base::SysUTF8ToNSString(description) }; } - error = [NSError errorWithDomain:BraveLedgerErrorDomain + error = [NSError errorWithDomain:BraveRewardsErrorDomain code:static_cast(result) userInfo:userInfo]; } @@ -392,7 +393,7 @@ static const auto kOneDay = completion(error); } - for (BraveLedgerObserver* observer in [strongSelf.observers copy]) { + for (RewardsObserver* observer in [strongSelf.observers copy]) { if (observer.walletInitalized) { observer.walletInitalized( static_cast(result)); @@ -405,8 +406,8 @@ static const auto kOneDay = - (void)currentWalletInfo: (void (^)(BraveRewardsRewardsWallet* _Nullable wallet))completion { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->GetRewardsWallet( + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->GetRewardsWallet( base::BindOnce(^(brave_rewards::mojom::RewardsWalletPtr wallet) { const auto bridgedWallet = wallet.get() != nullptr ? [[BraveRewardsRewardsWallet alloc] @@ -421,8 +422,8 @@ static const auto kOneDay = - (void)getRewardsParameters: (void (^)(BraveRewardsRewardsParameters* _Nullable))completion { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->GetRewardsParameters( + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->GetRewardsParameters( base::BindOnce(^(brave_rewards::mojom::RewardsParametersPtr info) { if (info) { self.rewardsParameters = [[BraveRewardsRewardsParameters alloc] @@ -442,8 +443,8 @@ static const auto kOneDay = - (void)fetchBalance:(void (^)(BraveRewardsBalance* _Nullable))completion { const auto __weak weakSelf = self; - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->FetchBalance(base::BindOnce( + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->FetchBalance(base::BindOnce( ^(base::expected result) { const auto strongSelf = weakSelf; @@ -461,7 +462,8 @@ static const auto kOneDay = } - (void)legacyWallet: - (brave_rewards::mojom::LedgerClient::GetLegacyWalletCallback)callback { + (brave_rewards::mojom::RewardsEngineClient::GetLegacyWalletCallback) + callback { NSDictionary* externalWallets = self.prefs[kExternalWalletsPrefKey] ?: [[NSDictionary alloc] init]; std::string wallet; @@ -486,27 +488,12 @@ static const auto kOneDay = completion: (void (^)(NSArray*)) completion { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { auto cppFilter = filter ? filter.cppObjPtr : brave_rewards::mojom::ActivityInfoFilter::New(); if (filter.excluded == BraveRewardsExcludeFilterFilterExcluded) { - ledger->GetExcludedList(base::BindOnce(^( - std::vector list) { - const auto publishers = NSArrayFromVector( - &list, ^BraveRewardsPublisherInfo*( - const brave_rewards::mojom::PublisherInfoPtr& info) { - return [[BraveRewardsPublisherInfo alloc] - initWithPublisherInfo:*info]; - }); - dispatch_async(dispatch_get_main_queue(), ^{ - completion(publishers); - }); - })); - } else { - ledger->GetActivityInfoList( - start, limit, std::move(cppFilter), - base::BindOnce(^( - std::vector list) { + engine->GetExcludedList(base::BindOnce( + ^(std::vector list) { const auto publishers = NSArrayFromVector( &list, ^BraveRewardsPublisherInfo*( const brave_rewards::mojom::PublisherInfoPtr& info) { @@ -517,6 +504,21 @@ static const auto kOneDay = completion(publishers); }); })); + } else { + engine->GetActivityInfoList( + start, limit, std::move(cppFilter), + base::BindOnce( + ^(std::vector list) { + const auto publishers = NSArrayFromVector( + &list, ^BraveRewardsPublisherInfo*( + const brave_rewards::mojom::PublisherInfoPtr& info) { + return [[BraveRewardsPublisherInfo alloc] + initWithPublisherInfo:*info]; + }); + dispatch_async(dispatch_get_main_queue(), ^{ + completion(publishers); + }); + })); } }]; } @@ -525,7 +527,7 @@ static const auto kOneDay = faviconURL:(nullable NSURL*)faviconURL publisherBlob:(nullable NSString*)publisherBlob tabId:(uint64_t)tabId { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { if (!URL.absoluteString) { return; } @@ -561,7 +563,7 @@ static const auto kOneDay = blob = base::SysNSStringToUTF8(publisherBlob); } - ledger->GetPublisherActivityFromUrl(tabId, std::move(visitData), blob); + engine->GetPublisherActivityFromUrl(tabId, std::move(visitData), blob); }]; } @@ -572,8 +574,8 @@ static const auto kOneDay = completion(BraveRewardsPublisherStatusNotVerified); return; } - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->RefreshPublisher( + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->RefreshPublisher( base::SysNSStringToUTF8(publisherId), base::BindOnce(^(brave_rewards::mojom::PublisherStatus status) { dispatch_async(dispatch_get_main_queue(), ^{ @@ -587,25 +589,25 @@ static const auto kOneDay = - (void)listRecurringTips: (void (^)(NSArray*))completion { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->GetRecurringTips(base::BindOnce(^( - std::vector list) { - const auto publishers = NSArrayFromVector( - &list, ^BraveRewardsPublisherInfo*( - const brave_rewards::mojom::PublisherInfoPtr& info) { - return - [[BraveRewardsPublisherInfo alloc] initWithPublisherInfo:*info]; + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->GetRecurringTips(base::BindOnce( + ^(std::vector list) { + const auto publishers = NSArrayFromVector( + &list, ^BraveRewardsPublisherInfo*( + const brave_rewards::mojom::PublisherInfoPtr& info) { + return [[BraveRewardsPublisherInfo alloc] + initWithPublisherInfo:*info]; + }); + dispatch_async(dispatch_get_main_queue(), ^{ + completion(publishers); }); - dispatch_async(dispatch_get_main_queue(), ^{ - completion(publishers); - }); - })); + })); }]; } - (void)removeRecurringTipForPublisherWithId:(NSString*)publisherId { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->RemoveRecurringTip( + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->RemoveRecurringTip( base::SysNSStringToUTF8(publisherId), base::BindOnce(^(brave_rewards::mojom::Result result){ // Not Used @@ -632,51 +634,50 @@ static const auto kOneDay = } - (void)updatePendingAndFinishedPromotions:(void (^)())completion { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->GetAllPromotions(base::BindOnce( - ^(base::flat_map map) { - NSMutableArray* promos = [[NSMutableArray alloc] init]; - for (auto it = map.begin(); it != map.end(); ++it) { - if (it->second.get() != nullptr) { - [promos addObject:[[BraveRewardsPromotion alloc] - initWithPromotion:*it->second]]; - } + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->GetAllPromotions(base::BindOnce(^( + base::flat_map map) { + NSMutableArray* promos = [[NSMutableArray alloc] init]; + for (auto it = map.begin(); it != map.end(); ++it) { + if (it->second.get() != nullptr) { + [promos addObject:[[BraveRewardsPromotion alloc] + initWithPromotion:*it->second]]; + } + } + [self.mFinishedPromotions removeAllObjects]; + [self.mPendingPromotions removeAllObjects]; + for (BraveRewardsPromotion* promotion in promos) { + if (promotion.status == BraveRewardsPromotionStatusFinished) { + [self.mFinishedPromotions addObject:promotion]; + } else if (promotion.status == BraveRewardsPromotionStatusActive || + promotion.status == BraveRewardsPromotionStatusAttested) { + [self.mPendingPromotions addObject:promotion]; + } + } + dispatch_async(dispatch_get_main_queue(), ^{ + if (completion) { + completion(); + } + for (RewardsObserver* observer in [self.observers copy]) { + if (observer.promotionsAdded) { + observer.promotionsAdded(self.pendingPromotions); } - [self.mFinishedPromotions removeAllObjects]; - [self.mPendingPromotions removeAllObjects]; - for (BraveRewardsPromotion* promotion in promos) { - if (promotion.status == BraveRewardsPromotionStatusFinished) { - [self.mFinishedPromotions addObject:promotion]; - } else if (promotion.status == BraveRewardsPromotionStatusActive || - promotion.status == - BraveRewardsPromotionStatusAttested) { - [self.mPendingPromotions addObject:promotion]; - } + if (observer.finishedPromotionsAdded) { + observer.finishedPromotionsAdded(self.finishedPromotions); } - dispatch_async(dispatch_get_main_queue(), ^{ - if (completion) { - completion(); - } - for (BraveLedgerObserver* observer in [self.observers copy]) { - if (observer.promotionsAdded) { - observer.promotionsAdded(self.pendingPromotions); - } - if (observer.finishedPromotionsAdded) { - observer.finishedPromotionsAdded(self.finishedPromotions); - } - } - }); - })); + } + }); + })); }]; } - (void)fetchPromotions: (nullable void (^)(NSArray* grants))completion { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->FetchPromotions(base::BindOnce( + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->FetchPromotions(base::BindOnce( ^(brave_rewards::mojom::Result result, std::vector promotions) { - if (result != brave_rewards::mojom::Result::LEDGER_OK) { + if (result != brave_rewards::mojom::Result::OK) { return; } [self updatePendingAndFinishedPromotions:^{ @@ -705,8 +706,8 @@ static const auto kOneDay = } const auto jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->ClaimPromotion( + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->ClaimPromotion( base::SysNSStringToUTF8(promotionId), base::SysNSStringToUTF8(jsonString), base::BindOnce(^(brave_rewards::mojom::Result result, @@ -724,8 +725,8 @@ static const auto kOneDay = completion:(void (^)(BraveRewardsResult result, BraveRewardsPromotion* _Nullable promotion)) completion { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->AttestPromotion( + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->AttestPromotion( base::SysNSStringToUTF8(promotionId), base::SysNSStringToUTF8(solution.JSONPayload), base::BindOnce(^(brave_rewards::mojom::Result result, @@ -741,7 +742,7 @@ static const auto kOneDay = const auto bridgedPromotion = [[BraveRewardsPromotion alloc] initWithPromotion:*promotion]; - if (result == brave_rewards::mojom::Result::LEDGER_OK) { + if (result == brave_rewards::mojom::Result::OK) { [self fetchBalance:nil]; } @@ -750,8 +751,8 @@ static const auto kOneDay = completion(static_cast(result), bridgedPromotion); } - if (result == brave_rewards::mojom::Result::LEDGER_OK) { - for (BraveLedgerObserver* observer in [self.observers copy]) { + if (result == brave_rewards::mojom::Result::OK) { + for (RewardsObserver* observer in [self.observers copy]) { if (observer.promotionClaimed) { observer.promotionClaimed(bridgedPromotion); } @@ -768,7 +769,7 @@ static const auto kOneDay = contribution: (brave_rewards::mojom::ContributionInfoPtr)contribution { // TODO we changed from probi to amount, so from string to double - if (result == brave_rewards::mojom::Result::LEDGER_OK) { + if (result == brave_rewards::mojom::Result::OK) { [self fetchBalance:nil]; } } @@ -777,8 +778,8 @@ static const auto kOneDay = - (void)rewardsInternalInfo: (void (^)(BraveRewardsRewardsInternalsInfo* _Nullable info))completion { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->GetRewardsInternalsInfo( + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->GetRewardsInternalsInfo( base::BindOnce(^(brave_rewards::mojom::RewardsInternalsInfoPtr info) { auto bridgedInfo = info.get() != nullptr ? [[BraveRewardsRewardsInternalsInfo alloc] @@ -794,8 +795,8 @@ static const auto kOneDay = - (void)allContributions: (void (^)(NSArray* contributions)) completion { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->GetAllContributions(base::BindOnce( + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->GetAllContributions(base::BindOnce( ^(std::vector list) { const auto convetedList = NSArrayFromVector( &list, ^BraveRewardsContributionInfo*( @@ -813,8 +814,8 @@ static const auto kOneDay = - (void)fetchAutoContributeProperties: (void (^)(BraveRewardsAutoContributeProperties* _Nullable properties)) completion { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->GetAutoContributeProperties(base::BindOnce( + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->GetAutoContributeProperties(base::BindOnce( ^(brave_rewards::mojom::AutoContributePropertiesPtr props) { auto properties = props.get() != nullptr @@ -838,14 +839,14 @@ static const auto kOneDay = const auto time = [[NSDate date] timeIntervalSince1970]; if (_selectedTabId != selectedTabId) { const auto oldTabId = _selectedTabId; - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->OnHide(oldTabId, time); + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->OnHide(oldTabId, time); }]; } _selectedTabId = selectedTabId; if (_selectedTabId > 0) { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->OnShow(selectedTabId, time); + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->OnShow(selectedTabId, time); }]; } } @@ -856,8 +857,8 @@ static const auto kOneDay = } const auto time = [[NSDate date] timeIntervalSince1970]; - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->OnForeground(self.selectedTabId, time); + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->OnForeground(self.selectedTabId, time); }]; // Check if the last notification check was more than a day ago @@ -872,8 +873,8 @@ static const auto kOneDay = } const auto time = [[NSDate date] timeIntervalSince1970]; - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->OnBackground(self.selectedTabId, time); + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->OnBackground(self.selectedTabId, time); }]; } @@ -883,7 +884,7 @@ static const auto kOneDay = } const auto time = [[NSDate date] timeIntervalSince1970]; - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { GURL parsedUrl(base::SysNSStringToUTF8(url.absoluteString)); url::Origin origin = url::Origin::Create(parsedUrl); const std::string baseDomain = GetDomainAndRegistry( @@ -905,7 +906,7 @@ static const auto kOneDay = data->tab_id = tabId; data->url = publisher_url; - ledger->OnLoad(std::move(data), time); + engine->OnLoad(std::move(data), time); }]; } @@ -917,7 +918,7 @@ static const auto kOneDay = return; } - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { base::flat_map partsMap; const auto urlComponents = [[NSURLComponents alloc] initWithURL:url resolvingAgainstBaseURL:NO]; @@ -939,7 +940,7 @@ static const auto kOneDay = ? base::SysNSStringToUTF8(firstPartyURL.absoluteString) : ""; - ledger->OnXHRLoad(tabId, base::SysNSStringToUTF8(url.absoluteString), + engine->OnXHRLoad(tabId, base::SysNSStringToUTF8(url.absoluteString), partsMap, fpu, ref, std::move(visit)); }]; } @@ -950,52 +951,52 @@ static const auto kOneDay = } const auto time = [[NSDate date] timeIntervalSince1970]; - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->OnUnload(tabId, time); + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->OnUnload(tabId, time); }]; } #pragma mark - Preferences - (void)setMinimumVisitDuration:(int)minimumVisitDuration { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->SetPublisherMinVisitTime(minimumVisitDuration); + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->SetPublisherMinVisitTime(minimumVisitDuration); }]; } - (void)setMinimumNumberOfVisits:(int)minimumNumberOfVisits { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->SetPublisherMinVisits(minimumNumberOfVisits); + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->SetPublisherMinVisits(minimumNumberOfVisits); }]; } - (void)setContributionAmount:(double)contributionAmount { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->SetAutoContributionAmount(contributionAmount); + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->SetAutoContributionAmount(contributionAmount); }]; } - (void)setAutoContributeEnabled:(bool)autoContributeEnabled { - [self postLedgerTask:^(brave_rewards::internal::LedgerImpl* ledger) { - ledger->SetAutoContributeEnabled(autoContributeEnabled); + [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + engine->SetAutoContributeEnabled(autoContributeEnabled); }]; } - (void)setBooleanState:(const std::string&)name value:(bool)value - callback: - (brave_rewards::mojom::LedgerClient::SetBooleanStateCallback) - callback { + callback:(brave_rewards::mojom::RewardsEngineClient:: + SetBooleanStateCallback)callback { const auto key = base::SysUTF8ToNSString(name); self.prefs[key] = [NSNumber numberWithBool:value]; [self savePrefs]; std::move(callback).Run(); } -- (void)booleanState:(const std::string&)name - callback: - (brave_rewards::mojom::LedgerClient::GetBooleanStateCallback) - callback { +- (void) + booleanState:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::GetBooleanStateCallback) + callback { const auto key = base::SysUTF8ToNSString(name); if (![self.prefs objectForKey:key]) { std::move(callback).Run(false); @@ -1006,55 +1007,57 @@ static const auto kOneDay = - (void)setIntegerState:(const std::string&)name value:(int32_t)value - callback: - (brave_rewards::mojom::LedgerClient::SetIntegerStateCallback) - callback { + callback:(brave_rewards::mojom::RewardsEngineClient:: + SetIntegerStateCallback)callback { const auto key = base::SysUTF8ToNSString(name); self.prefs[key] = [NSNumber numberWithInt:value]; [self savePrefs]; std::move(callback).Run(); } -- (void)integerState:(const std::string&)name - callback: - (brave_rewards::mojom::LedgerClient::GetIntegerStateCallback) - callback { +- (void) + integerState:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::GetIntegerStateCallback) + callback { const auto key = base::SysUTF8ToNSString(name); std::move(callback).Run([self.prefs[key] intValue]); } - (void)setDoubleState:(const std::string&)name value:(double)value - callback: - (brave_rewards::mojom::LedgerClient::SetDoubleStateCallback) - callback { + callback:(brave_rewards::mojom::RewardsEngineClient:: + SetDoubleStateCallback)callback { const auto key = base::SysUTF8ToNSString(name); self.prefs[key] = [NSNumber numberWithDouble:value]; [self savePrefs]; std::move(callback).Run(); } -- (void)doubleState:(const std::string&)name - callback:(brave_rewards::mojom::LedgerClient::GetDoubleStateCallback) - callback { +- (void) + doubleState:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::GetDoubleStateCallback) + callback { const auto key = base::SysUTF8ToNSString(name); std::move(callback).Run([self.prefs[key] doubleValue]); } - (void)setStringState:(const std::string&)name value:(const std::string&)value - callback: - (brave_rewards::mojom::LedgerClient::SetStringStateCallback) - callback { + callback:(brave_rewards::mojom::RewardsEngineClient:: + SetStringStateCallback)callback { const auto key = base::SysUTF8ToNSString(name); self.prefs[key] = base::SysUTF8ToNSString(value); [self savePrefs]; std::move(callback).Run(); } -- (void)stringState:(const std::string&)name - callback:(brave_rewards::mojom::LedgerClient::GetStringStateCallback) - callback { +- (void) + stringState:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::GetStringStateCallback) + callback { const auto key = base::SysUTF8ToNSString(name); const auto value = (NSString*)self.prefs[key]; if (!value) { @@ -1064,11 +1067,12 @@ static const auto kOneDay = std::move(callback).Run(base::SysNSStringToUTF8(value)); } -- (void)setInt64State:(const std::string&)name - value:(int64_t)value - callback: - (brave_rewards::mojom::LedgerClient::SetInt64StateCallback) - callback { +- (void) + setInt64State:(const std::string&)name + value:(int64_t)value + callback: + (brave_rewards::mojom::RewardsEngineClient::SetInt64StateCallback) + callback { const auto key = base::SysUTF8ToNSString(name); self.prefs[key] = [NSNumber numberWithLongLong:value]; [self savePrefs]; @@ -1076,35 +1080,38 @@ static const auto kOneDay = } - (void)int64State:(const std::string&)name - callback:(brave_rewards::mojom::LedgerClient::GetInt64StateCallback) - callback { + callback: + (brave_rewards::mojom::RewardsEngineClient::GetInt64StateCallback) + callback { const auto key = base::SysUTF8ToNSString(name); std::move(callback).Run([self.prefs[key] longLongValue]); } - (void)setUint64State:(const std::string&)name value:(uint64_t)value - callback: - (brave_rewards::mojom::LedgerClient::SetUint64StateCallback) - callback { + callback:(brave_rewards::mojom::RewardsEngineClient:: + SetUint64StateCallback)callback { const auto key = base::SysUTF8ToNSString(name); self.prefs[key] = [NSNumber numberWithUnsignedLongLong:value]; [self savePrefs]; std::move(callback).Run(); } -- (void)uint64State:(const std::string&)name - callback:(brave_rewards::mojom::LedgerClient::GetUint64StateCallback) - callback { +- (void) + uint64State:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::GetUint64StateCallback) + callback { const auto key = base::SysUTF8ToNSString(name); std::move(callback).Run([self.prefs[key] unsignedLongLongValue]); } -- (void)setValueState:(const std::string&)name - value:(base::Value)value - callback: - (brave_rewards::mojom::LedgerClient::SetValueStateCallback) - callback { +- (void) + setValueState:(const std::string&)name + value:(base::Value)value + callback: + (brave_rewards::mojom::RewardsEngineClient::SetValueStateCallback) + callback { std::string json; if (base::JSONWriter::Write(value, &json)) { const auto key = base::SysUTF8ToNSString(name); @@ -1115,8 +1122,9 @@ static const auto kOneDay = } - (void)valueState:(const std::string&)name - callback:(brave_rewards::mojom::LedgerClient::GetValueStateCallback) - callback { + callback: + (brave_rewards::mojom::RewardsEngineClient::GetValueStateCallback) + callback { const auto key = base::SysUTF8ToNSString(name); const auto json = (NSString*)self.prefs[key]; if (!json) { @@ -1133,10 +1141,12 @@ static const auto kOneDay = std::move(callback).Run(std::move(*value)); } -- (void)setTimeState:(const std::string&)name - value:(base::Time)value - callback:(brave_rewards::mojom::LedgerClient::SetTimeStateCallback) - callback { +- (void) + setTimeState:(const std::string&)name + value:(base::Time)value + callback: + (brave_rewards::mojom::RewardsEngineClient::SetTimeStateCallback) + callback { const auto key = base::SysUTF8ToNSString(name); self.prefs[key] = @(value.ToDoubleT()); [self savePrefs]; @@ -1144,8 +1154,9 @@ static const auto kOneDay = } - (void)timeState:(const std::string&)name - callback:(brave_rewards::mojom::LedgerClient::GetTimeStateCallback) - callback { + callback: + (brave_rewards::mojom::RewardsEngineClient::GetTimeStateCallback) + callback { const auto key = base::SysUTF8ToNSString(name); std::move(callback).Run( base::Time::FromDoubleT([self.prefs[key] doubleValue])); @@ -1153,7 +1164,8 @@ static const auto kOneDay = - (void)clearState:(const std::string&)name callback: - (brave_rewards::mojom::LedgerClient::ClearStateCallback)callback { + (brave_rewards::mojom::RewardsEngineClient::ClearStateCallback) + callback { const auto key = base::SysUTF8ToNSString(name); [self.prefs removeObjectForKey:key]; [self savePrefs]; @@ -1161,7 +1173,8 @@ static const auto kOneDay = } - (void)isBitFlyerRegion: - (brave_rewards::mojom::LedgerClient::IsBitFlyerRegionCallback)callback { + (brave_rewards::mojom::RewardsEngineClient::IsBitFlyerRegionCallback) + callback { std::move(callback).Run(false); } @@ -1192,25 +1205,27 @@ static const auto kOneDay = #pragma mark - State -- (void)loadLedgerState: - (brave_rewards::mojom::LedgerClient::LoadLedgerStateCallback)callback { +- (void)loadLegacyState: + (brave_rewards::mojom::RewardsEngineClient::LoadLegacyStateCallback) + callback { const auto contents = [self.commonOps loadContentsFromFileWithName:"ledger_state.json"]; if (contents.length() > 0) { - std::move(callback).Run(brave_rewards::mojom::Result::LEDGER_OK, contents); + std::move(callback).Run(brave_rewards::mojom::Result::OK, contents); } else { - std::move(callback).Run(brave_rewards::mojom::Result::NO_LEDGER_STATE, + std::move(callback).Run(brave_rewards::mojom::Result::NO_LEGACY_STATE, contents); } [self startNotificationTimers]; } - (void)loadPublisherState: - (brave_rewards::mojom::LedgerClient::LoadPublisherStateCallback)callback { + (brave_rewards::mojom::RewardsEngineClient::LoadPublisherStateCallback) + callback { const auto contents = [self.commonOps loadContentsFromFileWithName:"publisher_state.json"]; if (contents.length() > 0) { - std::move(callback).Run(brave_rewards::mojom::Result::LEDGER_OK, contents); + std::move(callback).Run(brave_rewards::mojom::Result::OK, contents); } else { std::move(callback).Run(brave_rewards::mojom::Result::NO_PUBLISHER_STATE, contents); @@ -1229,7 +1244,8 @@ static const auto kOneDay = } - (void)loadUrl:(brave_rewards::mojom::UrlRequestPtr)request - callback:(brave_rewards::mojom::LedgerClient::LoadURLCallback)callback { + callback:(brave_rewards::mojom::RewardsEngineClient::LoadURLCallback) + callback { std::map methodMap{ {brave_rewards::mojom::UrlMethod::GET, "GET"}, {brave_rewards::mojom::UrlMethod::POST, "POST"}, @@ -1266,10 +1282,12 @@ static const auto kOneDay = }]; } -- (void)fetchFavIcon:(const std::string&)url - faviconKey:(const std::string&)faviconKey - callback:(brave_rewards::mojom::LedgerClient::FetchFavIconCallback) - callback { +- (void) + fetchFavIcon:(const std::string&)url + faviconKey:(const std::string&)faviconKey + callback: + (brave_rewards::mojom::RewardsEngineClient::FetchFavIconCallback) + callback { std::move(callback).Run(NO, std::string()); } @@ -1298,12 +1316,12 @@ static const auto kOneDay = (brave_rewards::mojom::PublisherInfoPtr)publisher_info windowId:(uint64_t)windowId { if (publisher_info.get() == nullptr || - result != brave_rewards::mojom::Result::LEDGER_OK) { + result != brave_rewards::mojom::Result::OK) { return; } auto info = [[BraveRewardsPublisherInfo alloc] initWithPublisherInfo:*publisher_info]; - for (BraveLedgerObserver* observer in [self.observers copy]) { + for (RewardsObserver* observer in [self.observers copy]) { if (observer.fetchedPanelPublisher) { observer.fetchedPanelPublisher(info, windowId); } @@ -1318,17 +1336,15 @@ static const auto kOneDay = // Not used on iOS } -- (void) - showNotification:(const std::string&)type - args:(std::vector)args - callback: - (brave_rewards::mojom::LedgerClient::ShowNotificationCallback) - callback { +- (void)showNotification:(const std::string&)type + args:(std::vector)args + callback:(brave_rewards::mojom::RewardsEngineClient:: + ShowNotificationCallback)callback { // Not used on iOS } - (void)clientInfo: - (brave_rewards::mojom::LedgerClient::GetClientInfoCallback)callback { + (brave_rewards::mojom::RewardsEngineClient::GetClientInfoCallback)callback { auto info = brave_rewards::mojom::ClientInfo::New(); info->os = brave_rewards::mojom::OperatingSystem::UNDEFINED; info->platform = brave_rewards::mojom::Platform::IOS; @@ -1343,21 +1359,20 @@ static const auto kOneDay = // Not used on iOS } -- (void) - runDbTransaction:(brave_rewards::mojom::DBTransactionPtr)transaction - callback: - (brave_rewards::mojom::LedgerClient::RunDBTransactionCallback) - callback { - __weak BraveLedger* weakSelf = self; +- (void)runDbTransaction:(brave_rewards::mojom::DBTransactionPtr)transaction + callback:(brave_rewards::mojom::RewardsEngineClient:: + RunDBTransactionCallback)callback { + __weak BraveRewardsAPI* weakSelf = self; DCHECK(rewardsDatabase); rewardsDatabase - .AsyncCall(&brave_rewards::internal::LedgerDatabase::RunTransaction) + .AsyncCall(&brave_rewards::internal::RewardsDatabase::RunTransaction) .WithArgs(std::move(transaction)) .Then(base::BindOnce( ^(brave_rewards::internal::RunDBTransactionCallback completion, brave_rewards::mojom::DBCommandResponsePtr response) { - if (weakSelf) + if (weakSelf) { std::move(completion).Run(std::move(response)); + } }, std::move(callback))); } @@ -1367,14 +1382,15 @@ static const auto kOneDay = } - (void)deleteLog: - (brave_rewards::mojom::LedgerClient::DeleteLogCallback)callback { - std::move(callback).Run(brave_rewards::mojom::Result::LEDGER_OK); + (brave_rewards::mojom::RewardsEngineClient::DeleteLogCallback)callback { + std::move(callback).Run(brave_rewards::mojom::Result::OK); } -- (void)encryptString:(const std::string&)value - callback: - (brave_rewards::mojom::LedgerClient::EncryptStringCallback) - callback { +- (void) + encryptString:(const std::string&)value + callback: + (brave_rewards::mojom::RewardsEngineClient::EncryptStringCallback) + callback { std::string encrypted_value; if (!OSCrypt::EncryptString(value, &encrypted_value)) { std::move(callback).Run(absl::nullopt); @@ -1383,10 +1399,11 @@ static const auto kOneDay = std::move(callback).Run(absl::make_optional(encrypted_value)); } -- (void)decryptString:(const std::string&)value - callback: - (brave_rewards::mojom::LedgerClient::DecryptStringCallback) - callback { +- (void) + decryptString:(const std::string&)value + callback: + (brave_rewards::mojom::RewardsEngineClient::DecryptStringCallback) + callback { std::string decrypted_value; if (!OSCrypt::DecryptString(value, &decrypted_value)) { std::move(callback).Run(absl::nullopt); diff --git a/ios/browser/api/brave_rewards/headers.gni b/ios/browser/api/brave_rewards/headers.gni new file mode 100644 index 00000000000..fa9d9b6c78f --- /dev/null +++ b/ios/browser/api/brave_rewards/headers.gni @@ -0,0 +1,18 @@ +# Copyright (c) 2023 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at https://mozilla.org/MPL/2.0/. + +rewards_public_headers = [ + "//brave/ios/browser/api/brave_rewards/brave_rewards_api.h", + "//brave/ios/browser/api/brave_rewards/promotion_solution.h", + "//brave/ios/browser/api/brave_rewards/rewards_notification.h", + "//brave/ios/browser/api/brave_rewards/rewards_observer.h", + "$root_gen_dir/brave/ios/browser/api/brave_rewards/rewards.mojom.objc.h", + "$root_gen_dir/brave/ios/browser/api/brave_rewards/rewards_types.mojom.objc.h", +] + +rewards_public_deps = [ + "//brave/ios/browser/api/brave_rewards:rewards_mojom_wrappers", + "//brave/ios/browser/api/brave_rewards:rewards_types_mojom_wrappers", +] diff --git a/ios/browser/api/ledger/promotion_solution.h b/ios/browser/api/brave_rewards/promotion_solution.h similarity index 60% rename from ios/browser/api/ledger/promotion_solution.h rename to ios/browser/api/brave_rewards/promotion_solution.h index dd679872675..411b71c089d 100644 --- a/ios/browser/api/ledger/promotion_solution.h +++ b/ios/browser/api/brave_rewards/promotion_solution.h @@ -1,17 +1,17 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. +/* Copyright (c) 2023 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_IOS_BROWSER_API_LEDGER_PROMOTION_SOLUTION_H_ -#define BRAVE_IOS_BROWSER_API_LEDGER_PROMOTION_SOLUTION_H_ +#ifndef BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_PROMOTION_SOLUTION_H_ +#define BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_PROMOTION_SOLUTION_H_ #import NS_ASSUME_NONNULL_BEGIN /// The solution to claiming a promotion on iOS. Obtain the `nonce` through -/// `[BraveLedger claimPromotion:completion:]` method, and obtain the +/// `[BraveRewards claimPromotion:completion:]` method, and obtain the /// blob and signature from the users keychain OBJC_EXPORT NS_SWIFT_NAME(PromotionSolution) @@ -27,4 +27,4 @@ NS_SWIFT_NAME(PromotionSolution) NS_ASSUME_NONNULL_END -#endif // BRAVE_IOS_BROWSER_API_LEDGER_PROMOTION_SOLUTION_H_ +#endif // BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_PROMOTION_SOLUTION_H_ diff --git a/ios/browser/api/ledger/promotion_solution.mm b/ios/browser/api/brave_rewards/promotion_solution.mm similarity index 85% rename from ios/browser/api/ledger/promotion_solution.mm rename to ios/browser/api/brave_rewards/promotion_solution.mm index 345fc72dbd3..38091fc87f8 100644 --- a/ios/browser/api/ledger/promotion_solution.mm +++ b/ios/browser/api/brave_rewards/promotion_solution.mm @@ -1,12 +1,12 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. +/* Copyright (c) 2023 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ #import "promotion_solution.h" #include "base/logging.h" -#import "ledger.mojom.objc.h" +#import "rewards.mojom.objc.h" #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support." diff --git a/ios/browser/api/brave_rewards/rewards_client_bridge.h b/ios/browser/api/brave_rewards/rewards_client_bridge.h new file mode 100644 index 00000000000..d894d976be5 --- /dev/null +++ b/ios/browser/api/brave_rewards/rewards_client_bridge.h @@ -0,0 +1,166 @@ +/* Copyright (c) 2023 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_REWARDS_CLIENT_BRIDGE_H_ +#define BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_REWARDS_CLIENT_BRIDGE_H_ + +#import +#include +#include +#include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom.h" + +NS_ASSUME_NONNULL_BEGIN + +@protocol RewardsClientBridge +@required + +- (void)loadLegacyState: + (brave_rewards::mojom::RewardsEngineClient::LoadLegacyStateCallback) + callback; +- (void)loadPublisherState: + (brave_rewards::mojom::RewardsEngineClient::LoadPublisherStateCallback) + callback; +- (void)onReconcileComplete:(brave_rewards::mojom::Result)result + contribution: + (brave_rewards::mojom::ContributionInfoPtr)contribution; +- (void)onPanelPublisherInfo:(brave_rewards::mojom::Result)result + publisherInfo: + (brave_rewards::mojom::PublisherInfoPtr)publisherInfo + windowId:(uint64_t)windowId; +- (void) + fetchFavIcon:(const std::string&)url + faviconKey:(const std::string&)faviconKey + callback: + (brave_rewards::mojom::RewardsEngineClient::FetchFavIconCallback) + callback; +- (void)loadUrl:(brave_rewards::mojom::UrlRequestPtr)request + callback: + (brave_rewards::mojom::RewardsEngineClient::LoadURLCallback)callback; +- (void)publisherListNormalized: + (std::vector)list; +- (void)onPublisherRegistryUpdated; +- (void)onPublisherUpdated:(const std::string&)publisherId; +- (void) + booleanState:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::GetBooleanStateCallback) + callback; +- (void)setBooleanState:(const std::string&)name + value:(bool)value + callback:(brave_rewards::mojom::RewardsEngineClient:: + SetBooleanStateCallback)callback; +- (void) + integerState:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::GetIntegerStateCallback) + callback; +- (void)setIntegerState:(const std::string&)name + value:(int32_t)value + callback:(brave_rewards::mojom::RewardsEngineClient:: + SetIntegerStateCallback)callback; +- (void) + doubleState:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::GetDoubleStateCallback) + callback; +- (void)setDoubleState:(const std::string&)name + value:(double)value + callback:(brave_rewards::mojom::RewardsEngineClient:: + SetDoubleStateCallback)callback; +- (void) + stringState:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::GetStringStateCallback) + callback; +- (void)setStringState:(const std::string&)name + value:(const std::string&)value + callback:(brave_rewards::mojom::RewardsEngineClient:: + SetStringStateCallback)callback; +- (void)int64State:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::GetInt64StateCallback) + callback; +- (void) + setInt64State:(const std::string&)name + value:(int64_t)value + callback: + (brave_rewards::mojom::RewardsEngineClient::SetInt64StateCallback) + callback; +- (void) + uint64State:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::GetUint64StateCallback) + callback; +- (void)setUint64State:(const std::string&)name + value:(uint64_t)value + callback:(brave_rewards::mojom::RewardsEngineClient:: + SetUint64StateCallback)callback; +- (void)valueState:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::GetValueStateCallback) + callback; +- (void) + setValueState:(const std::string&)name + value:(base::Value)value + callback: + (brave_rewards::mojom::RewardsEngineClient::SetValueStateCallback) + callback; +- (void)timeState:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::GetTimeStateCallback) + callback; +- (void) + setTimeState:(const std::string&)name + value:(base::Time)value + callback: + (brave_rewards::mojom::RewardsEngineClient::SetTimeStateCallback) + callback; +- (void)clearState:(const std::string&)name + callback: + (brave_rewards::mojom::RewardsEngineClient::ClearStateCallback) + callback; +- (void)isBitFlyerRegion: + (brave_rewards::mojom::RewardsEngineClient::IsBitFlyerRegionCallback) + callback; +- (void)legacyWallet: + (brave_rewards::mojom::RewardsEngineClient::GetLegacyWalletCallback) + callback; +- (void)showNotification:(const std::string&)type + args:(std::vector)args + callback:(brave_rewards::mojom::RewardsEngineClient:: + ShowNotificationCallback)callback; +- (void)clientInfo: + (brave_rewards::mojom::RewardsEngineClient::GetClientInfoCallback)callback; +- (void)unblindedTokensReady; +- (void)reconcileStampReset; +- (void)runDbTransaction:(brave_rewards::mojom::DBTransactionPtr)transaction + callback:(brave_rewards::mojom::RewardsEngineClient:: + RunDBTransactionCallback)callback; +- (void)log:(const std::string&)file + line:(int32_t)line + verboseLevel:(int32_t)verboseLevel + message:(const std::string&)message; +- (void)clearAllNotifications; +- (void)externalWalletConnected; +- (void)externalWalletLoggedOut; +- (void)externalWalletReconnected; +- (void)deleteLog: + (brave_rewards::mojom::RewardsEngineClient::DeleteLogCallback)callback; +- (void) + encryptString:(const std::string&)value + callback: + (brave_rewards::mojom::RewardsEngineClient::EncryptStringCallback) + callback; +- (void) + decryptString:(const std::string&)value + callback: + (brave_rewards::mojom::RewardsEngineClient::DecryptStringCallback) + callback; + +@end + +NS_ASSUME_NONNULL_END + +#endif // BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_REWARDS_CLIENT_BRIDGE_H_ diff --git a/ios/browser/api/ledger/ledger_client_ios.h b/ios/browser/api/brave_rewards/rewards_client_ios.h similarity index 84% rename from ios/browser/api/ledger/ledger_client_ios.h rename to ios/browser/api/brave_rewards/rewards_client_ios.h index a779d0431c7..40ff3585159 100644 --- a/ios/browser/api/ledger/ledger_client_ios.h +++ b/ios/browser/api/brave_rewards/rewards_client_ios.h @@ -1,38 +1,38 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. +/* Copyright (c) 2023 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_IOS_BROWSER_API_LEDGER_LEDGER_CLIENT_IOS_H_ -#define BRAVE_IOS_BROWSER_API_LEDGER_LEDGER_CLIENT_IOS_H_ +#ifndef BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_REWARDS_CLIENT_IOS_H_ +#define BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_REWARDS_CLIENT_IOS_H_ #import #include #include -#include "brave/components/brave_rewards/common/mojom/bat_ledger.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom.h" #include "mojo/public/cpp/bindings/associated_receiver.h" #include "mojo/public/cpp/bindings/associated_remote.h" -@protocol LedgerClientBridge; +@protocol RewardsClientBridge; -class LedgerClientIOS : public brave_rewards::mojom::LedgerClient { +class RewardsClientIOS : public brave_rewards::mojom::RewardsEngineClient { public: - explicit LedgerClientIOS(id bridge); - ~LedgerClientIOS() override; + explicit RewardsClientIOS(id bridge); + ~RewardsClientIOS() override; - mojo::PendingAssociatedRemote + mojo::PendingAssociatedRemote MakeRemote(); private: - __unsafe_unretained id bridge_; - mojo::AssociatedReceiver receiver_; + __unsafe_unretained id bridge_; + mojo::AssociatedReceiver receiver_; void FetchFavIcon(const std::string& url, const std::string& favicon_key, FetchFavIconCallback callback) override; - void LoadLedgerState(LoadLedgerStateCallback callback) override; + void LoadLegacyState(LoadLegacyStateCallback callback) override; void LoadPublisherState(LoadPublisherStateCallback callback) override; void LoadURL(brave_rewards::mojom::UrlRequestPtr request, LoadURLCallback callback) override; @@ -114,4 +114,4 @@ class LedgerClientIOS : public brave_rewards::mojom::LedgerClient { DecryptStringCallback callback) override; }; -#endif // BRAVE_IOS_BROWSER_API_LEDGER_LEDGER_CLIENT_IOS_H_ +#endif // BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_REWARDS_CLIENT_IOS_H_ diff --git a/ios/browser/api/brave_rewards/rewards_client_ios.mm b/ios/browser/api/brave_rewards/rewards_client_ios.mm new file mode 100644 index 00000000000..eb33198682e --- /dev/null +++ b/ios/browser/api/brave_rewards/rewards_client_ios.mm @@ -0,0 +1,201 @@ +/* Copyright (c) 2023 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#import "rewards_client_ios.h" +#include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_database.mojom.h" +#include "brave/components/brave_rewards/common/mojom/rewards_types.mojom.h" +#import "rewards_client_bridge.h" + +#if !defined(__has_feature) || !__has_feature(objc_arc) +#error "This file requires ARC support." +#endif + +// Constructor & Destructor +RewardsClientIOS::RewardsClientIOS(id bridge) + : bridge_(bridge), receiver_(this) {} +RewardsClientIOS::~RewardsClientIOS() { + bridge_ = nil; +} + +mojo::PendingAssociatedRemote +RewardsClientIOS::MakeRemote() { + return receiver_.BindNewEndpointAndPassDedicatedRemote(); +} + +void RewardsClientIOS::FetchFavIcon(const std::string& url, + const std::string& favicon_key, + FetchFavIconCallback callback) { + [bridge_ fetchFavIcon:url + faviconKey:favicon_key + callback:std::move(callback)]; + ; +} +void RewardsClientIOS::LoadLegacyState(LoadLegacyStateCallback callback) { + [bridge_ loadLegacyState:std::move(callback)]; +} +void RewardsClientIOS::LoadPublisherState(LoadPublisherStateCallback callback) { + [bridge_ loadPublisherState:std::move(callback)]; +} +void RewardsClientIOS::LoadURL(brave_rewards::mojom::UrlRequestPtr request, + LoadURLCallback callback) { + [bridge_ loadUrl:std::move(request) callback:std::move(callback)]; +} +void RewardsClientIOS::Log(const std::string& file, + int32_t line, + int32_t verbose_level, + const std::string& message) { + [bridge_ log:file line:line verboseLevel:verbose_level message:message]; +} +void RewardsClientIOS::OnPanelPublisherInfo( + brave_rewards::mojom::Result result, + brave_rewards::mojom::PublisherInfoPtr publisher_info, + uint64_t windowId) { + [bridge_ onPanelPublisherInfo:result + publisherInfo:std::move(publisher_info) + windowId:windowId]; +} +void RewardsClientIOS::OnPublisherRegistryUpdated() { + [bridge_ onPublisherRegistryUpdated]; +} +void RewardsClientIOS::OnPublisherUpdated(const std::string& publisher_id) { + [bridge_ onPublisherUpdated:publisher_id]; +} +void RewardsClientIOS::OnReconcileComplete( + brave_rewards::mojom::Result result, + brave_rewards::mojom::ContributionInfoPtr contribution) { + [bridge_ onReconcileComplete:result contribution:std::move(contribution)]; +} +void RewardsClientIOS::PublisherListNormalized( + std::vector list) { + [bridge_ publisherListNormalized:std::move(list)]; +} +void RewardsClientIOS::SetBooleanState(const std::string& name, + bool value, + SetBooleanStateCallback callback) { + [bridge_ setBooleanState:name value:value callback:std::move(callback)]; +} +void RewardsClientIOS::GetBooleanState(const std::string& name, + GetBooleanStateCallback callback) { + [bridge_ booleanState:name callback:std::move(callback)]; +} +void RewardsClientIOS::SetIntegerState(const std::string& name, + int32_t value, + SetIntegerStateCallback callback) { + [bridge_ setIntegerState:name value:value callback:std::move(callback)]; +} +void RewardsClientIOS::GetIntegerState(const std::string& name, + GetIntegerStateCallback callback) { + [bridge_ integerState:name callback:std::move(callback)]; +} +void RewardsClientIOS::SetDoubleState(const std::string& name, + double value, + SetDoubleStateCallback callback) { + [bridge_ setDoubleState:name value:value callback:std::move(callback)]; +} +void RewardsClientIOS::GetDoubleState(const std::string& name, + GetDoubleStateCallback callback) { + [bridge_ doubleState:name callback:std::move(callback)]; +} +void RewardsClientIOS::SetStringState(const std::string& name, + const std::string& value, + SetStringStateCallback callback) { + [bridge_ setStringState:name value:value callback:std::move(callback)]; +} +void RewardsClientIOS::GetStringState(const std::string& name, + GetStringStateCallback callback) { + [bridge_ stringState:name callback:std::move(callback)]; +} +void RewardsClientIOS::SetInt64State(const std::string& name, + int64_t value, + SetInt64StateCallback callback) { + [bridge_ setInt64State:name value:value callback:std::move(callback)]; +} +void RewardsClientIOS::GetInt64State(const std::string& name, + GetInt64StateCallback callback) { + [bridge_ int64State:name callback:std::move(callback)]; +} +void RewardsClientIOS::SetUint64State(const std::string& name, + uint64_t value, + SetUint64StateCallback callback) { + [bridge_ setUint64State:name value:value callback:std::move(callback)]; +} +void RewardsClientIOS::GetUint64State(const std::string& name, + GetUint64StateCallback callback) { + [bridge_ uint64State:name callback:std::move(callback)]; +} +void RewardsClientIOS::SetValueState(const std::string& name, + base::Value value, + SetValueStateCallback callback) { + [bridge_ setValueState:name + value:std::move(value) + callback:std::move(callback)]; +} +void RewardsClientIOS::GetValueState(const std::string& name, + GetValueStateCallback callback) { + [bridge_ valueState:name callback:std::move(callback)]; +} +void RewardsClientIOS::SetTimeState(const std::string& name, + base::Time value, + SetTimeStateCallback callback) { + [bridge_ setTimeState:name value:value callback:std::move(callback)]; +} +void RewardsClientIOS::GetTimeState(const std::string& name, + GetTimeStateCallback callback) { + [bridge_ timeState:name callback:std::move(callback)]; +} +void RewardsClientIOS::ClearState(const std::string& name, + ClearStateCallback callback) { + [bridge_ clearState:name callback:std::move(callback)]; +} +void RewardsClientIOS::GetLegacyWallet(GetLegacyWalletCallback callback) { + [bridge_ legacyWallet:std::move(callback)]; +} +void RewardsClientIOS::ShowNotification(const std::string& type, + const std::vector& args, + ShowNotificationCallback callback) { + [bridge_ showNotification:type args:args callback:std::move(callback)]; +} +void RewardsClientIOS::IsBitFlyerRegion(IsBitFlyerRegionCallback callback) { + [bridge_ isBitFlyerRegion:std::move(callback)]; +} +void RewardsClientIOS::GetClientInfo(GetClientInfoCallback callback) { + [bridge_ clientInfo:std::move(callback)]; +} +void RewardsClientIOS::UnblindedTokensReady() { + [bridge_ unblindedTokensReady]; +} +void RewardsClientIOS::ReconcileStampReset() { + [bridge_ reconcileStampReset]; +} +void RewardsClientIOS::RunDBTransaction( + brave_rewards::mojom::DBTransactionPtr transaction, + RunDBTransactionCallback callback) { + [bridge_ runDbTransaction:std::move(transaction) + callback:std::move(callback)]; +} +void RewardsClientIOS::ClearAllNotifications() { + [bridge_ clearAllNotifications]; +} +void RewardsClientIOS::ExternalWalletConnected() { + [bridge_ externalWalletConnected]; +} +void RewardsClientIOS::ExternalWalletLoggedOut() { + [bridge_ externalWalletLoggedOut]; +} +void RewardsClientIOS::ExternalWalletReconnected() { + [bridge_ externalWalletReconnected]; +} +void RewardsClientIOS::DeleteLog(DeleteLogCallback callback) { + [bridge_ deleteLog:std::move(callback)]; +} +void RewardsClientIOS::EncryptString(const std::string& value, + EncryptStringCallback callback) { + [bridge_ encryptString:value callback:std::move(callback)]; +} +void RewardsClientIOS::DecryptString(const std::string& value, + DecryptStringCallback callback) { + [bridge_ decryptString:value callback:std::move(callback)]; +} diff --git a/ios/browser/api/ledger/rewards_notification.h b/ios/browser/api/brave_rewards/rewards_notification.h similarity index 77% rename from ios/browser/api/ledger/rewards_notification.h rename to ios/browser/api/brave_rewards/rewards_notification.h index 89f7f5bd7db..db6a5cafbc1 100644 --- a/ios/browser/api/ledger/rewards_notification.h +++ b/ios/browser/api/brave_rewards/rewards_notification.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. +/* Copyright (c) 2023 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_IOS_BROWSER_API_LEDGER_REWARDS_NOTIFICATION_H_ -#define BRAVE_IOS_BROWSER_API_LEDGER_REWARDS_NOTIFICATION_H_ +#ifndef BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_REWARDS_NOTIFICATION_H_ +#define BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_REWARDS_NOTIFICATION_H_ #import @@ -21,7 +21,7 @@ typedef NS_ENUM(NSInteger, RewardsNotificationKind) { RewardsNotificationKindAdsLaunch, // Unused RewardsNotificationKindVerifiedPublisher, // Unused RewardsNotificationKindPendingNotEnoughFunds, // Unused - RewardsNotificationKindGeneralLedger // Comes from ledger + RewardsNotificationKindGeneral } NS_SWIFT_NAME(RewardsNotification.Kind); OBJC_EXPORT @@ -42,4 +42,4 @@ OBJC_EXPORT NS_ASSUME_NONNULL_END -#endif // BRAVE_IOS_BROWSER_API_LEDGER_REWARDS_NOTIFICATION_H_ +#endif // BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_REWARDS_NOTIFICATION_H_ diff --git a/ios/browser/api/ledger/rewards_notification.m b/ios/browser/api/brave_rewards/rewards_notification.m similarity index 92% rename from ios/browser/api/ledger/rewards_notification.m rename to ios/browser/api/brave_rewards/rewards_notification.m index e30339b93e2..ff111d0b14f 100644 --- a/ios/browser/api/ledger/rewards_notification.m +++ b/ios/browser/api/brave_rewards/rewards_notification.m @@ -1,7 +1,7 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. +/* Copyright (c) 2023 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ #import "rewards_notification.h" diff --git a/ios/browser/api/ledger/brave_ledger_observer.h b/ios/browser/api/brave_rewards/rewards_observer.h similarity index 61% rename from ios/browser/api/ledger/brave_ledger_observer.h rename to ios/browser/api/brave_rewards/rewards_observer.h index b267fb33768..3e281735b0a 100644 --- a/ios/browser/api/ledger/brave_ledger_observer.h +++ b/ios/browser/api/brave_rewards/rewards_observer.h @@ -1,30 +1,30 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. +/* Copyright (c) 2023 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_IOS_BROWSER_API_LEDGER_BRAVE_LEDGER_OBSERVER_H_ -#define BRAVE_IOS_BROWSER_API_LEDGER_BRAVE_LEDGER_OBSERVER_H_ +#ifndef BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_REWARDS_OBSERVER_H_ +#define BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_REWARDS_OBSERVER_H_ #import -#import "ledger.mojom.objc.h" +#import "rewards.mojom.objc.h" -@class BraveLedger, RewardsNotification; +@class BraveRewardsAPI, RewardsNotification; NS_ASSUME_NONNULL_BEGIN -/// A ledger observer can get notified when certain actions happen +/// A rewards observer can get notified when certain actions happen /// -/// Creating a LedgerObserver alone will not respond to any events. Set +/// Creating a RewardsObserver alone will not respond to any events. Set /// each closure that you wish to watch based on the data being displayed on /// screen OBJC_EXPORT -NS_SWIFT_NAME(LedgerObserver) -@interface BraveLedgerObserver : NSObject +NS_SWIFT_NAME(RewardsObserver) +@interface RewardsObserver : NSObject -@property(nonatomic, readonly, weak) BraveLedger* ledger; +@property(nonatomic, readonly, weak) BraveRewardsAPI* rewardsAPI; -- (instancetype)initWithLedger:(BraveLedger*)ledger; +- (instancetype)initWithRewardsAPI:(BraveRewardsAPI*)rewardsAPI; /// Executed when the wallet is first initialized @property(nonatomic, copy, nullable) void (^walletInitalized) @@ -52,4 +52,4 @@ NS_SWIFT_NAME(LedgerObserver) NS_ASSUME_NONNULL_END -#endif // BRAVE_IOS_BROWSER_API_LEDGER_BRAVE_LEDGER_OBSERVER_H_ +#endif // BRAVE_IOS_BROWSER_API_BRAVE_REWARDS_REWARDS_OBSERVER_H_ diff --git a/ios/browser/api/brave_rewards/rewards_observer.mm b/ios/browser/api/brave_rewards/rewards_observer.mm new file mode 100644 index 00000000000..7f7bad4bd54 --- /dev/null +++ b/ios/browser/api/brave_rewards/rewards_observer.mm @@ -0,0 +1,26 @@ +/* Copyright (c) 2023 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#import "rewards_observer.h" +#import "brave_rewards_api.h" + +#if !defined(__has_feature) || !__has_feature(objc_arc) +#error "This file requires ARC support." +#endif + +@interface RewardsObserver () +@property(nonatomic, weak) BraveRewardsAPI* rewardsAPI; +@end + +@implementation RewardsObserver + +- (instancetype)initWithRewardsAPI:(BraveRewardsAPI*)rewardsAPI { + if ((self = [super init])) { + self.rewardsAPI = rewardsAPI; + } + return self; +} + +@end diff --git a/ios/browser/api/ledger/brave_ledger_observer.mm b/ios/browser/api/ledger/brave_ledger_observer.mm deleted file mode 100644 index af7dc5d6df2..00000000000 --- a/ios/browser/api/ledger/brave_ledger_observer.mm +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#import "brave_ledger_observer.h" -#import "brave_ledger.h" - -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - -@interface BraveLedgerObserver () -@property(nonatomic, weak) BraveLedger* ledger; -@end - -@implementation BraveLedgerObserver - -- (instancetype)initWithLedger:(BraveLedger*)ledger { - if ((self = [super init])) { - self.ledger = ledger; - } - return self; -} - -@end diff --git a/ios/browser/api/ledger/headers.gni b/ios/browser/api/ledger/headers.gni deleted file mode 100644 index 6ea8c1c923b..00000000000 --- a/ios/browser/api/ledger/headers.gni +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2023 The Brave Authors. All rights reserved. -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at https://mozilla.org/MPL/2.0/. - -ledger_public_headers = [ - "//brave/ios/browser/api/ledger/brave_ledger.h", - "//brave/ios/browser/api/ledger/brave_ledger_observer.h", - "//brave/ios/browser/api/ledger/rewards_notification.h", - "//brave/ios/browser/api/ledger/promotion_solution.h", - "$root_gen_dir/brave/ios/browser/api/ledger/ledger.mojom.objc.h", - "$root_gen_dir/brave/ios/browser/api/ledger/ledger_types.mojom.objc.h", -] - -ledger_public_deps = [ - "//brave/ios/browser/api/ledger:ledger_mojom_wrappers", - "//brave/ios/browser/api/ledger:ledger_types_mojom_wrappers", -] diff --git a/ios/browser/api/ledger/ledger_client_bridge.h b/ios/browser/api/ledger/ledger_client_bridge.h deleted file mode 100644 index bc40c056cc6..00000000000 --- a/ios/browser/api/ledger/ledger_client_bridge.h +++ /dev/null @@ -1,150 +0,0 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_IOS_BROWSER_API_LEDGER_LEDGER_CLIENT_BRIDGE_H_ -#define BRAVE_IOS_BROWSER_API_LEDGER_LEDGER_CLIENT_BRIDGE_H_ - -#import -#include -#include -#include "brave/components/brave_rewards/common/mojom/bat_ledger.mojom.h" - -NS_ASSUME_NONNULL_BEGIN - -@protocol LedgerClientBridge -@required - -- (void)loadLedgerState: - (brave_rewards::mojom::LedgerClient::LoadLedgerStateCallback)callback; -- (void)loadPublisherState: - (brave_rewards::mojom::LedgerClient::LoadPublisherStateCallback)callback; -- (void)onReconcileComplete:(brave_rewards::mojom::Result)result - contribution: - (brave_rewards::mojom::ContributionInfoPtr)contribution; -- (void)onPanelPublisherInfo:(brave_rewards::mojom::Result)result - publisherInfo: - (brave_rewards::mojom::PublisherInfoPtr)publisherInfo - windowId:(uint64_t)windowId; -- (void)fetchFavIcon:(const std::string&)url - faviconKey:(const std::string&)faviconKey - callback:(brave_rewards::mojom::LedgerClient::FetchFavIconCallback) - callback; -- (void)loadUrl:(brave_rewards::mojom::UrlRequestPtr)request - callback:(brave_rewards::mojom::LedgerClient::LoadURLCallback)callback; -- (void)publisherListNormalized: - (std::vector)list; -- (void)onPublisherRegistryUpdated; -- (void)onPublisherUpdated:(const std::string&)publisherId; -- (void)booleanState:(const std::string&)name - callback: - (brave_rewards::mojom::LedgerClient::GetBooleanStateCallback) - callback; -- (void)setBooleanState:(const std::string&)name - value:(bool)value - callback: - (brave_rewards::mojom::LedgerClient::SetBooleanStateCallback) - callback; -- (void)integerState:(const std::string&)name - callback: - (brave_rewards::mojom::LedgerClient::GetIntegerStateCallback) - callback; -- (void)setIntegerState:(const std::string&)name - value:(int32_t)value - callback: - (brave_rewards::mojom::LedgerClient::SetIntegerStateCallback) - callback; -- (void)doubleState:(const std::string&)name - callback:(brave_rewards::mojom::LedgerClient::GetDoubleStateCallback) - callback; -- (void)setDoubleState:(const std::string&)name - value:(double)value - callback: - (brave_rewards::mojom::LedgerClient::SetDoubleStateCallback) - callback; -- (void)stringState:(const std::string&)name - callback:(brave_rewards::mojom::LedgerClient::GetStringStateCallback) - callback; -- (void)setStringState:(const std::string&)name - value:(const std::string&)value - callback: - (brave_rewards::mojom::LedgerClient::SetStringStateCallback) - callback; -- (void)int64State:(const std::string&)name - callback:(brave_rewards::mojom::LedgerClient::GetInt64StateCallback) - callback; -- (void)setInt64State:(const std::string&)name - value:(int64_t)value - callback: - (brave_rewards::mojom::LedgerClient::SetInt64StateCallback) - callback; -- (void)uint64State:(const std::string&)name - callback:(brave_rewards::mojom::LedgerClient::GetUint64StateCallback) - callback; -- (void)setUint64State:(const std::string&)name - value:(uint64_t)value - callback: - (brave_rewards::mojom::LedgerClient::SetUint64StateCallback) - callback; -- (void)valueState:(const std::string&)name - callback:(brave_rewards::mojom::LedgerClient::GetValueStateCallback) - callback; -- (void)setValueState:(const std::string&)name - value:(base::Value)value - callback: - (brave_rewards::mojom::LedgerClient::SetValueStateCallback) - callback; -- (void)timeState:(const std::string&)name - callback: - (brave_rewards::mojom::LedgerClient::GetTimeStateCallback)callback; -- (void)setTimeState:(const std::string&)name - value:(base::Time)value - callback:(brave_rewards::mojom::LedgerClient::SetTimeStateCallback) - callback; -- (void)clearState:(const std::string&)name - callback: - (brave_rewards::mojom::LedgerClient::ClearStateCallback)callback; -- (void)isBitFlyerRegion: - (brave_rewards::mojom::LedgerClient::IsBitFlyerRegionCallback)callback; -- (void)legacyWallet: - (brave_rewards::mojom::LedgerClient::GetLegacyWalletCallback)callback; -- (void) - showNotification:(const std::string&)type - args:(std::vector)args - callback: - (brave_rewards::mojom::LedgerClient::ShowNotificationCallback) - callback; -- (void)clientInfo: - (brave_rewards::mojom::LedgerClient::GetClientInfoCallback)callback; -- (void)unblindedTokensReady; -- (void)reconcileStampReset; -- (void) - runDbTransaction:(brave_rewards::mojom::DBTransactionPtr)transaction - callback: - (brave_rewards::mojom::LedgerClient::RunDBTransactionCallback) - callback; -- (void)log:(const std::string&)file - line:(int32_t)line - verboseLevel:(int32_t)verboseLevel - message:(const std::string&)message; -- (void)clearAllNotifications; -- (void)externalWalletConnected; -- (void)externalWalletLoggedOut; -- (void)externalWalletReconnected; -- (void)deleteLog: - (brave_rewards::mojom::LedgerClient::DeleteLogCallback)callback; -- (void)encryptString:(const std::string&)value - callback: - (brave_rewards::mojom::LedgerClient::EncryptStringCallback) - callback; -- (void)decryptString:(const std::string&)value - callback: - (brave_rewards::mojom::LedgerClient::DecryptStringCallback) - callback; - -@end - -NS_ASSUME_NONNULL_END - -#endif // BRAVE_IOS_BROWSER_API_LEDGER_LEDGER_CLIENT_BRIDGE_H_ diff --git a/ios/browser/api/ledger/ledger_client_ios.mm b/ios/browser/api/ledger/ledger_client_ios.mm deleted file mode 100644 index 2025d1c1d98..00000000000 --- a/ios/browser/api/ledger/ledger_client_ios.mm +++ /dev/null @@ -1,201 +0,0 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#import "ledger_client_ios.h" -#include "brave/components/brave_rewards/common/mojom/ledger.mojom.h" -#include "brave/components/brave_rewards/common/mojom/ledger_database.mojom.h" -#include "brave/components/brave_rewards/common/mojom/ledger_types.mojom.h" -#import "ledger_client_bridge.h" - -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - -// Constructor & Destructor -LedgerClientIOS::LedgerClientIOS(id bridge) - : bridge_(bridge), receiver_(this) {} -LedgerClientIOS::~LedgerClientIOS() { - bridge_ = nil; -} - -mojo::PendingAssociatedRemote -LedgerClientIOS::MakeRemote() { - return receiver_.BindNewEndpointAndPassDedicatedRemote(); -} - -void LedgerClientIOS::FetchFavIcon(const std::string& url, - const std::string& favicon_key, - FetchFavIconCallback callback) { - [bridge_ fetchFavIcon:url - faviconKey:favicon_key - callback:std::move(callback)]; - ; -} -void LedgerClientIOS::LoadLedgerState(LoadLedgerStateCallback callback) { - [bridge_ loadLedgerState:std::move(callback)]; -} -void LedgerClientIOS::LoadPublisherState(LoadPublisherStateCallback callback) { - [bridge_ loadPublisherState:std::move(callback)]; -} -void LedgerClientIOS::LoadURL(brave_rewards::mojom::UrlRequestPtr request, - LoadURLCallback callback) { - [bridge_ loadUrl:std::move(request) callback:std::move(callback)]; -} -void LedgerClientIOS::Log(const std::string& file, - int32_t line, - int32_t verbose_level, - const std::string& message) { - [bridge_ log:file line:line verboseLevel:verbose_level message:message]; -} -void LedgerClientIOS::OnPanelPublisherInfo( - brave_rewards::mojom::Result result, - brave_rewards::mojom::PublisherInfoPtr publisher_info, - uint64_t windowId) { - [bridge_ onPanelPublisherInfo:result - publisherInfo:std::move(publisher_info) - windowId:windowId]; -} -void LedgerClientIOS::OnPublisherRegistryUpdated() { - [bridge_ onPublisherRegistryUpdated]; -} -void LedgerClientIOS::OnPublisherUpdated(const std::string& publisher_id) { - [bridge_ onPublisherUpdated:publisher_id]; -} -void LedgerClientIOS::OnReconcileComplete( - brave_rewards::mojom::Result result, - brave_rewards::mojom::ContributionInfoPtr contribution) { - [bridge_ onReconcileComplete:result contribution:std::move(contribution)]; -} -void LedgerClientIOS::PublisherListNormalized( - std::vector list) { - [bridge_ publisherListNormalized:std::move(list)]; -} -void LedgerClientIOS::SetBooleanState(const std::string& name, - bool value, - SetBooleanStateCallback callback) { - [bridge_ setBooleanState:name value:value callback:std::move(callback)]; -} -void LedgerClientIOS::GetBooleanState(const std::string& name, - GetBooleanStateCallback callback) { - [bridge_ booleanState:name callback:std::move(callback)]; -} -void LedgerClientIOS::SetIntegerState(const std::string& name, - int32_t value, - SetIntegerStateCallback callback) { - [bridge_ setIntegerState:name value:value callback:std::move(callback)]; -} -void LedgerClientIOS::GetIntegerState(const std::string& name, - GetIntegerStateCallback callback) { - [bridge_ integerState:name callback:std::move(callback)]; -} -void LedgerClientIOS::SetDoubleState(const std::string& name, - double value, - SetDoubleStateCallback callback) { - [bridge_ setDoubleState:name value:value callback:std::move(callback)]; -} -void LedgerClientIOS::GetDoubleState(const std::string& name, - GetDoubleStateCallback callback) { - [bridge_ doubleState:name callback:std::move(callback)]; -} -void LedgerClientIOS::SetStringState(const std::string& name, - const std::string& value, - SetStringStateCallback callback) { - [bridge_ setStringState:name value:value callback:std::move(callback)]; -} -void LedgerClientIOS::GetStringState(const std::string& name, - GetStringStateCallback callback) { - [bridge_ stringState:name callback:std::move(callback)]; -} -void LedgerClientIOS::SetInt64State(const std::string& name, - int64_t value, - SetInt64StateCallback callback) { - [bridge_ setInt64State:name value:value callback:std::move(callback)]; -} -void LedgerClientIOS::GetInt64State(const std::string& name, - GetInt64StateCallback callback) { - [bridge_ int64State:name callback:std::move(callback)]; -} -void LedgerClientIOS::SetUint64State(const std::string& name, - uint64_t value, - SetUint64StateCallback callback) { - [bridge_ setUint64State:name value:value callback:std::move(callback)]; -} -void LedgerClientIOS::GetUint64State(const std::string& name, - GetUint64StateCallback callback) { - [bridge_ uint64State:name callback:std::move(callback)]; -} -void LedgerClientIOS::SetValueState(const std::string& name, - base::Value value, - SetValueStateCallback callback) { - [bridge_ setValueState:name - value:std::move(value) - callback:std::move(callback)]; -} -void LedgerClientIOS::GetValueState(const std::string& name, - GetValueStateCallback callback) { - [bridge_ valueState:name callback:std::move(callback)]; -} -void LedgerClientIOS::SetTimeState(const std::string& name, - base::Time value, - SetTimeStateCallback callback) { - [bridge_ setTimeState:name value:value callback:std::move(callback)]; -} -void LedgerClientIOS::GetTimeState(const std::string& name, - GetTimeStateCallback callback) { - [bridge_ timeState:name callback:std::move(callback)]; -} -void LedgerClientIOS::ClearState(const std::string& name, - ClearStateCallback callback) { - [bridge_ clearState:name callback:std::move(callback)]; -} -void LedgerClientIOS::GetLegacyWallet(GetLegacyWalletCallback callback) { - [bridge_ legacyWallet:std::move(callback)]; -} -void LedgerClientIOS::ShowNotification(const std::string& type, - const std::vector& args, - ShowNotificationCallback callback) { - [bridge_ showNotification:type args:args callback:std::move(callback)]; -} -void LedgerClientIOS::IsBitFlyerRegion(IsBitFlyerRegionCallback callback) { - [bridge_ isBitFlyerRegion:std::move(callback)]; -} -void LedgerClientIOS::GetClientInfo(GetClientInfoCallback callback) { - [bridge_ clientInfo:std::move(callback)]; -} -void LedgerClientIOS::UnblindedTokensReady() { - [bridge_ unblindedTokensReady]; -} -void LedgerClientIOS::ReconcileStampReset() { - [bridge_ reconcileStampReset]; -} -void LedgerClientIOS::RunDBTransaction( - brave_rewards::mojom::DBTransactionPtr transaction, - RunDBTransactionCallback callback) { - [bridge_ runDbTransaction:std::move(transaction) - callback:std::move(callback)]; -} -void LedgerClientIOS::ClearAllNotifications() { - [bridge_ clearAllNotifications]; -} -void LedgerClientIOS::ExternalWalletConnected() { - [bridge_ externalWalletConnected]; -} -void LedgerClientIOS::ExternalWalletLoggedOut() { - [bridge_ externalWalletLoggedOut]; -} -void LedgerClientIOS::ExternalWalletReconnected() { - [bridge_ externalWalletReconnected]; -} -void LedgerClientIOS::DeleteLog(DeleteLogCallback callback) { - [bridge_ deleteLog:std::move(callback)]; -} -void LedgerClientIOS::EncryptString(const std::string& value, - EncryptStringCallback callback) { - [bridge_ encryptString:value callback:std::move(callback)]; -} -void LedgerClientIOS::DecryptString(const std::string& value, - DecryptStringCallback callback) { - [bridge_ decryptString:value callback:std::move(callback)]; -} diff --git a/utility/brave_content_utility_client.cc b/utility/brave_content_utility_client.cc index e5a6aeb51d6..a7941691db2 100644 --- a/utility/brave_content_utility_client.cc +++ b/utility/brave_content_utility_client.cc @@ -11,8 +11,8 @@ #include "brave/components/ipfs/buildflags/buildflags.h" #include "brave/components/services/bat_ads/bat_ads_service_impl.h" #include "brave/components/services/bat_ads/public/interfaces/bat_ads.mojom.h" -#include "brave/components/services/bat_ledger/ledger_factory_impl.h" -#include "brave/components/services/bat_ledger/public/interfaces/ledger_factory.mojom.h" +#include "brave/components/services/bat_rewards/public/interfaces/rewards_engine_factory.mojom.h" +#include "brave/components/services/bat_rewards/rewards_engine_factory.h" #include "brave/components/tor/buildflags/buildflags.h" #include "mojo/public/cpp/bindings/service_factory.h" @@ -51,9 +51,10 @@ auto RunTorLauncher(mojo::PendingReceiver receiver) { } #endif -auto RunLedgerFactory( - mojo::PendingReceiver receiver) { - return std::make_unique( +auto RunRewardsEngineFactory( + mojo::PendingReceiver + receiver) { + return std::make_unique( std::move(receiver)); } @@ -81,7 +82,7 @@ void BraveContentUtilityClient::RegisterMainThreadServices( services.Add(RunTorLauncher); #endif - services.Add(RunLedgerFactory); + services.Add(RunRewardsEngineFactory); services.Add(RunBatAdsService); diff --git a/utility/importer/sources.gni b/utility/importer/sources.gni index f619bcb1ceb..da5adba4f21 100644 --- a/utility/importer/sources.gni +++ b/utility/importer/sources.gni @@ -10,7 +10,7 @@ brave_utility_importer_sources = [] brave_utility_importer_deps = [] brave_utility_importer_public_deps = [ "//brave/components/services/bat_ads:lib", - "//brave/components/services/bat_ledger:lib", + "//brave/components/services/bat_rewards:lib", ] if (!is_android) { diff --git a/utility/sources.gni b/utility/sources.gni index ec9cdcbad0f..75c8f7ddc56 100644 --- a/utility/sources.gni +++ b/utility/sources.gni @@ -25,8 +25,8 @@ brave_utility_deps = [ "//brave/components/ipfs/buildflags", "//brave/components/services/bat_ads:lib", "//brave/components/services/bat_ads/public/interfaces", - "//brave/components/services/bat_ledger:lib", - "//brave/components/services/bat_ledger/public/interfaces", + "//brave/components/services/bat_rewards:lib", + "//brave/components/services/bat_rewards/public/interfaces", "//brave/components/tor/buildflags", "//mojo/public/cpp/bindings", ]