Skip to content

Commit 56577af

Browse files
committed
chore: drop unused Default*URL network fields
DefaultRPCURL/DefaultFallbackURL/DefaultFallbackURL2 were only ever populated by the removed embedded-proxy path and are read nowhere, so drop them from the Network struct and the assertions that checked they stayed empty.
1 parent fe52f62 commit 56577af

3 files changed

Lines changed: 0 additions & 14 deletions

File tree

internal/rpc/network/network_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,6 @@ func (s *NetworkManagerTestSuite) TestLegacyFieldPopulation() {
236236
s.Equal("https://direct2.ethereum.io", network.OriginalFallbackURL)
237237
s.Equal("https://user1.ethereum.io", network.RPCURL)
238238
s.Equal("https://user2.ethereum.io", network.FallbackURL)
239-
s.Empty(network.DefaultRPCURL)
240-
s.Empty(network.DefaultFallbackURL)
241-
s.Empty(network.DefaultFallbackURL2)
242239
}
243240

244241
func (s *NetworkManagerTestSuite) TestLegacyFieldPopulationWithoutUserProviders() {
@@ -268,9 +265,6 @@ func (s *NetworkManagerTestSuite) TestLegacyFieldPopulationWithoutUserProviders(
268265
s.Empty(network.OriginalFallbackURL) // No second EmbeddedDirect provider
269266
s.Equal("https://direct1.sepolia.io", network.RPCURL) // Defaults to OriginalRPCURL
270267
s.Empty(network.FallbackURL) // Defaults to OriginalFallbackURL, which is empty
271-
s.Empty(network.DefaultRPCURL)
272-
s.Empty(network.DefaultFallbackURL)
273-
s.Empty(network.DefaultFallbackURL2)
274268
}
275269

276270
func (s *NetworkManagerTestSuite) TestUpsertNetwork() {

params/network_config.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ type Network struct {
6767

6868
// Deprecated fields (kept for backward compatibility)
6969
// FIXME: Removal of deprecated fields in integration PR https://github.com/status-im/status-go/pull/6178
70-
DefaultRPCURL string `json:"defaultRpcUrl" validate:"omitempty,url"` // Deprecated: proxy rpc url
71-
DefaultFallbackURL string `json:"defaultFallbackURL" validate:"omitempty,url"` // Deprecated: proxy fallback url
72-
DefaultFallbackURL2 string `json:"defaultFallbackURL2" validate:"omitempty,url"` // Deprecated: second proxy fallback url
7370
RPCURL string `json:"rpcUrl" validate:"omitempty,url"` // Deprecated: direct rpc url
7471
OriginalRPCURL string `json:"originalRpcUrl" validate:"omitempty,url"` // Deprecated: direct rpc url if user overrides RPCURL
7572
FallbackURL string `json:"fallbackURL" validate:"omitempty,url"` // Deprecated

params/networkdefaults/default_networks_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,6 @@ func TestBuildDefaultNetworks(t *testing.T) {
6464
}
6565
require.NoError(t, err)
6666

67-
// legacy default proxy fields are no longer populated
68-
require.Empty(t, n.DefaultRPCURL)
69-
require.Empty(t, n.DefaultFallbackURL)
70-
require.Empty(t, n.DefaultFallbackURL2)
71-
7267
// check fallback options
7368
if strings.Contains(n.RPCURL, "infura.io") {
7469
require.True(t, strings.Contains(n.RPCURL, infuraToken.Reveal()))

0 commit comments

Comments
 (0)