From d77ac11da25563202e13b14e10e24093562e3890 Mon Sep 17 00:00:00 2001 From: oisupov Date: Mon, 20 Jun 2022 20:30:44 +0700 Subject: [PATCH] Revert "Use only filecoin mainnet by default" This reverts commit f391b7a03468daede7c6fc3d6eaaadd910398706. --- components/brave_wallet/browser/BUILD.gn | 1 - .../browser/brave_wallet_utils.cc | 63 +++------------ .../brave_wallet/browser/brave_wallet_utils.h | 1 - .../browser/brave_wallet_utils_unittest.cc | 80 ++++++++----------- .../browser/fil_block_tracker_unittest.cc | 6 -- .../browser/fil_nonce_tracker_unittest.cc | 6 -- .../browser/fil_tx_manager_unittest.cc | 5 +- .../browser/fil_tx_state_manager_unittest.cc | 7 -- .../brave_wallet/browser/filecoin_keyring.cc | 7 +- .../browser/json_rpc_service_unittest.cc | 7 -- components/brave_wallet/common/features.cc | 3 - components/brave_wallet/common/features.h | 4 - components/brave_wallet/common/fil_address.cc | 1 - 13 files changed, 47 insertions(+), 144 deletions(-) diff --git a/components/brave_wallet/browser/BUILD.gn b/components/brave_wallet/browser/BUILD.gn index 6115d5bab6d2..6fdd2cf7605a 100644 --- a/components/brave_wallet/browser/BUILD.gn +++ b/components/brave_wallet/browser/BUILD.gn @@ -237,7 +237,6 @@ source_set("hd_keyring") { deps = [ ":transaction", - ":utils", "internal:hd_key", "//base", "//brave/components/brave_wallet/common", diff --git a/components/brave_wallet/browser/brave_wallet_utils.cc b/components/brave_wallet/browser/brave_wallet_utils.cc index e58f114d5e30..e0a8bb4077d4 100644 --- a/components/brave_wallet/browser/brave_wallet_utils.cc +++ b/components/brave_wallet/browser/brave_wallet_utils.cc @@ -17,7 +17,6 @@ #include "base/environment.h" #include "base/feature_list.h" #include "base/logging.h" -#include "base/metrics/field_trial_params.h" #include "base/notreached.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" @@ -248,18 +247,6 @@ const brave_wallet::mojom::NetworkInfo kKnownSolNetworks[] = { nullptr}}; const brave_wallet::mojom::NetworkInfo kKnownFilNetworks[] = { - {brave_wallet::mojom::kFilecoinMainnet, - "Filecoin Mainnet", - {"https://filscan.io/tipset/message-detail"}, - {}, - {"https://api.node.glif.io/rpc/v0"}, - "FIL", - "Filecoin", - 18, - brave_wallet::mojom::CoinType::FIL, - nullptr}}; - -const brave_wallet::mojom::NetworkInfo kKnownFilNetworksWithTestnet[] = { {brave_wallet::mojom::kFilecoinMainnet, "Filecoin Mainnet", {"https://filscan.io/tipset/message-detail"}, @@ -291,27 +278,6 @@ const brave_wallet::mojom::NetworkInfo kKnownFilNetworksWithTestnet[] = { brave_wallet::mojom::CoinType::FIL, nullptr}}; -const std::vector& -GetActualFilNetworksInfo() { - static const base::NoDestructor< - std::vector> - networks_info([] { - std::vector networks_info; - if (IsFilecoinTestnetEnabled()) { - for (const auto& a : kKnownFilNetworksWithTestnet) { - networks_info.push_back(a.Clone()); - } - } else { - for (const auto& a : kKnownFilNetworks) { - networks_info.push_back(a.Clone()); - } - } - return networks_info; - }()); - - return *networks_info; -} - const base::flat_map kInfuraSubdomains = { {brave_wallet::mojom::kMainnetChainId, "mainnet"}, {brave_wallet::mojom::kRinkebyChainId, "rinkeby"}, @@ -468,8 +434,8 @@ mojom::NetworkInfoPtr GetChain(PrefService* prefs, } } } else if (coin == mojom::CoinType::FIL) { - for (const auto& network : GetActualFilNetworksInfo()) { - if (network->chain_id == chain_id) { + for (const auto& network : kKnownFilNetworks) { + if (network.chain_id == chain_id) { return network.Clone(); } } @@ -562,13 +528,6 @@ bool IsFilecoinEnabled() { brave_wallet::features::kBraveWalletFilecoinFeature); } -// This is needed only for unit tests, not to be used in prod. -bool IsFilecoinTestnetEnabled() { - return base::FeatureList::IsEnabled( - brave_wallet::features::kBraveWalletFilecoinFeature) && - brave_wallet::features::kFilecoinTestnetEnabled.Get(); -} - bool IsDappsSupportEnabled() { return base::FeatureList::IsEnabled( brave_wallet::features::kBraveWalletDappsSupportFeature); @@ -932,9 +891,9 @@ GURL GetNetworkURL(PrefService* prefs, } } } else if (coin == mojom::CoinType::FIL) { - for (const auto& network : GetActualFilNetworksInfo()) { - if (network->chain_id == chain_id && network->rpc_urls.size()) { - return GURL(network->rpc_urls.front()); + for (const auto& network : kKnownFilNetworks) { + if (network.chain_id == chain_id && network.rpc_urls.size()) { + return GURL(network.rpc_urls.front()); } } } @@ -957,7 +916,7 @@ std::vector GetAllChains(PrefService* prefs, std::vector GetAllKnownFilChains() { std::vector result; - for (const auto& network : GetActualFilNetworksInfo()) + for (const auto& network : kKnownFilNetworks) result.push_back(network.Clone()); return result; } @@ -981,8 +940,8 @@ std::vector GetAllKnownSolNetworkIds() { std::vector GetAllKnownFilNetworkIds() { std::vector network_ids; - for (const auto& network : GetActualFilNetworksInfo()) { - std::string network_id = GetKnownFilNetworkId(network->chain_id); + for (const auto& network : kKnownFilNetworks) { + std::string network_id = GetKnownFilNetworkId(network.chain_id); if (!network_id.empty()) network_ids.push_back(network_id); } @@ -1044,9 +1003,9 @@ std::string GetKnownFilNetworkId(const std::string& chain_id) { // Separate check for localhost in known networks as it is predefined but // does not have predefined subdomain. if (chain_id == mojom::kLocalhostChainId) { - for (const auto& network : GetActualFilNetworksInfo()) { - if (network->chain_id == chain_id) { - return GURL(network->rpc_urls.front()).spec(); + for (const auto& network : kKnownFilNetworks) { + if (network.chain_id == chain_id) { + return GURL(network.rpc_urls.front()).spec(); } } } diff --git a/components/brave_wallet/browser/brave_wallet_utils.h b/components/brave_wallet/browser/brave_wallet_utils.h index 2d2f9ddba5a8..c4ca157eb770 100644 --- a/components/brave_wallet/browser/brave_wallet_utils.h +++ b/components/brave_wallet/browser/brave_wallet_utils.h @@ -26,7 +26,6 @@ namespace brave_wallet { bool IsNativeWalletEnabled(); bool IsFilecoinEnabled(); -bool IsFilecoinTestnetEnabled(); bool IsSolanaEnabled(); bool IsDappsSupportEnabled(); diff --git a/components/brave_wallet/browser/brave_wallet_utils_unittest.cc b/components/brave_wallet/browser/brave_wallet_utils_unittest.cc index fdb5ec74334d..ee9a8d5af17c 100644 --- a/components/brave_wallet/browser/brave_wallet_utils_unittest.cc +++ b/components/brave_wallet/browser/brave_wallet_utils_unittest.cc @@ -16,7 +16,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/test/gtest_util.h" -#include "base/test/scoped_feature_list.h" #include "base/values.h" #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" #include "brave/components/brave_wallet/browser/brave_wallet_prefs.h" @@ -24,7 +23,6 @@ #include "brave/components/brave_wallet/browser/pref_names.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom-shared.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "brave/components/brave_wallet/common/features.h" #include "brave/components/brave_wallet/common/value_conversion_utils.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/scoped_user_pref_update.h" @@ -59,21 +57,7 @@ void UpdateCustomNetworks(PrefService* prefs, } // namespace -class BraveWalletUtilsUnitTest : public testing::Test { - public: - void SetUp() override { - feature_list_.InitAndEnableFeatureWithParameters( - brave_wallet::features::kBraveWalletFilecoinFeature, - {{brave_wallet::features::kFilecoinTestnetEnabled.name, "true"}}); - } - - ~BraveWalletUtilsUnitTest() override = default; - - private: - base::test::ScopedFeatureList feature_list_; -}; - -TEST_F(BraveWalletUtilsUnitTest, Mnemonic) { +TEST(BraveWalletUtilsUnitTest, Mnemonic) { const struct { const char* entropy; const char* mnemonic; @@ -240,7 +224,7 @@ TEST_F(BraveWalletUtilsUnitTest, Mnemonic) { } } -TEST_F(BraveWalletUtilsUnitTest, MnemonicToSeedAndEntropy) { +TEST(BraveWalletUtilsUnitTest, MnemonicToSeedAndEntropy) { const char* valid_mnemonic = "kingdom possible coast island six arrow fluid spell chunk loud glue " "street"; @@ -259,7 +243,7 @@ TEST_F(BraveWalletUtilsUnitTest, MnemonicToSeedAndEntropy) { EXPECT_EQ(MnemonicToEntropy(""), nullptr); } -TEST_F(BraveWalletUtilsUnitTest, IsValidMnemonic) { +TEST(BraveWalletUtilsUnitTest, IsValidMnemonic) { EXPECT_TRUE( IsValidMnemonic("kingdom possible coast island six arrow fluid " "spell chunk loud glue street")); @@ -270,7 +254,7 @@ TEST_F(BraveWalletUtilsUnitTest, IsValidMnemonic) { EXPECT_FALSE(IsValidMnemonic("")); } -TEST_F(BraveWalletUtilsUnitTest, EncodeString) { +TEST(BraveWalletUtilsUnitTest, EncodeString) { std::string output; EXPECT_TRUE(EncodeString("one", &output)); EXPECT_EQ(output, @@ -305,7 +289,7 @@ TEST_F(BraveWalletUtilsUnitTest, EncodeString) { EXPECT_FALSE(EncodeString(invalid_input, &output)); } -TEST_F(BraveWalletUtilsUnitTest, EncodeStringArray) { +TEST(BraveWalletUtilsUnitTest, EncodeStringArray) { std::vector input({"one", "two", "three"}); std::string output; EXPECT_TRUE(EncodeStringArray(input, &output)); @@ -403,7 +387,7 @@ TEST_F(BraveWalletUtilsUnitTest, EncodeStringArray) { EXPECT_FALSE(EncodeStringArray(input, &output)); } -TEST_F(BraveWalletUtilsUnitTest, DecodeString) { +TEST(BraveWalletUtilsUnitTest, DecodeString) { std::string output; EXPECT_TRUE(DecodeString( 0, @@ -472,7 +456,7 @@ TEST_F(BraveWalletUtilsUnitTest, DecodeString) { &output)); } -TEST_F(BraveWalletUtilsUnitTest, DecodeStringArray) { +TEST(BraveWalletUtilsUnitTest, DecodeStringArray) { std::vector output; EXPECT_TRUE(DecodeStringArray( // count of elements in input array @@ -653,7 +637,7 @@ TEST_F(BraveWalletUtilsUnitTest, DecodeStringArray) { &output)); } -TEST_F(BraveWalletUtilsUnitTest, TransactionReceiptAndValue) { +TEST(BraveWalletUtilsUnitTest, TransactionReceiptAndValue) { TransactionReceipt tx_receipt; tx_receipt.transaction_hash = "0xb903239f8543d04b5dc1ba6579132b143087c68db1b2168786408fcbce568238"; @@ -672,7 +656,7 @@ TEST_F(BraveWalletUtilsUnitTest, TransactionReceiptAndValue) { EXPECT_EQ(tx_receipt, *tx_receipt_from_value); } -TEST_F(BraveWalletUtilsUnitTest, GetAllEthCustomChainsTest) { +TEST(BraveWalletUtilsUnitTest, GetAllEthCustomChainsTest) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletCustomNetworks); ASSERT_TRUE(GetAllEthCustomChains(&prefs).empty()); @@ -697,7 +681,7 @@ TEST_F(BraveWalletUtilsUnitTest, GetAllEthCustomChainsTest) { EXPECT_EQ(chain2, *GetAllEthCustomChains(&prefs)[1]); } -TEST_F(BraveWalletUtilsUnitTest, KnownEthChainExists) { +TEST(BraveWalletUtilsUnitTest, KnownEthChainExists) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletCustomNetworks); prefs.registry()->RegisterBooleanPref(kSupportEip1559OnLocalhostChain, false); @@ -721,7 +705,7 @@ TEST_F(BraveWalletUtilsUnitTest, KnownEthChainExists) { EXPECT_FALSE(KnownEthChainExists(chain.chain_id)); } -TEST_F(BraveWalletUtilsUnitTest, CustomEthChainExists) { +TEST(BraveWalletUtilsUnitTest, CustomEthChainExists) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletCustomNetworks); prefs.registry()->RegisterBooleanPref(kSupportEip1559OnLocalhostChain, false); @@ -750,7 +734,7 @@ TEST_F(BraveWalletUtilsUnitTest, CustomEthChainExists) { EXPECT_EQ(GetAllEthCustomChains(&prefs).size(), 2u); } -TEST_F(BraveWalletUtilsUnitTest, GetAllChainsTest) { +TEST(BraveWalletUtilsUnitTest, GetAllChainsTest) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletCustomNetworks); prefs.registry()->RegisterBooleanPref(kSupportEip1559OnLocalhostChain, false); @@ -805,7 +789,7 @@ TEST_F(BraveWalletUtilsUnitTest, GetAllChainsTest) { EXPECT_EQ(fil_chains[2]->chain_id, mojom::kLocalhostChainId); } -TEST_F(BraveWalletUtilsUnitTest, GetNetworkURLTest) { +TEST(BraveWalletUtilsUnitTest, GetNetworkURLTest) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletCustomNetworks); prefs.registry()->RegisterBooleanPref(kSupportEip1559OnLocalhostChain, false); @@ -839,7 +823,7 @@ TEST_F(BraveWalletUtilsUnitTest, GetNetworkURLTest) { GetNetworkURL(&prefs, chain2.chain_id, mojom::CoinType::ETH)); } -TEST_F(BraveWalletUtilsUnitTest, GetNetworkURLForKnownChains) { +TEST(BraveWalletUtilsUnitTest, GetNetworkURLForKnownChains) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletCustomNetworks); prefs.registry()->RegisterBooleanPref(kSupportEip1559OnLocalhostChain, false); @@ -861,7 +845,7 @@ TEST_F(BraveWalletUtilsUnitTest, GetNetworkURLForKnownChains) { } } -TEST_F(BraveWalletUtilsUnitTest, GetSolanaSubdomainForKnownChainId) { +TEST(BraveWalletUtilsUnitTest, GetSolanaSubdomainForKnownChainId) { for (const auto& chain : GetAllKnownSolChains()) { auto subdomain = GetSolanaSubdomainForKnownChainId(chain->chain_id); bool expected = (chain->chain_id == brave_wallet::mojom::kLocalhostChainId); @@ -869,7 +853,7 @@ TEST_F(BraveWalletUtilsUnitTest, GetSolanaSubdomainForKnownChainId) { } } -TEST_F(BraveWalletUtilsUnitTest, GetFilecoinSubdomainForKnownChainId) { +TEST(BraveWalletUtilsUnitTest, GetFilecoinSubdomainForKnownChainId) { for (const auto& chain : GetAllKnownFilChains()) { auto subdomain = GetFilecoinSubdomainForKnownChainId(chain->chain_id); bool expected = (chain->chain_id == brave_wallet::mojom::kLocalhostChainId); @@ -877,7 +861,7 @@ TEST_F(BraveWalletUtilsUnitTest, GetFilecoinSubdomainForKnownChainId) { } } -TEST_F(BraveWalletUtilsUnitTest, GetKnownEthChain) { +TEST(BraveWalletUtilsUnitTest, GetKnownEthChain) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletCustomNetworks); prefs.registry()->RegisterBooleanPref(kSupportEip1559OnLocalhostChain, false); @@ -908,7 +892,7 @@ TEST_F(BraveWalletUtilsUnitTest, GetKnownEthChain) { EXPECT_EQ(network->data->get_eth_data()->is_eip1559, true); } -TEST_F(BraveWalletUtilsUnitTest, GetCustomEthChain) { +TEST(BraveWalletUtilsUnitTest, GetCustomEthChain) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletCustomNetworks); prefs.registry()->RegisterBooleanPref(kSupportEip1559OnLocalhostChain, false); @@ -929,7 +913,7 @@ TEST_F(BraveWalletUtilsUnitTest, GetCustomEthChain) { EXPECT_EQ(*network, chain); } -TEST_F(BraveWalletUtilsUnitTest, GetChain) { +TEST(BraveWalletUtilsUnitTest, GetChain) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletCustomNetworks); prefs.registry()->RegisterBooleanPref(kSupportEip1559OnLocalhostChain, false); @@ -990,7 +974,7 @@ TEST(BraveWalletUtilsUnitTest, GetAllKnownEthNetworkIds) { EXPECT_EQ(GetAllKnownEthNetworkIds(), expected_network_ids); } -TEST_F(BraveWalletUtilsUnitTest, GetKnownEthNetworkId) { +TEST(BraveWalletUtilsUnitTest, GetKnownEthNetworkId) { EXPECT_EQ(GetKnownEthNetworkId(mojom::kLocalhostChainId), "http://localhost:7545/"); EXPECT_EQ(GetKnownEthNetworkId(mojom::kMainnetChainId), "mainnet"); @@ -1000,7 +984,7 @@ TEST_F(BraveWalletUtilsUnitTest, GetKnownEthNetworkId) { EXPECT_EQ(GetKnownEthNetworkId(mojom::kKovanChainId), "kovan"); } -TEST_F(BraveWalletUtilsUnitTest, GetKnownSolNetworkId) { +TEST(BraveWalletUtilsUnitTest, GetKnownSolNetworkId) { EXPECT_EQ(GetKnownSolNetworkId(mojom::kLocalhostChainId), "http://localhost:8899/"); EXPECT_EQ(GetKnownSolNetworkId(mojom::kSolanaMainnet), "mainnet"); @@ -1008,14 +992,14 @@ TEST_F(BraveWalletUtilsUnitTest, GetKnownSolNetworkId) { EXPECT_EQ(GetKnownSolNetworkId(mojom::kSolanaDevnet), "devnet"); } -TEST_F(BraveWalletUtilsUnitTest, GetKnownFilNetworkId) { +TEST(BraveWalletUtilsUnitTest, GetKnownFilNetworkId) { EXPECT_EQ(GetKnownFilNetworkId(mojom::kLocalhostChainId), "http://localhost:1234/rpc/v0"); EXPECT_EQ(GetKnownFilNetworkId(mojom::kFilecoinMainnet), "mainnet"); EXPECT_EQ(GetKnownFilNetworkId(mojom::kFilecoinTestnet), "testnet"); } -TEST_F(BraveWalletUtilsUnitTest, GetNetworkId) { +TEST(BraveWalletUtilsUnitTest, GetNetworkId) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletCustomNetworks); prefs.registry()->RegisterBooleanPref(kSupportEip1559OnLocalhostChain, false); @@ -1059,7 +1043,7 @@ TEST_F(BraveWalletUtilsUnitTest, GetNetworkId) { "devnet"); } -TEST_F(BraveWalletUtilsUnitTest, AddCustomNetwork) { +TEST(BraveWalletUtilsUnitTest, AddCustomNetwork) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletCustomNetworks); prefs.registry()->RegisterBooleanPref(kSupportEip1559OnLocalhostChain, false); @@ -1116,7 +1100,7 @@ TEST_F(BraveWalletUtilsUnitTest, AddCustomNetwork) { EXPECT_EQ(*asset_list2[0].FindBoolKey("visible"), true); } -TEST_F(BraveWalletUtilsUnitTest, CustomNetworkMatchesKnownNetwork) { +TEST(BraveWalletUtilsUnitTest, CustomNetworkMatchesKnownNetwork) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletCustomNetworks); prefs.registry()->RegisterBooleanPref(kSupportEip1559OnLocalhostChain, false); @@ -1163,7 +1147,7 @@ TEST_F(BraveWalletUtilsUnitTest, CustomNetworkMatchesKnownNetwork) { GURL("https://mainnet-polygon.brave.com/")); } -TEST_F(BraveWalletUtilsUnitTest, RemoveCustomNetwork) { +TEST(BraveWalletUtilsUnitTest, RemoveCustomNetwork) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletCustomNetworks); prefs.registry()->RegisterBooleanPref(kSupportEip1559OnLocalhostChain, false); @@ -1185,7 +1169,7 @@ TEST_F(BraveWalletUtilsUnitTest, RemoveCustomNetwork) { RemoveCustomNetwork(&prefs, "unknown network"); } -TEST_F(BraveWalletUtilsUnitTest, HiddenNetworks) { +TEST(BraveWalletUtilsUnitTest, HiddenNetworks) { TestingPrefServiceSimple prefs; prefs.registry()->RegisterDictionaryPref(kBraveWalletHiddenNetworks); @@ -1216,7 +1200,7 @@ TEST_F(BraveWalletUtilsUnitTest, HiddenNetworks) { ElementsAreArray({})); } -TEST_F(BraveWalletUtilsUnitTest, GetFirstValidChainURL) { +TEST(BraveWalletUtilsUnitTest, GetFirstValidChainURL) { std::vector urls = { "https://goerli.infura.io/v3/${INFURA_API_KEY}", "https://goerli.alchemy.io/v3/${ALCHEMY_API_KEY}", @@ -1238,7 +1222,7 @@ TEST_F(BraveWalletUtilsUnitTest, GetFirstValidChainURL) { EXPECT_EQ(GetFirstValidChainURL(std::vector()), GURL()); } -TEST_F(BraveWalletUtilsUnitTest, GetPrefKeyForCoinType) { +TEST(BraveWalletUtilsUnitTest, GetPrefKeyForCoinType) { auto key = GetPrefKeyForCoinType(mojom::CoinType::ETH); EXPECT_EQ(key, kEthereumPrefKey); key = GetPrefKeyForCoinType(mojom::CoinType::FIL); @@ -1250,7 +1234,7 @@ TEST_F(BraveWalletUtilsUnitTest, GetPrefKeyForCoinType) { GetPrefKeyForCoinType(static_cast(2016))); } -TEST_F(BraveWalletUtilsUnitTest, GetCurrentChainId) { +TEST(BraveWalletUtilsUnitTest, GetCurrentChainId) { sync_preferences::TestingPrefServiceSyncable prefs; RegisterProfilePrefs(prefs.registry()); // default value @@ -1262,7 +1246,7 @@ TEST_F(BraveWalletUtilsUnitTest, GetCurrentChainId) { mojom::kFilecoinMainnet); } -TEST_F(BraveWalletUtilsUnitTest, eTLDPlusOne) { +TEST(BraveWalletUtilsUnitTest, eTLDPlusOne) { EXPECT_EQ("", eTLDPlusOne(url::Origin())); EXPECT_EQ("brave.com", eTLDPlusOne(url::Origin::Create(GURL("https://blog.brave.com")))); @@ -1276,7 +1260,7 @@ TEST_F(BraveWalletUtilsUnitTest, eTLDPlusOne) { EXPECT_EQ("", eTLDPlusOne(url::Origin::Create(GURL("https://github.io")))); } -TEST_F(BraveWalletUtilsUnitTest, MakeOriginInfo) { +TEST(BraveWalletUtilsUnitTest, MakeOriginInfo) { auto origin_info = MakeOriginInfo(url::Origin::Create(GURL("https://blog.brave.com:443"))); EXPECT_EQ(url::Origin::Create(GURL("https://blog.brave.com")), diff --git a/components/brave_wallet/browser/fil_block_tracker_unittest.cc b/components/brave_wallet/browser/fil_block_tracker_unittest.cc index 8091425887f1..3c6093f015c2 100644 --- a/components/brave_wallet/browser/fil_block_tracker_unittest.cc +++ b/components/brave_wallet/browser/fil_block_tracker_unittest.cc @@ -9,11 +9,9 @@ #include #include "base/test/bind.h" -#include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "brave/components/brave_wallet/browser/brave_wallet_prefs.h" #include "brave/components/brave_wallet/browser/json_rpc_service.h" -#include "brave/components/brave_wallet/common/features.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h" #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" @@ -55,9 +53,6 @@ class FilBlockTrackerUnitTest : public testing::Test { ~FilBlockTrackerUnitTest() override = default; void SetUp() override { - feature_list_.InitAndEnableFeatureWithParameters( - brave_wallet::features::kBraveWalletFilecoinFeature, - {{brave_wallet::features::kFilecoinTestnetEnabled.name, "true"}}); brave_wallet::RegisterProfilePrefs(prefs_.registry()); json_rpc_service_.reset( new JsonRpcService(shared_url_loader_factory_, &prefs_)); @@ -86,7 +81,6 @@ class FilBlockTrackerUnitTest : public testing::Test { } protected: - base::test::ScopedFeatureList feature_list_; uint64_t response_height_ = 0; base::test::TaskEnvironment task_environment_; sync_preferences::TestingPrefServiceSyncable prefs_; diff --git a/components/brave_wallet/browser/fil_nonce_tracker_unittest.cc b/components/brave_wallet/browser/fil_nonce_tracker_unittest.cc index 120f6d9308dc..94f304598997 100644 --- a/components/brave_wallet/browser/fil_nonce_tracker_unittest.cc +++ b/components/brave_wallet/browser/fil_nonce_tracker_unittest.cc @@ -9,7 +9,6 @@ #include "base/strings/string_number_conversions.h" #include "base/test/bind.h" -#include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "brave/components/brave_wallet/browser/brave_wallet_prefs.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" @@ -17,7 +16,6 @@ #include "brave/components/brave_wallet/browser/fil_tx_state_manager.h" #include "brave/components/brave_wallet/browser/json_rpc_service.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "brave/components/brave_wallet/common/features.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h" #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" @@ -36,9 +34,6 @@ class FilNonceTrackerUnitTest : public testing::Test { } void SetUp() override { - feature_list_.InitAndEnableFeatureWithParameters( - brave_wallet::features::kBraveWalletFilecoinFeature, - {{brave_wallet::features::kFilecoinTestnetEnabled.name, "true"}}); brave_wallet::RegisterProfilePrefs(prefs_.registry()); } @@ -74,7 +69,6 @@ class FilNonceTrackerUnitTest : public testing::Test { } private: - base::test::ScopedFeatureList feature_list_; std::string GetResultString() const { return "{\"id\":1,\"jsonrpc\":\"2.0\",\"result\":" + base::NumberToString(transaction_count_) + "}"; diff --git a/components/brave_wallet/browser/fil_tx_manager_unittest.cc b/components/brave_wallet/browser/fil_tx_manager_unittest.cc index 0774b82d7a2f..b82219d8b0ba 100644 --- a/components/brave_wallet/browser/fil_tx_manager_unittest.cc +++ b/components/brave_wallet/browser/fil_tx_manager_unittest.cc @@ -70,9 +70,8 @@ class FilTxManagerUnitTest : public testing::Test { &url_loader_factory_)) {} void SetUp() override { - feature_list_.InitAndEnableFeatureWithParameters( - brave_wallet::features::kBraveWalletFilecoinFeature, - {{brave_wallet::features::kFilecoinTestnetEnabled.name, "true"}}); + feature_list_.InitAndEnableFeature( + brave_wallet::features::kBraveWalletFilecoinFeature); brave_wallet::RegisterProfilePrefs(prefs_.registry()); json_rpc_service_.reset( diff --git a/components/brave_wallet/browser/fil_tx_state_manager_unittest.cc b/components/brave_wallet/browser/fil_tx_state_manager_unittest.cc index 4cd79c4f55ce..32c94da98f4a 100644 --- a/components/brave_wallet/browser/fil_tx_state_manager_unittest.cc +++ b/components/brave_wallet/browser/fil_tx_state_manager_unittest.cc @@ -9,14 +9,12 @@ #include #include "base/test/bind.h" -#include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "brave/components/brave_wallet/browser/brave_wallet_prefs.h" #include "brave/components/brave_wallet/browser/fil_transaction.h" #include "brave/components/brave_wallet/browser/fil_tx_meta.h" #include "brave/components/brave_wallet/browser/json_rpc_service.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "brave/components/brave_wallet/common/features.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" #include "services/network/test/test_url_loader_factory.h" @@ -35,10 +33,6 @@ class FilTxStateManagerUnitTest : public testing::Test { protected: void SetUp() override { - feature_list_.InitAndEnableFeatureWithParameters( - brave_wallet::features::kBraveWalletFilecoinFeature, - {{brave_wallet::features::kFilecoinTestnetEnabled.name, "true"}}); - brave_wallet::RegisterProfilePrefs(prefs_.registry()); json_rpc_service_.reset( new JsonRpcService(shared_url_loader_factory_, GetPrefs())); @@ -52,7 +46,6 @@ class FilTxStateManagerUnitTest : public testing::Test { PrefService* GetPrefs() { return &prefs_; } - base::test::ScopedFeatureList feature_list_; base::test::TaskEnvironment task_environment_; network::TestURLLoaderFactory url_loader_factory_; scoped_refptr shared_url_loader_factory_; diff --git a/components/brave_wallet/browser/filecoin_keyring.cc b/components/brave_wallet/browser/filecoin_keyring.cc index 56e6fa12e24e..2c664ba60776 100644 --- a/components/brave_wallet/browser/filecoin_keyring.cc +++ b/components/brave_wallet/browser/filecoin_keyring.cc @@ -185,13 +185,10 @@ std::string FilecoinKeyring::GetAddressInternal(HDKeyBase* hd_key_base) const { if (!hd_key_base) return std::string(); HDKey* hd_key = static_cast(hd_key_base); - // TODO(cypt4): Get network from settings. + // TODO(spylogsster): Get network from settings. return FilAddress::FromUncompressedPublicKey( hd_key->GetUncompressedPublicKey(), - mojom::FilecoinAddressProtocol::SECP256K1, - // See description of IsFilecoinTestnetEnabled - IsFilecoinTestnetEnabled() ? mojom::kFilecoinTestnet - : mojom::kFilecoinMainnet) + mojom::FilecoinAddressProtocol::SECP256K1, mojom::kFilecoinTestnet) .EncodeAsString(); } diff --git a/components/brave_wallet/browser/json_rpc_service_unittest.cc b/components/brave_wallet/browser/json_rpc_service_unittest.cc index e156eeda5f72..a61319a790f5 100644 --- a/components/brave_wallet/browser/json_rpc_service_unittest.cc +++ b/components/brave_wallet/browser/json_rpc_service_unittest.cc @@ -17,7 +17,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" -#include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/values.h" #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" @@ -29,7 +28,6 @@ #include "brave/components/brave_wallet/browser/pref_names.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom-shared.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "brave/components/brave_wallet/common/features.h" #include "brave/components/brave_wallet/common/hash_utils.h" #include "brave/components/brave_wallet/common/value_conversion_utils.h" #include "brave/components/constants/brave_services_key.h" @@ -311,10 +309,6 @@ class JsonRpcServiceUnitTest : public testing::Test { : shared_url_loader_factory_( base::MakeRefCounted( &url_loader_factory_)) { - feature_list_.InitAndEnableFeatureWithParameters( - brave_wallet::features::kBraveWalletFilecoinFeature, - {{brave_wallet::features::kFilecoinTestnetEnabled.name, "true"}}); - url_loader_factory_.SetInterceptor(base::BindLambdaForTesting( [&](const network::ResourceRequest& request) { url_loader_factory_.ClearResponses(); @@ -952,7 +946,6 @@ class JsonRpcServiceUnitTest : public testing::Test { network::TestURLLoaderFactory url_loader_factory_; private: - base::test::ScopedFeatureList feature_list_; base::test::TaskEnvironment task_environment_; sync_preferences::TestingPrefServiceSyncable prefs_; scoped_refptr shared_url_loader_factory_; diff --git a/components/brave_wallet/common/features.cc b/components/brave_wallet/common/features.cc index 90e73d808f51..3388b46f155a 100644 --- a/components/brave_wallet/common/features.cc +++ b/components/brave_wallet/common/features.cc @@ -40,8 +40,5 @@ const base::Feature kBraveWalletSolanaProviderFeature{ const base::Feature kBraveWalletDappsSupportFeature{ "BraveWalletDappsSupport", base::FEATURE_ENABLED_BY_DEFAULT}; -const base::FeatureParam kFilecoinTestnetEnabled = { - &kBraveWalletFilecoinFeature, "filecoin_testnet_enabled", false}; - } // namespace features } // namespace brave_wallet diff --git a/components/brave_wallet/common/features.h b/components/brave_wallet/common/features.h index 098721d9d1c2..bc31735a54cf 100644 --- a/components/brave_wallet/common/features.h +++ b/components/brave_wallet/common/features.h @@ -6,8 +6,6 @@ #ifndef BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_FEATURES_H_ #define BRAVE_COMPONENTS_BRAVE_WALLET_COMMON_FEATURES_H_ -#include "base/metrics/field_trial_params.h" - namespace base { struct Feature; } // namespace base @@ -21,8 +19,6 @@ extern const base::Feature kBraveWalletSolanaFeature; extern const base::Feature kBraveWalletSolanaProviderFeature; extern const base::Feature kBraveWalletDappsSupportFeature; -extern const base::FeatureParam kFilecoinTestnetEnabled; - } // namespace features } // namespace brave_wallet diff --git a/components/brave_wallet/common/fil_address.cc b/components/brave_wallet/common/fil_address.cc index 3d20018c3e47..0cbf5d12451c 100644 --- a/components/brave_wallet/common/fil_address.cc +++ b/components/brave_wallet/common/fil_address.cc @@ -9,7 +9,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "brave/components/brave_wallet/common/features.h" #include "brave/third_party/argon2/src/src/blake2/blake2.h" #include "components/base32/base32.h"