Skip to content

Commit

Permalink
chore_: tests fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@dlipicar
dlipicar committed Feb 4, 2025
1 parent 0494fff commit 2ee1371
Show file tree
Hide file tree
Showing 13 changed files with 192 additions and 203 deletions.
17 changes: 9 additions & 8 deletions api/backend_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

gethcrypto "github.com/ethereum/go-ethereum/crypto"

"github.com/status-im/status-go/api/common"
"github.com/status-im/status-go/appdatabase"
"github.com/status-im/status-go/connection"
"github.com/status-im/status-go/eth-node/crypto"
Expand Down Expand Up @@ -1583,14 +1584,14 @@ func TestWalletConfigOnLoginAccount(t *testing.T) {
}

require.Equal(t, b.config.WalletConfig.InfuraAPIKey, infuraToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[MainnetChainID], alchemyEthereumMainnetToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[SepoliaChainID], alchemyEthereumSepoliaToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[ArbitrumChainID], alchemyArbitrumMainnetToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[ArbitrumSepoliaChainID], alchemyArbitrumSepoliaToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[OptimismChainID], alchemyOptimismMainnetToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[OptimismSepoliaChainID], alchemyOptimismSepoliaToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[BaseChainID], alchemyBaseMainnetToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[BaseSepoliaChainID], alchemyBaseSepoliaToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[common.MainnetChainID], alchemyEthereumMainnetToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[common.SepoliaChainID], alchemyEthereumSepoliaToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[common.ArbitrumChainID], alchemyArbitrumMainnetToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[common.ArbitrumSepoliaChainID], alchemyArbitrumSepoliaToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[common.OptimismChainID], alchemyOptimismMainnetToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[common.OptimismSepoliaChainID], alchemyOptimismSepoliaToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[common.BaseChainID], alchemyBaseMainnetToken)
require.Equal(t, b.config.WalletConfig.AlchemyAPIKeys[common.BaseSepoliaChainID], alchemyBaseSepoliaToken)
require.Equal(t, b.config.WalletConfig.RaribleMainnetAPIKey, raribleMainnetAPIKey)
require.Equal(t, b.config.WalletConfig.RaribleTestnetAPIKey, raribleTestnetAPIKey)

Expand Down
12 changes: 12 additions & 0 deletions api/common/const.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package common

const (
MainnetChainID uint64 = 1
SepoliaChainID uint64 = 11155111
OptimismChainID uint64 = 10
OptimismSepoliaChainID uint64 = 11155420
ArbitrumChainID uint64 = 42161
ArbitrumSepoliaChainID uint64 = 421614
BaseChainID uint64 = 8453
BaseSepoliaChainID uint64 = 84532
)
46 changes: 17 additions & 29 deletions api/default_networks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,12 @@ package api
import (
"fmt"

"github.com/status-im/status-go/api/common"
"github.com/status-im/status-go/params"
"github.com/status-im/status-go/params/networkhelper"
"github.com/status-im/status-go/protocol/requests"
)

const (
MainnetChainID uint64 = 1
SepoliaChainID uint64 = 11155111
OptimismChainID uint64 = 10
OptimismSepoliaChainID uint64 = 11155420
ArbitrumChainID uint64 = 42161
ArbitrumSepoliaChainID uint64 = 421614
BaseChainID uint64 = 8453
BaseSepoliaChainID uint64 = 84532
sntSymbol = "SNT"
sttSymbol = "STT"
)

// ProviderID represents the internal ID of a blockchain provider
type ProviderID = string

Expand All @@ -41,7 +29,7 @@ func proxyUrl(stageName, provider, chainName, networkName string) string {
}

func mainnet(stageName string) params.Network {
const chainID = MainnetChainID
const chainID = common.MainnetChainID
const chainName = "ethereum"
const networkName = "mainnet"

Expand Down Expand Up @@ -69,14 +57,14 @@ func mainnet(stageName string) params.Network {
IsTest: false,
Layer: 1,
Enabled: true,
RelatedChainID: SepoliaChainID,
RelatedChainID: common.SepoliaChainID,
IsActive: true,
IsDeactivatable: false,
}
}

