Skip to content

Commit 20d8fd8

Browse files
bkasemergify[bot]
authored andcommitted
Attempt to uncomment unit tests for codanet2 (#3600)
* Attempt to uncomment unit tests for codanet2 * New coda-discovery.deb * Update deps * discover -> dicovery * Test builds * Out-of-memory with a large instance, need xl * increase timeout * Timeout to 10s
1 parent e7a64e5 commit 20d8fd8

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/libp2p_helper/main.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ import (
88
"encoding/json"
99
"fmt"
1010
"io"
11-
"io/ioutil"
1211
"log"
13-
"net/http"
1412
"os"
1513
"sync"
1614
"time"
@@ -131,6 +129,10 @@ func badHelper(e error) error {
131129
return wrapError(e, "initializing helper")
132130
}
133131

132+
func badAddr(e error) error {
133+
return wrapError(e, "initializing external addr")
134+
}
135+
134136
func needsConfigure() error {
135137
return badRPC(errors.New("helper not yet configured"))
136138
}
@@ -171,7 +173,11 @@ func (m *configureMsg) run(app *app) (interface{}, error) {
171173
maddrs[i] = res
172174
}
173175

174-
helper, err := codanet.MakeHelper(app.Ctx, maddrs, multiaddr.NewMultiaddr(m.External), m.Statedir, privk, m.NetworkID)
176+
externalMaddr, err := multiaddr.NewMultiaddr(m.External)
177+
if err != nil {
178+
return nil, badAddr(err)
179+
}
180+
helper, err := codanet.MakeHelper(app.Ctx, maddrs, externalMaddr, m.Statedir, privk, m.NetworkID)
175181
if err != nil {
176182
return nil, badHelper(err)
177183
}

0 commit comments

Comments
 (0)