Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/tanlang/add api to manager p2p net in meassager #5185

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cmd/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import (
"github.com/filecoin-project/venus/pkg/journal"
"github.com/filecoin-project/venus/pkg/migration"
"github.com/filecoin-project/venus/pkg/repo"

gengen "github.com/filecoin-project/venus/tools/gengen/util"
)

var log = logging.Logger("daemon")
Expand Down Expand Up @@ -149,7 +151,7 @@ func initRun(req *cmds.Request) error {
genesisFunc = genesis.MakeGenesis(req.Context, rep, mkGen, preTp.(string), cfg.NetworkParams.ForkUpgradeParam)
} else {
genesisFileSource, _ := req.Options[GenesisFile].(string)
genesisFunc, err = networks.LoadGenesis(req.Context, rep, genesisFileSource, network)
genesisFunc, err = gengen.LoadGenesis(req.Context, rep, genesisFileSource, network)
if err != nil {
return err
}
Expand Down
66 changes: 66 additions & 0 deletions fixtures/networks/api.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
package networks

import (
"fmt"

"github.com/filecoin-project/venus/pkg/config"
"github.com/filecoin-project/venus/venus-shared/types"
)

func GetNetworkFromName(name string) (types.NetworkType, error) {
switch name {
case "mainnet":
return types.NetworkMainnet, nil
case "force":
return types.NetworkForce, nil
case "integrationnet":
return types.Integrationnet, nil
case "2k":
return types.Network2k, nil
case "cali", "calibrationnet":
return types.NetworkCalibnet, nil
case "interop", "interopnet":
return types.NetworkInterop, nil
case "butterfly", "butterflynet":
return types.NetworkButterfly, nil
default:
return 0, fmt.Errorf("unknown network name %s", name)
}
}

func SetConfigFromOptions(cfg *config.Config, network string) error {
netcfg, err := GetNetworkConfig(network)
if err != nil {
return err
}
if netcfg != nil {
cfg.Bootstrap = &netcfg.Bootstrap
cfg.NetworkParams = &netcfg.Network
}
return nil
}

func GetNetworkConfig(network string) (*NetworkConf, error) {
networkType, err := GetNetworkFromName(network)
if err != nil {
return nil, err
}

switch networkType {
case types.NetworkMainnet:
return Mainnet(), nil
case types.NetworkForce:
return ForceNet(), nil
case types.Integrationnet:
return IntegrationNet(), nil
case types.Network2k:
return Net2k(), nil
case types.NetworkCalibnet:
return Calibration(), nil
case types.NetworkInterop:
return InteropNet(), nil
case types.NetworkButterfly:
return ButterflySnapNet(), nil
}
return nil, fmt.Errorf("unknown network name %s", network)
}
149 changes: 149 additions & 0 deletions fixtures/networks/api_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
package networks

import (
"fmt"
"testing"

"github.com/filecoin-project/venus/venus-shared/types"
"github.com/stretchr/testify/assert"
)

func TestGetNetworkFromName(t *testing.T) {
testCast := []struct {
name string
network types.NetworkType
err error
}{
{
name: "mainnet",
network: types.NetworkMainnet,
err: nil,
},
{
name: "force",
network: types.NetworkForce,
err: nil,
},
{
name: "integrationnet",
network: types.Integrationnet,
err: nil,
},
{
name: "2k",
network: types.Network2k,
err: nil,
},
{
name: "cali",
network: types.NetworkCalibnet,
err: nil,
},
{
name: "calibrationnet",
network: types.NetworkCalibnet,
err: nil,
},
{
name: "interop",
network: types.NetworkInterop,
err: nil,
},
{
name: "interopnet",
network: types.NetworkInterop,
err: nil,
},
{
name: "butterfly",
network: types.NetworkButterfly,
err: nil,
},
{
name: "butterflynet",
network: types.NetworkButterfly,
err: nil,
},
{
name: "unknown",
network: 0,
err: fmt.Errorf("unknown network name %s", "unknown"),
},
}

for _, test := range testCast {
network, err := GetNetworkFromName(test.name)
assert.Equal(t, test.network, network)
assert.Equal(t, test.err, err)
}
}

func TestGetNetworkConfig(t *testing.T) {
testCast := []struct {
name string
network *NetworkConf
err error
}{
{
name: "mainnet",
network: Mainnet(),
err: nil,
},
{
name: "force",
network: ForceNet(),
err: nil,
},
{
name: "integrationnet",
network: IntegrationNet(),
err: nil,
},
{
name: "2k",
network: Net2k(),
err: nil,
},
{
name: "cali",
network: Calibration(),
err: nil,
},
{
name: "calibrationnet",
network: Calibration(),
err: nil,
},
{
name: "interop",
network: InteropNet(),
err: nil,
},
{
name: "interopnet",
network: InteropNet(),
err: nil,
},
{
name: "butterfly",
network: ButterflySnapNet(),
err: nil,
},
{
name: "butterflynet",
network: ButterflySnapNet(),
err: nil,
},
{
name: "unknown",
network: nil,
err: fmt.Errorf("unknown network name %s", "unknown"),
},
}

for _, test := range testCast {
network, err := GetNetworkConfig(test.name)
assert.Equal(t, test.network, network)
assert.Equal(t, test.err, err)
}
}
162 changes: 0 additions & 162 deletions fixtures/networks/genesis.go

This file was deleted.

Loading