func sepolia(stageName string) params.Network {
const chainID = SepoliaChainID
const chainID = common.SepoliaChainID
const chainName = "ethereum"
const networkName = "sepolia"

Expand Down Expand Up @@ -104,14 +92,14 @@ func sepolia(stageName string) params.Network {
IsTest: true,
Layer: 1,
Enabled: true,
RelatedChainID: MainnetChainID,
RelatedChainID: common.MainnetChainID,
IsActive: true,
IsDeactivatable: false,
}
}

func optimism(stageName string) params.Network {
const chainID = OptimismChainID
const chainID = common.OptimismChainID
const chainName = "optimism"
const networkName = "mainnet"

Expand Down Expand Up @@ -139,14 +127,14 @@ func optimism(stageName string) params.Network {
IsTest: false,
Layer: 2,
Enabled: true,
RelatedChainID: OptimismSepoliaChainID,
RelatedChainID: common.OptimismSepoliaChainID,
IsActive: true,
IsDeactivatable: true,
}
}

func optimismSepolia(stageName string) params.Network {
const chainID = OptimismSepoliaChainID
const chainID = common.OptimismSepoliaChainID
const chainName = "optimism"
const networkName = "sepolia"

Expand Down Expand Up @@ -174,14 +162,14 @@ func optimismSepolia(stageName string) params.Network {
IsTest: true,
Layer: 2,
Enabled: false,
RelatedChainID: OptimismChainID,
RelatedChainID: common.OptimismChainID,
IsActive: true,
IsDeactivatable: true,
}
}

func arbitrum(stageName string) params.Network {
const chainID = ArbitrumChainID
const chainID = common.ArbitrumChainID
const chainName = "arbitrum"
const networkName = "mainnet"

Expand Down Expand Up @@ -209,14 +197,14 @@ func arbitrum(stageName string) params.Network {
IsTest: false,
Layer: 2,
Enabled: true,
RelatedChainID: ArbitrumSepoliaChainID,
RelatedChainID: common.ArbitrumSepoliaChainID,
IsActive: true,
IsDeactivatable: true,
}
}

func arbitrumSepolia(stageName string) params.Network {
const chainID = ArbitrumSepoliaChainID
const chainID = common.ArbitrumSepoliaChainID
const chainName = "arbitrum"
const networkName = "sepolia"

Expand Down Expand Up @@ -244,14 +232,14 @@ func arbitrumSepolia(stageName string) params.Network {
IsTest: true,
Layer: 2,
Enabled: false,
RelatedChainID: ArbitrumChainID,
RelatedChainID: common.ArbitrumChainID,
IsActive: true,
IsDeactivatable: true,
}
}

