From 4834e079a789327b17cb4d0773d22593a8c0d487 Mon Sep 17 00:00:00 2001 From: oys Date: Wed, 10 Jul 2019 15:37:39 +0800 Subject: [PATCH] modify port --- config/toml.go | 2 +- consensus/general.go | 3 ++ p2p/discover/dht/dns_seeds_test.go | 62 +++++++++++++++++--------------------- test/tx_test_util.go | 2 +- 4 files changed, 33 insertions(+), 36 deletions(-) diff --git a/config/toml.go b/config/toml.go index 9981566d..5be8dcb2 100644 --- a/config/toml.go +++ b/config/toml.go @@ -29,7 +29,7 @@ moniker = "" var soloNetConfigTmpl = `chain_id = "solonet" [p2p] -laddr = "tcp://0.0.0.0:46658" +laddr = "tcp://0.0.0.0:56657" seeds = "" ` diff --git a/consensus/general.go b/consensus/general.go index fee177c2..96d1bbc4 100644 --- a/consensus/general.go +++ b/consensus/general.go @@ -162,6 +162,8 @@ var TestNetParams = Params{ var VaporNetParams = Params{ Name: "vapor", Bech32HRPSegwit: "vp", + DefaultPort: "56656", + DNSSeeds: []string{"www.vapornetseed.bytom.io"}, BasicConfig: VaporBasicConfig(), DPOSConfig: VaporDPOSConfig(), Checkpoints: []Checkpoint{}, @@ -174,6 +176,7 @@ var VaporNetParams = Params{ var SoloNetParams = Params{ Name: "solo", Bech32HRPSegwit: "sm", + DefaultPort: "56657", BasicConfig: VaporBasicConfig(), DPOSConfig: VaporDPOSConfig(), Checkpoints: []Checkpoint{}, diff --git a/p2p/discover/dht/dns_seeds_test.go b/p2p/discover/dht/dns_seeds_test.go index 8856ad05..466a21b4 100644 --- a/p2p/discover/dht/dns_seeds_test.go +++ b/p2p/discover/dht/dns_seeds_test.go @@ -14,9 +14,9 @@ var errAddr = []string{"a.b.ab.abc", "55.66.77.88"} func lookupHostNormal(host string) ([]string, error) { switch host { - case consensus.MainNetParams.DNSSeeds[0]: + case consensus.VaporNetParams.DNSSeeds[0]: return mainnetAddr, nil - case consensus.TestNetParams.DNSSeeds[0]: + case consensus.SoloNetParams.DNSSeeds[0]: return testnetAddr, nil } return nil, nil @@ -26,39 +26,33 @@ func lookupHostErrIP(host string) ([]string, error) { return errAddr, nil } -var testCases = []struct { - chainID string - lookupHost func(host string) (addrs []string, err error) - wantErr error - wantAddr []string -}{ - { - chainID: "wisdom", - lookupHost: lookupHostNormal, - wantErr: nil, - wantAddr: []string{"1.2.3.4:46656", "5.6.7.8:46656"}, - }, - { - chainID: "mainnet", - lookupHost: lookupHostNormal, - wantErr: nil, - wantAddr: []string{"11.22.33.44:46657", "55.66.77.88:46657"}, - }, - { - chainID: "solonet", - lookupHost: lookupHostNormal, - wantErr: errDNSSeedsEmpty, - wantAddr: nil, - }, - { - chainID: "wisdom", - lookupHost: lookupHostErrIP, - wantErr: errDNSTimeout, - wantAddr: nil, - }, -} - func TestQueryDNSSeeds(t *testing.T) { + testCases := []struct { + chainID string + lookupHost func(host string) (addrs []string, err error) + wantErr error + wantAddr []string + }{ + { + chainID: "vapor", + lookupHost: lookupHostNormal, + wantErr: nil, + wantAddr: []string{"11.22.33.44:56656", "55.66.77.88:56656"}, + }, + { + chainID: "vapor", + lookupHost: lookupHostErrIP, + wantErr: errDNSTimeout, + wantAddr: nil, + }, + { + chainID: "solonet", + lookupHost: lookupHostNormal, + wantErr: errDNSSeedsEmpty, + wantAddr: nil, + }, + } + for i, tc := range testCases { consensus.ActiveNetParams = consensus.NetParams[tc.chainID] addresses, err := QueryDNSSeeds(tc.lookupHost) diff --git a/test/tx_test_util.go b/test/tx_test_util.go index 11c63136..f75bc4ea 100644 --- a/test/tx_test_util.go +++ b/test/tx_test_util.go @@ -293,7 +293,7 @@ func SignInstructionFor(input *types.SpendInput, db dbm.DB, signer *signers.Sign return sigInst, nil } - address, err := common.DecodeAddress(cp.Address, &consensus.MainNetParams) + address, err := common.DecodeAddress(cp.Address, &consensus.VaporNetParams) if err != nil { return nil, err } -- 2.11.0