From 61aae567bb355ba192a5140545a1728c4e37d0fb Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 20 Jan 2021 14:47:27 +0800 Subject: [PATCH 1/3] add calibnet and mainnet in version --- build/params_2k.go | 2 +- build/params_calibnet.go | 2 ++ build/params_debug.go | 2 +- build/params_mainnet.go | 2 ++ build/version.go | 16 +++++++++++----- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/build/params_2k.go b/build/params_2k.go index ecac86983..fbf0ad2cd 100644 --- a/build/params_2k.go +++ b/build/params_2k.go @@ -36,7 +36,7 @@ func init() { policy.SetConsensusMinerMinPower(abi.NewStoragePower(2048)) policy.SetMinVerifiedDealSize(abi.NewStoragePower(256)) - BuildType |= Build2k + BuildType = Build2k } const BlockDelaySecs = uint64(4) diff --git a/build/params_calibnet.go b/build/params_calibnet.go index 670efa776..1ae0adfa8 100644 --- a/build/params_calibnet.go +++ b/build/params_calibnet.go @@ -55,6 +55,8 @@ func init() { SetAddressNetwork(address.Testnet) Devnet = true + + BuildType = BuildCalibnet } const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds) diff --git a/build/params_debug.go b/build/params_debug.go index f679c9178..44d7cc6c0 100644 --- a/build/params_debug.go +++ b/build/params_debug.go @@ -4,7 +4,7 @@ package build func init() { InsecurePoStValidation = true - BuildType |= BuildDebug + BuildType = BuildDebug } // NOTE: Also includes settings from params_2k diff --git a/build/params_mainnet.go b/build/params_mainnet.go index a4c3ab04f..1f4cd5709 100644 --- a/build/params_mainnet.go +++ b/build/params_mainnet.go @@ -58,6 +58,8 @@ func init() { } Devnet = false + + BuildType = BuildMainnet } const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds) diff --git a/build/version.go b/build/version.go index 9500d30c0..fe9fc07c5 100644 --- a/build/version.go +++ b/build/version.go @@ -10,19 +10,25 @@ var CurrentCommit string var BuildType int const ( - BuildDefault = 0 - Build2k = 0x1 - BuildDebug = 0x3 + BuildDefault = 0 + BuildMainnet = 0x1 + Build2k = 0x2 + BuildDebug = 0x3 + BuildCalibnet = 0x4 ) func buildType() string { switch BuildType { case BuildDefault: return "" - case BuildDebug: - return "+debug" + case BuildMainnet: + return "+mainnet" case Build2k: return "+2k" + case BuildDebug: + return "+debug" + case BuildCalibnet: + return "+calibnet" default: return "+huh?" } From 46b92be2819ac5b39b537670e028864c4862567b Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 21 Jan 2021 12:25:41 +0800 Subject: [PATCH 2/3] fix debug and 2k mix --- build/params_2k.go | 2 +- build/params_debug.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/params_2k.go b/build/params_2k.go index fbf0ad2cd..ecac86983 100644 --- a/build/params_2k.go +++ b/build/params_2k.go @@ -36,7 +36,7 @@ func init() { policy.SetConsensusMinerMinPower(abi.NewStoragePower(2048)) policy.SetMinVerifiedDealSize(abi.NewStoragePower(256)) - BuildType = Build2k + BuildType |= Build2k } const BlockDelaySecs = uint64(4) diff --git a/build/params_debug.go b/build/params_debug.go index 44d7cc6c0..f679c9178 100644 --- a/build/params_debug.go +++ b/build/params_debug.go @@ -4,7 +4,7 @@ package build func init() { InsecurePoStValidation = true - BuildType = BuildDebug + BuildType |= BuildDebug } // NOTE: Also includes settings from params_2k From d0a1c5251ca7d43dc8a3b9a0eaa0541dda90dbc5 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 22 Jan 2021 12:07:07 +0800 Subject: [PATCH 3/3] fix test --- api/test/test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/api/test/test.go b/api/test/test.go index a1b82c590..c6a76e10b 100644 --- a/api/test/test.go +++ b/api/test/test.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "os" + "strings" "testing" "time" @@ -157,7 +158,11 @@ func (ts *testSuite) testVersion(t *testing.T) { if err != nil { t.Fatal(err) } - require.Equal(t, v.Version, build.BuildVersion) + versions := strings.Split(v.Version, "+") + if len(versions) <= 0 { + t.Fatal("empty version") + } + require.Equal(t, versions[0], build.BuildVersion) } func (ts *testSuite) testSearchMsg(t *testing.T) {