func base(stageName string) params.Network {
const chainID = BaseChainID
const chainID = common.BaseChainID
const chainName = "base"
const networkName = "mainnet"

Expand Down Expand Up @@ -279,13 +267,13 @@ func base(stageName string) params.Network {
IsTest: false,
Layer: 2,
Enabled: true,
RelatedChainID: BaseSepoliaChainID,
RelatedChainID: common.BaseSepoliaChainID,
IsActive: true,
IsDeactivatable: true,
}
}
func baseSepolia(stageName string) params.Network {
const chainID = BaseSepoliaChainID
const chainID = common.BaseSepoliaChainID
const chainName = "base"
const networkName = "sepolia"

Expand Down Expand Up @@ -313,7 +301,7 @@ func baseSepolia(stageName string) params.Network {
IsTest: true,
Layer: 2,
Enabled: false,
RelatedChainID: BaseChainID,
RelatedChainID: common.BaseChainID,
IsActive: true,
IsDeactivatable: true,
}
Expand Down
17 changes: 9 additions & 8 deletions api/default_networks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"strings"
"testing"

"github.com/status-im/status-go/api/common"
"github.com/status-im/status-go/params"

"github.com/pkg/errors"
Expand All @@ -30,14 +31,14 @@ func TestBuildDefaultNetworks(t *testing.T) {
for _, n := range actualNetworks {
var err error
switch n.ChainID {
case MainnetChainID:
case SepoliaChainID:
case OptimismChainID:
case OptimismSepoliaChainID:
case ArbitrumChainID:
case ArbitrumSepoliaChainID:
case BaseChainID:
case BaseSepoliaChainID:
case common.MainnetChainID:
case common.SepoliaChainID:
case common.OptimismChainID:
case common.OptimismSepoliaChainID:
case common.ArbitrumChainID:
case common.ArbitrumSepoliaChainID:
case common.BaseChainID:
case common.BaseSepoliaChainID:
default:
err = errors.Errorf("unexpected chain id: %d", n.ChainID)
}
Expand Down
17 changes: 9 additions & 8 deletions api/defaults.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"path/filepath"

"github.com/status-im/status-go/account/generator"
"github.com/status-im/status-go/api/common"
"github.com/status-im/status-go/eth-node/types"
"github.com/status-im/status-go/multiaccounts/settings"
"github.com/status-im/status-go/params"
Expand Down Expand Up @@ -199,28 +200,28 @@ func buildWalletConfig(request *requests.WalletSecretsConfig, statusProxyEnabled
}

if request.AlchemyEthereumMainnetToken != "" {
walletConfig.AlchemyAPIKeys[MainnetChainID] = request.AlchemyEthereumMainnetToken
walletConfig.AlchemyAPIKeys[common.MainnetChainID] = request.AlchemyEthereumMainnetToken
}
if request.AlchemyEthereumSepoliaToken != "" {
walletConfig.AlchemyAPIKeys[SepoliaChainID] = request.AlchemyEthereumSepoliaToken
walletConfig.AlchemyAPIKeys[common.SepoliaChainID] = request.AlchemyEthereumSepoliaToken
}
if request.AlchemyArbitrumMainnetToken != "" {
walletConfig.AlchemyAPIKeys[ArbitrumChainID] = request.AlchemyArbitrumMainnetToken
walletConfig.AlchemyAPIKeys[common.ArbitrumChainID] = request.AlchemyArbitrumMainnetToken
}
if request.AlchemyArbitrumSepoliaToken != "" {
walletConfig.AlchemyAPIKeys[ArbitrumSepoliaChainID] = request.AlchemyArbitrumSepoliaToken
walletConfig.AlchemyAPIKeys[common.ArbitrumSepoliaChainID] = request.AlchemyArbitrumSepoliaToken
}
if request.AlchemyOptimismMainnetToken != "" {
walletConfig.AlchemyAPIKeys[OptimismChainID] = request.AlchemyOptimismMainnetToken
walletConfig.AlchemyAPIKeys[common.OptimismChainID] = request.AlchemyOptimismMainnetToken
}
if request.AlchemyOptimismSepoliaToken != "" {
walletConfig.AlchemyAPIKeys[OptimismSepoliaChainID] = request.AlchemyOptimismSepoliaToken
walletConfig.AlchemyAPIKeys[common.OptimismSepoliaChainID] = request.AlchemyOptimismSepoliaToken
}
if request.AlchemyBaseMainnetToken != "" {
walletConfig.AlchemyAPIKeys[BaseChainID] = request.AlchemyBaseMainnetToken
walletConfig.AlchemyAPIKeys[common.BaseChainID] = request.AlchemyBaseMainnetToken
}
if request.AlchemyBaseSepoliaToken != "" {
walletConfig.AlchemyAPIKeys[BaseSepoliaChainID] = request.AlchemyBaseSepoliaToken
walletConfig.AlchemyAPIKeys[common.BaseSepoliaChainID] = request.AlchemyBaseSepoliaToken
}
if request.StatusProxyMarketUser != "" {
walletConfig.StatusProxyMarketUser = request.StatusProxyMarketUser
Expand Down
34 changes: 17 additions & 17 deletions params/networkhelper/provider_utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/status-im/status-go/api"
api_common "github.com/status-im/status-go/api/common"
"github.com/status-im/status-go/params"
"github.com/status-im/status-go/params/networkhelper"
"github.com/status-im/status-go/rpc/network/testutil"
Expand Down Expand Up @@ -57,13 +57,13 @@ func TestMergeProvidersPreserveEnabledAndOrder(t *testing.T) {
func TestUpdateEmbeddedProxyProviders(t *testing.T) {
// Arrange: Create a sample list of networks with various provider types
networks := []params.Network{
*testutil.CreateNetwork(api.MainnetChainID, "Ethereum Mainnet", []params.RpcProvider{
*params.NewUserProvider(api.MainnetChainID, "Provider1", "https://userprovider.example.com", true),
*params.NewProxyProvider(api.MainnetChainID, "Provider2", "https://proxyprovider.example.com", true),
*testutil.CreateNetwork(api_common.MainnetChainID, "Ethereum Mainnet", []params.RpcProvider{
*params.NewUserProvider(api_common.MainnetChainID, "Provider1", "https://userprovider.example.com", true),
*params.NewProxyProvider(api_common.MainnetChainID, "Provider2", "https://proxyprovider.example.com", true),
}),
*testutil.CreateNetwork(api.OptimismChainID, "Optimism", []params.RpcProvider{
*params.NewDirectProvider(api.OptimismChainID, "Provider3", "https://directprovider.example.com", true),
*params.NewProxyProvider(api.OptimismChainID, "Provider4", "https://proxyprovider2.example.com", true),
*testutil.CreateNetwork(api_common.OptimismChainID, "Optimism", []params.RpcProvider{
*params.NewDirectProvider(api_common.OptimismChainID, "Provider3", "https://directprovider.example.com", true),
*params.NewProxyProvider(api_common.OptimismChainID, "Provider4", "https://proxyprovider2.example.com", true),
}),
}
networks[0].RpcProviders[1].Enabled = false
Expand Down Expand Up @@ -101,14 +101,14 @@ func TestUpdateEmbeddedProxyProviders(t *testing.T) {
func TestOverrideDirectProvidersAuth(t *testing.T) {
// Create a sample list of networks with various provider types
networks := []params.Network{
*testutil.CreateNetwork(api.MainnetChainID, "Ethereum Mainnet", []params.RpcProvider{
*params.NewUserProvider(api.MainnetChainID, "Provider1", "https://user.example.com/", true),
*params.NewDirectProvider(api.MainnetChainID, "Provider2", "https://mainnet.infura.io/v3/", true),
*params.NewDirectProvider(api.MainnetChainID, "Provider3", "https://eth-archival.rpc.grove.city/v1/", true),
*testutil.CreateNetwork(api_common.MainnetChainID, "Ethereum Mainnet", []params.RpcProvider{
*params.NewUserProvider(api_common.MainnetChainID, "Provider1", "https://user.example.com/", true),
*params.NewDirectProvider(api_common.MainnetChainID, "Provider2", "https://mainnet.infura.io/v3/", true),
*params.NewDirectProvider(api_common.MainnetChainID, "Provider3", "https://eth-archival.rpc.grove.city/v1/", true),
}),
*testutil.CreateNetwork(api.OptimismChainID, "Optimism", []params.RpcProvider{
*params.NewDirectProvider(api.OptimismChainID, "Provider4", "https://optimism.infura.io/v3/", true),
*params.NewDirectProvider(api.OptimismChainID, "Provider5", "https://op.grove.city/v1/", true),
*testutil.CreateNetwork(api_common.OptimismChainID, "Optimism", []params.RpcProvider{
*params.NewDirectProvider(api_common.OptimismChainID, "Provider4", "https://optimism.infura.io/v3/", true),
*params.NewDirectProvider(api_common.OptimismChainID, "Provider5", "https://op.grove.city/v1/", true),
}),
}

Expand Down Expand Up @@ -145,9 +145,9 @@ func TestOverrideDirectProvidersAuth(t *testing.T) {
}

func TestDeepCopyNetwork(t *testing.T) {
originalNetwork := testutil.CreateNetwork(api.MainnetChainID, "Ethereum Mainnet", []params.RpcProvider{
*params.NewUserProvider(api.MainnetChainID, "Provider1", "https://userprovider.example.com", true),
*params.NewDirectProvider(api.MainnetChainID, "Provider2", "https://mainnet.infura.io/v3/", true),
originalNetwork := testutil.CreateNetwork(api_common.MainnetChainID, "Ethereum Mainnet", []params.RpcProvider{
*params.NewUserProvider(api_common.MainnetChainID, "Provider1", "https://userprovider.example.com", true),
*params.NewDirectProvider(api_common.MainnetChainID, "Provider2", "https://mainnet.infura.io/v3/", true),
})

originalNetwork.TokenOverrides = []params.TokenOverride{
Expand Down
Loading

0 comments on commit 2ee1371

Please sign in to comment.