Skip to content

Commit

Permalink
lint + unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@felipemadero
felipemadero committed Oct 12, 2024
1 parent 5a3a4e5 commit e3f1d97
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 60 deletions.
10 changes: 5 additions & 5 deletions client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func (c *client) Start(ctx context.Context, execPath string, opts ...OpOption) (
ChainConfigs: ret.chainConfigs,
UpgradeConfigs: ret.upgradeConfigs,
SubnetConfigs: ret.subnetConfigs,
ZeroIpIfPublicHttpHost: ret.zeroIPIfPublicHttpHost,
ZeroIpIfPublicHttpHost: ret.zeroIPIfPublicHTTPHost,
FreshStakingIds: ret.freshStakingIds,
}
if ret.trackSubnets != "" {
Expand Down Expand Up @@ -415,7 +415,7 @@ func (c *client) LoadSnapshot(
UpgradeConfigs: ret.upgradeConfigs,
SubnetConfigs: ret.subnetConfigs,
InPlace: inPlace,
ZeroIpIfPublicHttpHost: ret.zeroIPIfPublicHttpHost,
ZeroIpIfPublicHttpHost: ret.zeroIPIfPublicHTTPHost,
}
if ret.execPath != "" {
req.ExecPath = &ret.execPath
Expand Down Expand Up @@ -530,7 +530,7 @@ type Op struct {
bootstrapNodeIPPortPairs []string
upgradePath string
snapshotPath string
zeroIPIfPublicHttpHost bool
zeroIPIfPublicHTTPHost bool
freshStakingIds bool
}

Expand Down Expand Up @@ -685,9 +685,9 @@ func WithSnapshotPath(snapshotPath string) OpOption {
}
}

func WithZeroIPIfPublicHTTPHost(zeroIPIfPublicHttpHost bool) OpOption {
func WithZeroIPIfPublicHTTPHost(zeroIPIfPublicHTTPHost bool) OpOption {
return func(op *Op) {
op.zeroIPIfPublicHttpHost = zeroIPIfPublicHttpHost
op.zeroIPIfPublicHTTPHost = zeroIPIfPublicHTTPHost
}
}

Expand Down
2 changes: 1 addition & 1 deletion examples/local/fivenodenetwork/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func main() {

func run(log logging.Logger, binaryPath string) error {
// Create the network
nw, err := local.NewDefaultNetwork(log, binaryPath, true, true, true)
nw, err := local.NewDefaultNetwork(log, binaryPath, true, true, true, false)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion examples/local/indepth/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func main() {

func run(log logging.Logger, binaryPath string) error {
// Create the network
nw, err := local.NewDefaultNetwork(log, binaryPath, true, true, true)
nw, err := local.NewDefaultNetwork(log, binaryPath, true, true, true, false)
if err != nil {
return err
}
Expand Down
76 changes: 40 additions & 36 deletions local/network.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ type localNetwork struct {
walletPrivateKey string
// nodes always returns 127.0.0.1 as IP
// if not set, may return 0.0.0.0 depending on httpHost settings
zeroIPIfPublicHttpHost bool
zeroIPIfPublicHTTPHost bool
}

type deprecatedFlagEsp struct {
Expand Down Expand Up @@ -179,7 +179,7 @@ func NewNetwork(
redirectStdout bool,
redirectStderr bool,
walletPrivateKey string,
zeroIPIfPublicHttpHost bool,
zeroIPIfPublicHTTPHost bool,
) (network.Network, error) {
beaconSet, err := utils.BeaconMapToSet(networkConfig.BeaconConfig)
if err != nil {
Expand All @@ -202,7 +202,7 @@ func NewNetwork(
redirectStderr,
walletPrivateKey,
beaconSet,
zeroIPIfPublicHttpHost,
zeroIPIfPublicHTTPHost,
)
if err != nil {
return net, err
Expand All @@ -225,7 +225,7 @@ func newNetwork(
redirectStderr bool,
walletPrivateKey string,
beaconSet beacon.Set,
zeroIPIfPublicHttpHost bool,
zeroIPIfPublicHTTPHost bool,
) (*localNetwork, error) {
var err error
if rootDir == "" {
Expand Down Expand Up @@ -269,7 +269,7 @@ func newNetwork(
subnetID2ElasticSubnetID: map[ids.ID]ids.ID{},
blockchainAliases: map[string][]string{},
walletPrivateKey: walletPrivateKey,
zeroIPIfPublicHttpHost: zeroIPIfPublicHttpHost,
zeroIPIfPublicHTTPHost: zeroIPIfPublicHTTPHost,
}
return net, nil
}
Expand All @@ -295,7 +295,7 @@ func NewDefaultNetwork(
reassignPortsIfUsed bool,
redirectStdout bool,
redirectStderr bool,
zeroIPIfPublicHttpHost bool,
zeroIPIfPublicHTTPHost bool,
) (network.Network, error) {
config, err := NewDefaultConfig(binaryPath, constants.DefaultNetworkID, "", "", nil)
if err != nil {
Expand All @@ -311,7 +311,7 @@ func NewDefaultNetwork(
redirectStdout,
redirectStderr,
"",
zeroIPIfPublicHttpHost,
zeroIPIfPublicHTTPHost,
)
}

Expand Down Expand Up @@ -538,7 +538,7 @@ func (ln *localNetwork) loadConfig(ctx context.Context, networkConfig network.Co
// execute again asking avago to set ports by itself
nodeConfigs[i].Flags[config.HTTPPortKey] = 0
nodeConfigs[i].Flags[config.StakingPortKey] = 0
node, nodeErr = ln.addNode(nodeConfigs[i])
_, nodeErr = ln.addNode(nodeConfigs[i])
if nodeErr == nil {
continue
}
Expand Down Expand Up @@ -711,14 +711,17 @@ func (ln *localNetwork) addNode(nodeConfig node.Config) (node.Node, error) {
name: nodeConfig.Name,
nodeID: nodeID,
networkID: ln.networkID,
apiPort: nodeData.apiPort,
p2pPort: nodeData.p2pPort,
publicIP: nodeData.publicIP,
getConnFunc: defaultGetConnFunc,
dataDir: nodeData.dataDir,
dbDir: nodeData.dbDir,
logsDir: nodeData.logsDir,
config: nodeConfig,
pluginDir: nodeData.pluginDir,
httpHost: nodeData.httpHost,
zeroIPIfPublicHttpHost: ln.zeroIPIfPublicHttpHost,
zeroIPIfPublicHTTPHost: ln.zeroIPIfPublicHTTPHost,
attachedPeers: map[string]peer.Peer{},
}

Expand All @@ -732,35 +735,36 @@ func (ln *localNetwork) addNode(nodeConfig node.Config) (node.Node, error) {
}
node.process = nodeProcess

processFilePath := filepath.Join(nodeData.dataDir, config.DefaultProcessContextFilename)
processFileBytes, err := os.ReadFile(processFilePath)
if err != nil {
return node, fmt.Errorf("could not read node process info file %s", processFilePath)
}
processContext := avagonode.NodeProcessContext{}
if err := json.Unmarshal(processFileBytes, &processContext); err != nil {
return node, fmt.Errorf("failed to unmarshal node process context at %s: %w", processFilePath, err)
}
stakingAddressWords := strings.Split(processContext.StakingAddress, ":")
if len(stakingAddressWords) == 0 {
return node, fmt.Errorf("unexpected format on staking address %s", processContext.StakingAddress)
}
p2pPort, err := strconv.ParseUint(stakingAddressWords[len(stakingAddressWords)-1], 10, 16)
if err != nil {
return node, fmt.Errorf("unexpected format on staking address %s: %w", processContext.StakingAddress, err)
}
uriWords := strings.Split(processContext.URI, ":")
if len(uriWords) == 0 {
return node, fmt.Errorf("unexpected format on uri %s", processContext.URI)
}
apiPort, err := strconv.ParseUint(uriWords[len(uriWords)-1], 10, 16)
if err != nil {
return node, fmt.Errorf("unexpected format on uri %s: %w", processContext.URI, err)
if node.apiPort == 0 {
processFilePath := filepath.Join(nodeData.dataDir, config.DefaultProcessContextFilename)
processFileBytes, err := os.ReadFile(processFilePath)
if err != nil {
return node, fmt.Errorf("could not read node process info file %s", processFilePath)
}
processContext := avagonode.NodeProcessContext{}
if err := json.Unmarshal(processFileBytes, &processContext); err != nil {
return node, fmt.Errorf("failed to unmarshal node process context at %s: %w", processFilePath, err)
}
stakingAddressWords := strings.Split(processContext.StakingAddress, ":")
if len(stakingAddressWords) == 0 {
return node, fmt.Errorf("unexpected format on staking address %s", processContext.StakingAddress)
}
p2pPort, err := strconv.ParseUint(stakingAddressWords[len(stakingAddressWords)-1], 10, 16)
if err != nil {
return node, fmt.Errorf("unexpected format on staking address %s: %w", processContext.StakingAddress, err)
}
uriWords := strings.Split(processContext.URI, ":")
if len(uriWords) == 0 {
return node, fmt.Errorf("unexpected format on uri %s", processContext.URI)
}
apiPort, err := strconv.ParseUint(uriWords[len(uriWords)-1], 10, 16)
if err != nil {
return node, fmt.Errorf("unexpected format on uri %s: %w", processContext.URI, err)
}
node.apiPort = uint16(apiPort)
node.p2pPort = uint16(p2pPort)
}

node.publicIP = nodeData.publicIP
node.apiPort = uint16(apiPort)
node.p2pPort = uint16(p2pPort)
node.client = ln.newAPIClientF(node.publicIP, node.apiPort)

// If this node is a beacon, add its IP/ID to the beacon lists.
Expand Down
Loading

0 comments on commit e3f1d97

Please sign in to comment.