From 1033b61fa7e10c22979c37ac7bd942d2e0fbab16 Mon Sep 17 00:00:00 2001 From: Jocelyn Liu Date: Mon, 13 Jun 2022 21:30:03 -0700 Subject: [PATCH] Enable filecoin by default on Desktop. --- browser/brave_wallet/keyring_service_unittest.cc | 15 +++++++++++---- components/brave_wallet/common/features.cc | 7 ++++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/browser/brave_wallet/keyring_service_unittest.cc b/browser/brave_wallet/keyring_service_unittest.cc index 56c33fc09e71..8909c7fad61c 100644 --- a/browser/brave_wallet/keyring_service_unittest.cc +++ b/browser/brave_wallet/keyring_service_unittest.cc @@ -2681,10 +2681,14 @@ TEST_F(KeyringServiceUnitTest, AddFilecoinAccounts) { KeyringService service(json_rpc_service(), GetPrefs()); { ASSERT_TRUE(CreateWallet(&service, "brave")); - +#if BUILDFLAG(IS_ANDROID) ASSERT_FALSE(AddAccount(&service, "FIL account1", mojom::CoinType::FIL)); +#else + ASSERT_TRUE(AddAccount(&service, "FIL account1", mojom::CoinType::FIL)); +#endif service.Reset(); } + base::test::ScopedFeatureList feature_list{ features::kBraveWalletFilecoinFeature}; @@ -2919,11 +2923,12 @@ TEST_F(KeyringServiceUnitTest, PreCreateEncryptors) { KeyringService service(json_rpc_service(), GetPrefs()); ASSERT_TRUE(CreateWallet(&service, "brave")); EXPECT_NE(service.encryptors_.at(mojom::kDefaultKeyringId), nullptr); - EXPECT_FALSE(service.encryptors_.contains(mojom::kFilecoinKeyringId)); #if BUILDFLAG(IS_ANDROID) EXPECT_FALSE(service.encryptors_.contains(mojom::kSolanaKeyringId)); + EXPECT_FALSE(service.encryptors_.contains(mojom::kFilecoinKeyringId)); #else EXPECT_NE(service.encryptors_.at(mojom::kSolanaKeyringId), nullptr); + EXPECT_NE(service.encryptors_.at(mojom::kFilecoinKeyringId), nullptr); #endif } { @@ -2945,11 +2950,12 @@ TEST_F(KeyringServiceUnitTest, PreCreateEncryptors) { KeyringService service(json_rpc_service(), GetPrefs()); ASSERT_TRUE(CreateWallet(&service, "brave")); EXPECT_NE(service.encryptors_.at(mojom::kDefaultKeyringId), nullptr); - EXPECT_FALSE(service.encryptors_.contains(mojom::kFilecoinKeyringId)); #if BUILDFLAG(IS_ANDROID) EXPECT_FALSE(service.encryptors_.contains(mojom::kSolanaKeyringId)); + EXPECT_FALSE(service.encryptors_.contains(mojom::kFilecoinKeyringId)); #else EXPECT_NE(service.encryptors_.at(mojom::kSolanaKeyringId), nullptr); + EXPECT_NE(service.encryptors_.at(mojom::kFilecoinKeyringId), nullptr); #endif service.Lock(); base::test::ScopedFeatureList feature_list; @@ -2976,11 +2982,12 @@ TEST_F(KeyringServiceUnitTest, PreCreateEncryptors) { ASSERT_TRUE( RestoreWallet(&service, *mnemonic_to_be_restored, "brave", false)); EXPECT_NE(service.encryptors_.at(mojom::kDefaultKeyringId), nullptr); - EXPECT_FALSE(service.encryptors_.contains(mojom::kFilecoinKeyringId)); #if BUILDFLAG(IS_ANDROID) EXPECT_FALSE(service.encryptors_.contains(mojom::kSolanaKeyringId)); + EXPECT_FALSE(service.encryptors_.contains(mojom::kFilecoinKeyringId)); #else EXPECT_NE(service.encryptors_.at(mojom::kSolanaKeyringId), nullptr); + EXPECT_NE(service.encryptors_.at(mojom::kFilecoinKeyringId), nullptr); #endif base::test::ScopedFeatureList feature_list; diff --git a/components/brave_wallet/common/features.cc b/components/brave_wallet/common/features.cc index 5cd9d57d9b47..019f7dfd21ca 100644 --- a/components/brave_wallet/common/features.cc +++ b/components/brave_wallet/common/features.cc @@ -14,7 +14,12 @@ namespace features { const base::Feature kNativeBraveWalletFeature{"NativeBraveWallet", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kBraveWalletFilecoinFeature{ - "BraveWalletFilecoin", base::FEATURE_DISABLED_BY_DEFAULT}; +#if BUILDFLAG(IS_ANDROID) + "BraveWalletFilecoin", base::FEATURE_DISABLED_BY_DEFAULT +#else + "BraveWalletFilecoin", base::FEATURE_ENABLED_BY_DEFAULT +#endif +}; const base::Feature kBraveWalletSolanaFeature{ #if BUILDFLAG(IS_ANDROID)