Merge pull request #5387 from filcloud/build-network

add calibnet and mainnet in version
This commit is contained in:
Łukasz Magiera 2021-01-25 18:26:17 +01:00 committed by GitHub
commit a2b91a5627
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 6 deletions

View File

@ -4,6 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"os" "os"
"strings"
"testing" "testing"
"time" "time"
@ -157,7 +158,11 @@ func (ts *testSuite) testVersion(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) 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) { func (ts *testSuite) testSearchMsg(t *testing.T) {

View File

@ -55,6 +55,8 @@ func init() {
SetAddressNetwork(address.Testnet) SetAddressNetwork(address.Testnet)
Devnet = true Devnet = true
BuildType = BuildCalibnet
} }
const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds) const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds)

View File

@ -58,6 +58,8 @@ func init() {
} }
Devnet = false Devnet = false
BuildType = BuildMainnet
} }
const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds) const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds)

View File

@ -11,18 +11,24 @@ var BuildType int
const ( const (
BuildDefault = 0 BuildDefault = 0
Build2k = 0x1 BuildMainnet = 0x1
Build2k = 0x2
BuildDebug = 0x3 BuildDebug = 0x3
BuildCalibnet = 0x4
) )
func buildType() string { func buildType() string {
switch BuildType { switch BuildType {
case BuildDefault: case BuildDefault:
return "" return ""
case BuildDebug: case BuildMainnet:
return "+debug" return "+mainnet"
case Build2k: case Build2k:
return "+2k" return "+2k"
case BuildDebug:
return "+debug"
case BuildCalibnet:
return "+calibnet"
default: default:
return "+huh?" return "+huh?"
} }