diff --git a/fixtures/assets/asset.go b/fixtures/assets/asset.go index d2d708c06f..4b26e3463f 100644 --- a/fixtures/assets/asset.go +++ b/fixtures/assets/asset.go @@ -19,12 +19,8 @@ func GetGenesis(networkType types.NetworkType) ([]byte, error) { fileName = "interopnet.car" case types.NetworkButterfly: fileName = "butterflynet.car" - case types.NetworkHyperspace: - fileName = "hyperspacenet.car" case types.NetworkCalibnet: fileName = "calibnet.car" - case types.NetworkWallaby: - fileName = "wallabynet.car" default: fileName = "mainnet.car" } diff --git a/fixtures/assets/genesis-car/hyperspacenet.car b/fixtures/assets/genesis-car/hyperspacenet.car deleted file mode 100644 index d2d3d7a9a3..0000000000 Binary files a/fixtures/assets/genesis-car/hyperspacenet.car and /dev/null differ diff --git a/fixtures/assets/genesis-car/wallabynet.car b/fixtures/assets/genesis-car/wallabynet.car deleted file mode 100644 index 3c5b607ce8..0000000000 Binary files a/fixtures/assets/genesis-car/wallabynet.car and /dev/null differ diff --git a/fixtures/networks/hyperspace.go b/fixtures/networks/hyperspace.go deleted file mode 100644 index 2a65dbfe3b..0000000000 --- a/fixtures/networks/hyperspace.go +++ /dev/null @@ -1,73 +0,0 @@ -package networks - -import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/venus/pkg/config" - "github.com/filecoin-project/venus/venus-shared/types" -) - -func HyperspaceNet() *NetworkConf { - return &NetworkConf{ - Bootstrap: config.BootstrapConfig{ - Addresses: []string{ - "/dns4/de0.bootstrap.hyperspace.yoga/tcp/31000/p2p/12D3KooWRiwg6EHAJMR5w3DZTgpS5W4ncWPSVP2Mr1o4ey1RYSQo", - "/dns4/de1.bootstrap.hyperspace.yoga/tcp/31000/p2p/12D3KooWM9HZsp1bh5jNu2m9FBSbkKSeSWUPPuDBQiiMfPDBAK3U", - "/dns4/au0.bootstrap.hyperspace.yoga/tcp/31000/p2p/12D3KooWLup1gTdG9ipt3bSUyPCmM4CT86p9nNe12oqrCX8Zo8Na", - "/dns4/ca0.bootstrap.hyperspace.yoga/tcp/31000/p2p/12D3KooWNJ4evKioh6gexD4fyvyeFecNtp2oTEPTyp3jtSQ3pWaP", - "/dns4/sg0.bootstrap.hyperspace.yoga/tcp/31000/p2p/12D3KooWCENec46HHByaJKzbjSqz9TqVdSxSAdi9FKNwdMvfw3vp", - }, - Period: "30s", - }, - Network: config.NetworkParamsConfig{ - DevNet: true, - NetworkType: types.NetworkHyperspace, - GenesisNetworkVersion: network.Version18, - ReplaceProofTypes: []abi.RegisteredSealProof{ - abi.RegisteredSealProof_StackedDrg512MiBV1, - abi.RegisteredSealProof_StackedDrg32GiBV1, - abi.RegisteredSealProof_StackedDrg64GiBV1, - }, - BlockDelay: 30, - ConsensusMinerMinPower: 16 << 30, - MinVerifiedDealSize: 1 << 20, - PreCommitChallengeDelay: abi.ChainEpoch(10), - ForkUpgradeParam: &config.ForkUpgradeConfig{ - BreezeGasTampingDuration: 120, - UpgradeBreezeHeight: -1, - UpgradeSmokeHeight: -2, - UpgradeIgnitionHeight: -3, - UpgradeRefuelHeight: -4, - UpgradeAssemblyHeight: -5, - UpgradeTapeHeight: -6, - UpgradeLiftoffHeight: -7, - UpgradeKumquatHeight: -8, - UpgradeCalicoHeight: -9, - UpgradePersianHeight: -10, - UpgradeOrangeHeight: -11, - UpgradeClausHeight: -12, - UpgradeTrustHeight: -13, - UpgradeNorwegianHeight: -14, - UpgradeTurboHeight: -15, - UpgradeHyperdriveHeight: -16, - UpgradeChocolateHeight: -17, - UpgradeOhSnapHeight: -18, - UpgradeSkyrHeight: -19, - UpgradeSharkHeight: -20, - UpgradeHyggeHeight: -21, - UpgradeLightningHeight: -22, - UpgradeThunderHeight: -23, - UpgradeWatermelonHeight: 200, - UpgradeWatermelonFixHeight: -100, // This fix upgrade only ran on calibrationnet - UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet - }, - DrandSchedule: map[abi.ChainEpoch]config.DrandEnum{0: 1}, - AddressNetwork: address.Testnet, - PropagationDelaySecs: 6, - AllowableClockDriftSecs: 1, - Eip155ChainID: 3141, - ActorDebugging: false, - }, - } -} diff --git a/fixtures/networks/network_parse.go b/fixtures/networks/network_parse.go index 855f0c5d98..dd9234e282 100644 --- a/fixtures/networks/network_parse.go +++ b/fixtures/networks/network_parse.go @@ -66,10 +66,6 @@ func GetNetworkConfigFromType(networkType types.NetworkType) (*NetworkConf, erro return InteropNet(), nil case types.NetworkButterfly: return ButterflySnapNet(), nil - case types.NetworkWallaby: - return WallabyNet(), nil - case types.NetworkHyperspace: - return HyperspaceNet(), nil } return nil, fmt.Errorf("unknown network type %d", networkType) diff --git a/fixtures/networks/network_parse_test.go b/fixtures/networks/network_parse_test.go index 7d45f6a693..88ade8a0e4 100644 --- a/fixtures/networks/network_parse_test.go +++ b/fixtures/networks/network_parse_test.go @@ -52,11 +52,6 @@ func TestGetNetworkFromName(t *testing.T) { network: types.NetworkButterfly, err: nil, }, - // { - // name: "hyperspacenet", - // network: types.NetworkHyperspace, - // err: nil, - // }, { name: "unknown", network: 0, diff --git a/fixtures/networks/wallaby.go b/fixtures/networks/wallaby.go deleted file mode 100644 index 856b90a27f..0000000000 --- a/fixtures/networks/wallaby.go +++ /dev/null @@ -1,73 +0,0 @@ -package networks - -import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/venus/pkg/config" - "github.com/filecoin-project/venus/venus-shared/types" -) - -func WallabyNet() *NetworkConf { - return &NetworkConf{ - Bootstrap: config.BootstrapConfig{ - Addresses: []string{ - "/dns4/de0.bootstrap.wallaby.yoga/tcp/41000/p2p/12D3KooWGXLjN4FCXyTsvLPUrbZfkA5p7gXJ11WXXB56cQLEmNkE", - "/dns4/de1.bootstrap.wallaby.yoga/tcp/41000/p2p/12D3KooWEHyGpfQsLMPhCo4zmfp6uZfhQisiWZMYaPu1j92d2dax", - "/dns4/au0.bootstrap.wallaby.yoga/tcp/41000/p2p/12D3KooWLEPk3TcgpD7aWoou4dzbgdQA14Y9eTCg9rcoLaLruHtf", - "/dns4/ca0.bootstrap.wallaby.yoga/tcp/41000/p2p/12D3KooWQAupDxeHoLzmc617FzhWnHHWEt8e2fNfccqByT5mHWPp", - "/dns4/sg0.bootstrap.wallaby.yoga/tcp/41000/p2p/12D3KooWAkSaZCXSngvgSi4ufVModcExCysnS3JhG6nnprPjVV4o", - }, - Period: "30s", - }, - Network: config.NetworkParamsConfig{ - DevNet: true, - NetworkType: types.NetworkWallaby, - GenesisNetworkVersion: network.Version18, - ReplaceProofTypes: []abi.RegisteredSealProof{ - abi.RegisteredSealProof_StackedDrg512MiBV1, - abi.RegisteredSealProof_StackedDrg32GiBV1, - abi.RegisteredSealProof_StackedDrg64GiBV1, - }, - BlockDelay: 30, - ConsensusMinerMinPower: 16 << 30, - MinVerifiedDealSize: 1 << 20, - PreCommitChallengeDelay: abi.ChainEpoch(10), - ForkUpgradeParam: &config.ForkUpgradeConfig{ - BreezeGasTampingDuration: 120, - UpgradeBreezeHeight: -1, - UpgradeSmokeHeight: -2, - UpgradeIgnitionHeight: -3, - UpgradeRefuelHeight: -4, - UpgradeAssemblyHeight: -5, - UpgradeTapeHeight: -6, - UpgradeLiftoffHeight: -7, - UpgradeKumquatHeight: -8, - UpgradeCalicoHeight: -9, - UpgradePersianHeight: -10, - UpgradeOrangeHeight: -11, - UpgradeClausHeight: -12, - UpgradeTrustHeight: -13, - UpgradeNorwegianHeight: -14, - UpgradeTurboHeight: -15, - UpgradeHyperdriveHeight: -16, - UpgradeChocolateHeight: -17, - UpgradeOhSnapHeight: -18, - UpgradeSkyrHeight: -19, - UpgradeSharkHeight: -20, - UpgradeHyggeHeight: -21, - UpgradeLightningHeight: -22, - UpgradeThunderHeight: -23, - UpgradeWatermelonHeight: 200, - UpgradeWatermelonFixHeight: -100, // This fix upgrade only ran on calibrationnet - UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet - }, - DrandSchedule: map[abi.ChainEpoch]config.DrandEnum{0: 1}, - AddressNetwork: address.Testnet, - PropagationDelaySecs: 6, - AllowableClockDriftSecs: 1, - Eip155ChainID: 31415, - ActorDebugging: false, - }, - } -} diff --git a/pkg/fork/fork.go b/pkg/fork/fork.go index 390c309e43..ccc15b68e2 100644 --- a/pkg/fork/fork.go +++ b/pkg/fork/fork.go @@ -91,11 +91,11 @@ func init() { if mwcs := os.Getenv(EnvMigrationMaxWorkerCount); mwcs != "" { mwc, err := strconv.ParseInt(mwcs, 10, 32) if err != nil { - log.Warnf("invalid value for %s (%s) defaulting to %d: %s", EnvMigrationMaxWorkerCount, mwcs, MigrationMaxWorkerCount, err) + fmt.Printf("invalid value for %s (%s) defaulting to %d: %s\n", EnvMigrationMaxWorkerCount, mwcs, MigrationMaxWorkerCount, err) return } // use value from environment - log.Infof("migration worker cound set from %s (%d)", EnvMigrationMaxWorkerCount, mwc) + fmt.Printf("migration worker count set from %s (%d)\n", EnvMigrationMaxWorkerCount, mwc) MigrationMaxWorkerCount = int(mwc) return } diff --git a/venus-shared/actors/builtin_actors.go b/venus-shared/actors/builtin_actors.go index 7ff3704773..79ca50e6ca 100644 --- a/venus-shared/actors/builtin_actors.go +++ b/venus-shared/actors/builtin_actors.go @@ -53,8 +53,6 @@ func init() { // NetworkInterop NetworkType = 0x6 // NetworkForce NetworkType = 0x7 // NetworkButterfly NetworkType = 0x8 -// NetworkWallaby NetworkType = 0x9 -// NetworkHyperspace NetworkType = 0x10 // Avoid import cycle, we use concrete values func SetNetworkBundle(networkType int) error { networkBundle := "" @@ -74,12 +72,6 @@ func SetNetworkBundle(networkType int) error { // case types.NetworkButterfly: case 0x8: networkBundle = "butterflynet" - // case types.NetworkWallaby: - case 0x9: - networkBundle = "wallaby" - // case types.NetworkHyperspace: - case 0x10: - networkBundle = "hyperspace" default: networkBundle = "mainnet" } diff --git a/venus-shared/types/api_types.go b/venus-shared/types/api_types.go index 0c8fcd8ab8..bae93fba10 100644 --- a/venus-shared/types/api_types.go +++ b/venus-shared/types/api_types.go @@ -78,24 +78,20 @@ const ( NetworkNameInterop NetworkName = "interopnet" NetworkNameIntegration NetworkName = "integrationnet" NetworkNameForce NetworkName = "forcenet" - NetworkNameWallaby NetworkName = "wallabynet" - NetworkNameHyperspace NetworkName = "hyperspacenet" ) type NetworkType int const ( - NetworkDefault NetworkType = 0 - NetworkMainnet NetworkType = 0x1 - Network2k NetworkType = 0x2 - NetworkDebug NetworkType = 0x3 - NetworkCalibnet NetworkType = 0x4 - NetworkNerpa NetworkType = 0x5 - NetworkInterop NetworkType = 0x6 - NetworkForce NetworkType = 0x7 - NetworkButterfly NetworkType = 0x8 - NetworkWallaby NetworkType = 0x9 - NetworkHyperspace NetworkType = 0x10 + NetworkDefault NetworkType = 0 + NetworkMainnet NetworkType = 0x1 + Network2k NetworkType = 0x2 + NetworkDebug NetworkType = 0x3 + NetworkCalibnet NetworkType = 0x4 + NetworkNerpa NetworkType = 0x5 + NetworkInterop NetworkType = 0x6 + NetworkForce NetworkType = 0x7 + NetworkButterfly NetworkType = 0x8 Integrationnet NetworkType = 0x30 ) diff --git a/venus-shared/utils/utils_test.go b/venus-shared/utils/utils_test.go index a02338fc02..31860fe4f0 100644 --- a/venus-shared/utils/utils_test.go +++ b/venus-shared/utils/utils_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" ) -func TestNetworkNamtToNetworkType(t *testing.T) { +func TestNetworkNameToNetworkType(t *testing.T) { tf.UnitTest(t) assert.Len(t, NetworkTypeWithNetworkName, 6) assert.Len(t, NetworkNameWithNetworkType, 6)