core, container: rename HttpPort to P2PPort
This commit is contained in:
parent
8d872e8640
commit
67025d76fc
|
@ -39,7 +39,7 @@ func TestEthereumContainer(t *testing.T) {
|
|||
ImageName("quay.io/maicoin/ottoman_geth:istanbul_develop"),
|
||||
HostDataDir(env.DataDir),
|
||||
DataDir("/data"),
|
||||
Port(fmt.Sprintf("%d", env.HttpPort)),
|
||||
Port(fmt.Sprintf("%d", env.P2PPort)),
|
||||
RPC(),
|
||||
RPCAddress("0.0.0.0"),
|
||||
RPCAPI("eth,net,web3,personal"),
|
||||
|
|
|
@ -36,7 +36,7 @@ import (
|
|||
|
||||
const (
|
||||
defaultBaseRpcPort = uint16(8545)
|
||||
defaultHttpPort = uint16(30303)
|
||||
defaultP2PPort = uint16(30303)
|
||||
|
||||
defaultLocalDir = "/tmp/gdata"
|
||||
datadirPrivateKey = "nodekey"
|
||||
|
@ -59,12 +59,12 @@ func GenerateClusterKeys(numbers int) []*ecdsa.PrivateKey {
|
|||
}
|
||||
|
||||
type Env struct {
|
||||
GethID int
|
||||
HttpPort uint16
|
||||
RpcPort uint16
|
||||
DataDir string
|
||||
Key *ecdsa.PrivateKey
|
||||
Client *client.Client
|
||||
GethID int
|
||||
P2PPort uint16
|
||||
RpcPort uint16
|
||||
DataDir string
|
||||
Key *ecdsa.PrivateKey
|
||||
Client *client.Client
|
||||
}
|
||||
|
||||
func Teardown(envs []*Env) {
|
||||
|
@ -76,7 +76,7 @@ func Teardown(envs []*Env) {
|
|||
func SetupEnv(prvKeys []*ecdsa.PrivateKey) []*Env {
|
||||
envs := make([]*Env, len(prvKeys))
|
||||
rpcPort := defaultBaseRpcPort
|
||||
httpPort := defaultHttpPort
|
||||
p2pPort := defaultP2PPort
|
||||
|
||||
for i := 0; i < len(envs); i++ {
|
||||
client, err := client.NewEnvClient()
|
||||
|
@ -90,16 +90,16 @@ func SetupEnv(prvKeys []*ecdsa.PrivateKey) []*Env {
|
|||
}
|
||||
|
||||
envs[i] = &Env{
|
||||
GethID: i,
|
||||
HttpPort: httpPort,
|
||||
RpcPort: rpcPort,
|
||||
DataDir: dataDir,
|
||||
Key: prvKeys[i],
|
||||
Client: client,
|
||||
GethID: i,
|
||||
P2PPort: p2pPort,
|
||||
RpcPort: rpcPort,
|
||||
DataDir: dataDir,
|
||||
Key: prvKeys[i],
|
||||
Client: client,
|
||||
}
|
||||
|
||||
rpcPort = rpcPort + 1
|
||||
httpPort = httpPort + 1
|
||||
p2pPort = p2pPort + 1
|
||||
}
|
||||
return envs
|
||||
}
|
||||
|
@ -175,7 +175,7 @@ func transformToStaticNodes(envs []*Env) []string {
|
|||
}
|
||||
|
||||
nodeID := discover.PubkeyID(&env.Key.PublicKey)
|
||||
nodes[i] = discover.NewNode(nodeID, net.ParseIP(host), 0, env.HttpPort).String()
|
||||
nodes[i] = discover.NewNode(nodeID, net.ParseIP(host), 0, env.P2PPort).String()
|
||||
}
|
||||
return nodes
|
||||
}
|
||||
|
|
|
@ -53,7 +53,7 @@ var _ = Describe("4 validators Istanbul", func() {
|
|||
container.ImageName("quay.io/maicoin/ottoman_geth:istanbul_develop"),
|
||||
container.HostDataDir(env.DataDir),
|
||||
container.DataDir("/data"),
|
||||
container.Port(fmt.Sprintf("%d", env.HttpPort)),
|
||||
container.Port(fmt.Sprintf("%d", env.P2PPort)),
|
||||
container.RPC(),
|
||||
container.RPCAddress("0.0.0.0"),
|
||||
container.RPCAPI("eth,net,web3,personal"),
|
||||
|
|
Loading…
Reference in New Issue