Skip to content

Commit

Permalink
Revert network changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@lukaszcl
lukaszcl committed Aug 28, 2024
1 parent 49ed8d4 commit 575fdf2
Show file tree
Hide file tree
Showing 2 changed files with 172 additions and 41 deletions.
6 changes: 3 additions & 3 deletions config/network.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ type NetworkConfig struct {
GethReorgConfig ReorgConfig `toml:"GethReorgConfig,omitempty"`
// RpcHttpUrls is the RPC HTTP endpoints for each network,
// key is the network name as declared in selected_networks slice
RpcHttpUrls map[string][]string `toml:"-"`
RpcHttpUrls map[string][]string `toml:"RpcHttpUrls,omitempty"`
// RpcWsUrls is the RPC WS endpoints for each network,
// key is the network name as declared in selected_networks slice
RpcWsUrls map[string][]string `toml:"-"`
RpcWsUrls map[string][]string `toml:"RpcWsUrls,omitempty"`
// WalletKeys is the private keys for the funding wallets for each network,
// key is the network name as declared in selected_networks slice
WalletKeys map[string][]string `toml:"-"`
WalletKeys map[string][]string `toml:"WalletKeys,omitempty"`
}

type ReorgConfig struct {
Expand Down
207 changes: 169 additions & 38 deletions networks/known_networks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,52 +26,186 @@ func TestMustGetSelectedNetworkConfig_MissingSelectedNetwork(t *testing.T) {

func TestMustGetSelectedNetworkConfig_Missing_RpcHttpUrls(t *testing.T) {
networkName := "arbitrum_goerli"
networkCfg := config.NetworkConfig{
SelectedNetworks: []string{networkName},
RpcWsUrls: map[string][]string{
"arbitrum_goerli": {"wss://devnet-1.mt/ABC/rpc/"},
},
WalletKeys: map[string][]string{
"arbitrum_goerli": {"1810868fc221b9f50b5b3e0186d8a5f343f892e51ce12a9e818f936ec0b651ed"},
},
}
testTOML := `
selected_networks = ["arbitrum_goerli"]
[RpcWsUrls]
arbitrum_goerli = ["wss://devnet-1.mt/ABC/rpc/"]
[WalletKeys]
arbitrum_goerli = ["1810868fc221b9f50b5b3e0186d8a5f343f892e51ce12a9e818f936ec0b651ed"]
`

l := logging.GetTestLogger(t)
networkCfg := config.NetworkConfig{}
err := config.BytesToAnyTomlStruct(l, "test", "", &networkCfg, []byte(testTOML))

require.NoError(t, err, "error reading network config")

require.PanicsWithError(t, fmt.Sprintf("no rpc http urls found in config for '%s' network", networkName), func() {
MustGetSelectedNetworkConfig(&networkCfg)
})
}

func TestMustGetSelectedNetworkConfig_Missing_RpcWsUrls(t *testing.T) {
networkName := "arbitrum_goerli"
networkCfg := config.NetworkConfig{
SelectedNetworks: []string{networkName},
RpcHttpUrls: map[string][]string{
"arbitrum_goerli": {"https://devnet-1.mt/ABC/rpc/"},
},
WalletKeys: map[string][]string{
"arbitrum_goerli": {"1810868fc221b9f50b5b3e0186d8a5f343f892e51ce12a9e818f936ec0b651ed"},
},
}
testTOML := `
selected_networks = ["arbitrum_goerli"]
[RpcHttpUrls]
arbitrum_goerli = ["https://devnet-1.mt/ABC/rpc/"]
[WalletKeys]
arbitrum_goerli = ["1810868fc221b9f50b5b3e0186d8a5f343f892e51ce12a9e818f936ec0b651ed"]
`

l := logging.GetTestLogger(t)
networkCfg := config.NetworkConfig{}
err := config.BytesToAnyTomlStruct(l, "test", "", &networkCfg, []byte(testTOML))
require.NoError(t, err, "error reading network config")

require.PanicsWithError(t, fmt.Sprintf("no rpc ws urls found in config for '%s' network", networkName), func() {
MustGetSelectedNetworkConfig(&networkCfg)
})
}

func TestMustGetSelectedNetworkConfig_Missing_WalletKeys(t *testing.T) {
networkName := "arbitrum_goerli"
networkCfg := config.NetworkConfig{
SelectedNetworks: []string{networkName},
RpcWsUrls: map[string][]string{
"arbitrum_goerli": {"wss://devnet-1.mt/ABC/rpc/"},
},
RpcHttpUrls: map[string][]string{
"arbitrum_goerli": {"https://devnet-1.mt/ABC/rpc/"},
},
}
testTOML := `
selected_networks = ["arbitrum_goerli"]
[RpcHttpUrls]
arbitrum_goerli = ["https://devnet-1.mt/ABC/rpc/"]
[RpcWsUrls]
arbitrum_goerli = ["wss://devnet-1.mt/ABC/rpc/"]
`

l := logging.GetTestLogger(t)
networkCfg := config.NetworkConfig{}
err := config.BytesToAnyTomlStruct(l, "test", "", &networkCfg, []byte(testTOML))
require.NoError(t, err, "error reading network config")

require.PanicsWithError(t, fmt.Sprintf("no wallet keys found in config for '%s' network", networkName), func() {
MustGetSelectedNetworkConfig(&networkCfg)
})
}

func TestMustGetSelectedNetworkConfig_DefaultUrlsFromEnv(t *testing.T) {
networkConfigTOML := `
[RpcHttpUrls]
arbitrum_goerli = ["https://devnet-1.mt/ABC/rpc/"]
[RpcWsUrls]
arbitrum_goerli = ["wss://devnet-1.mt/ABC/rpc/"]
`
encoded := base64.StdEncoding.EncodeToString([]byte(networkConfigTOML))
err := os.Setenv("BASE64_NETWORK_CONFIG", encoded)
require.NoError(t, err, "error setting env var")

testTOML := `
selected_networks = ["arbitrum_goerli"]
[WalletKeys]
arbitrum_goerli = ["1810868fc221b9f50b5b3e0186d8a5f343f892e51ce12a9e818f936ec0b651ed"]
`

l := logging.GetTestLogger(t)
networkCfg := config.NetworkConfig{}
err = config.BytesToAnyTomlStruct(l, "test", "", &networkCfg, []byte(testTOML))
require.NoError(t, err, "error reading network config")

networkCfg.UpperCaseNetworkNames()

err = networkCfg.Default()
require.NoError(t, err, "error reading default network config")

err = networkCfg.Validate()
require.NoError(t, err, "error validating network config")

networks := MustGetSelectedNetworkConfig(&networkCfg)
require.Len(t, networks, 1, "should have 1 network")
require.Equal(t, "Arbitrum Goerli", networks[0].Name, "first network should be arbitrum")
require.Equal(t, []string{"wss://devnet-1.mt/ABC/rpc/"}, networks[0].URLs, "should have default ws url for arbitrum")
require.Equal(t, []string{"https://devnet-1.mt/ABC/rpc/"}, networks[0].HTTPURLs, "should have default http url for arbitrum")
require.Equal(t, []string{"1810868fc221b9f50b5b3e0186d8a5f343f892e51ce12a9e818f936ec0b651ed"}, networks[0].PrivateKeys, "should have correct wallet key for arbitrum")
}

func TestMustGetSelectedNetworkConfig_MultipleNetworks(t *testing.T) {
testTOML := `
selected_networks = ["arbitrum_goerli", "optimism_goerli"]
[RpcHttpUrls]
arbitrum_goerli = ["https://devnet-1.mt/ABC/rpc/"]
optimism_goerli = ["https://devnet-1.mt/ABC/rpc/"]
[RpcWsUrls]
arbitrum_goerli = ["wss://devnet-1.mt/ABC/rpc/"]
optimism_goerli = ["wss://devnet-1.mt/ABC/rpc/"]
[WalletKeys]
arbitrum_goerli = ["1810868fc221b9f50b5b3e0186d8a5f343f892e51ce12a9e818f936ec0b651ed"]
optimism_goerli = ["1810868fc221b9f50b5b3e0186d8a5f343f892e51ce12a9e818f936ec0b651ed"]
`

l := logging.GetTestLogger(t)
networkCfg := config.NetworkConfig{}
err := config.BytesToAnyTomlStruct(l, "test", "", &networkCfg, []byte(testTOML))
require.NoError(t, err, "error reading network config")

networks := MustGetSelectedNetworkConfig(&networkCfg)
require.Len(t, networks, 2)
require.Equal(t, "Arbitrum Goerli", networks[0].Name)
require.Equal(t, "Optimism Goerli", networks[1].Name)
}

func TestMustGetSelectedNetworkConfig_DefaultUrlsFromSecret_OverrideOne(t *testing.T) {
networkConfigTOML := `
[RpcHttpUrls]
arbitrum_goerli = ["https://devnet-1.mt/ABC/rpc/"]
optimism_goerli = ["https://devnet-1.mt/ABC/rpc/"]
[RpcWsUrls]
arbitrum_goerli = ["wss://devnet-1.mt/ABC/rpc/"]
optimism_goerli = ["wss://devnet-1.mt/ABC/rpc/"]
`
encoded := base64.StdEncoding.EncodeToString([]byte(networkConfigTOML))
err := os.Setenv("BASE64_NETWORK_CONFIG", encoded)
require.NoError(t, err, "error setting env var")

testTOML := `
selected_networks = ["arbitrum_goerli", "optimism_goerli"]
[RpcHttpUrls]
arbitrum_goerli = ["https://devnet-2.mt/ABC/rpc/"]
[WalletKeys]
arbitrum_goerli = ["1810868fc221b9f50b5b3e0186d8a5f343f892e51ce12a9e818f936ec0b651ed"]
optimism_goerli = ["1810868fc221b9f50b5b3e0186d8a5f343f892e51ce12a9e818f936ec0b651ed"]
`

l := logging.GetTestLogger(t)
networkCfg := config.NetworkConfig{}
err = config.BytesToAnyTomlStruct(l, "test", "", &networkCfg, []byte(testTOML))
require.NoError(t, err, "error reading network config")

networkCfg.UpperCaseNetworkNames()
err = networkCfg.Default()
require.NoError(t, err, "error reading default network config")

networks := MustGetSelectedNetworkConfig(&networkCfg)
require.Len(t, networks, 2, "should have 2 networks")
require.Equal(t, "Arbitrum Goerli", networks[0].Name, "first network should be arbitrum")
require.Equal(t, []string{"wss://devnet-1.mt/ABC/rpc/"}, networks[0].URLs, "should have default ws url for arbitrum")
require.Equal(t, []string{"https://devnet-2.mt/ABC/rpc/"}, networks[0].HTTPURLs, "should have overridden http url for arbitrum")
require.Equal(t, []string{"1810868fc221b9f50b5b3e0186d8a5f343f892e51ce12a9e818f936ec0b651ed"}, networks[0].PrivateKeys, "should have correct wallet key for arbitrum")

require.Equal(t, "Optimism Goerli", networks[1].Name, "first network should be optimism")
require.Equal(t, []string{"wss://devnet-1.mt/ABC/rpc/"}, networks[1].URLs, "should have default ws url for optimism")
require.Equal(t, []string{"https://devnet-1.mt/ABC/rpc/"}, networks[1].HTTPURLs, "should have default http url for optimism")
require.Equal(t, []string{"1810868fc221b9f50b5b3e0186d8a5f343f892e51ce12a9e818f936ec0b651ed"}, networks[1].PrivateKeys, "should have correct wallet key for optimism")
}

func TestNewEVMNetwork(t *testing.T) {
// Set up a mock mapping and revert it after test
originalMappedNetworks := MappedNetworks
Expand Down Expand Up @@ -428,6 +562,13 @@ evm_gas_estimation_buffer = 10000
client_implementation = "Ethereum"
evm_supports_eip1559 = true
evm_default_gas_limit = 6000000
[RpcHttpUrls]
new_network = ["http://localhost:8545"]
[RpcWsUrls]
new_network = ["ws://localhost:8546"]
[WalletKeys]
new_network = ["ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"]
`,
expNetworks: []blockchain.EVMNetwork{newNetwork},
},
Expand All @@ -439,17 +580,7 @@ evm_default_gas_limit = 6000000
err := os.Setenv("BASE64_NETWORK_CONFIG", encoded)
require.NoError(t, err, "error setting env var")

networkCfg := &config.NetworkConfig{
RpcHttpUrls: map[string][]string{
"arbitrum_goerli": {"https://devnet-1.mt/ABC/rpc/"},
},
RpcWsUrls: map[string][]string{
"arbitrum_goerli": {"wss://devnet-1.mt/ABC/rpc/"},
},
WalletKeys: map[string][]string{
"arbitrum_goerli": {"1810868fc221b9f50b5b3e0186d8a5f343f892e51ce12a9e818f936ec0b651ed"},
},
}
networkCfg := &config.NetworkConfig{}
if tc.overrideTOML != "" {
l := logging.GetTestLogger(t)
err = config.BytesToAnyTomlStruct(l, "test", "", &networkCfg, []byte(tc.overrideTOML))
Expand Down

0 comments on commit 575fdf2

Please sign in to comment.