forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up

Browse source
This commit is contained in:
Adam Schmideg 2020-02-26 15:31:50 +01:00
parent 841103c5bd
commit 6d045200d1
1 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cmd/geth/les_test.go
View file

@ -18,7 +18,6 @@ type gethrpc struct {
} }
func (g *gethrpc) killAndWait() { func (g *gethrpc) killAndWait() {
g.geth.Logf("Killing %v", g.name)
g.geth.Kill() g.geth.Kill()
g.geth.WaitExit() g.geth.WaitExit()
} }
@ -78,24 +77,21 @@ func (g *gethrpc) waitSynced() {
g.geth.Fatalf("%v syncing: %v", g.name, err) g.geth.Fatalf("%v syncing: %v", g.name, err)
} }
defer sub.Unsubscribe() defer sub.Unsubscribe()
g.geth.Log("subscribed")
timeout := time.After(4 * time.Second) timeout := time.After(4 * time.Second)
for {
select { select {
case ev := <-ch: case ev := <-ch:
g.geth.Log("'syncing' event", ev) g.geth.Log("'syncing' event", ev)
syncing, ok := ev.(bool) syncing, ok := ev.(bool)
if ok && !syncing { if ok && !syncing {
return break
} }
g.geth.Log("Other 'syncing' event", ev) g.geth.Log("Other 'syncing' event", ev)
case err := <-sub.Err(): case err := <-sub.Err():
g.geth.Fatalf("%v notification: %v", g.name, err) g.geth.Fatalf("%v notification: %v", g.name, err)
return break
case <-timeout: case <-timeout:
g.geth.Fatalf("%v timeout syncing", g.name) g.geth.Fatalf("%v timeout syncing", g.name)
return break
}
} }
} }
@ -123,16 +119,10 @@ func initGeth(t *testing.T) string {
} }
func startLightServer(t *testing.T) *gethrpc { func startLightServer(t *testing.T) *gethrpc {
// Create an account, we'll need the private key and password to unlock it later.
// We add the account to the genesis json
datadir := initGeth(t) datadir := initGeth(t)
// key := "48aa455c373ec5ce7fefb0e54f44a215decdc85b9047bc4d09801e038909bdbe"
// password := "foobar"
runGeth(t, "--datadir", datadir, "--password", "./testdata/password.txt", "account", "import", "./testdata/key.prv").WaitExit() runGeth(t, "--datadir", datadir, "--password", "./testdata/password.txt", "account", "import", "./testdata/key.prv").WaitExit()
account := "0x02f0d131f1f97aef08aec6e3291b957d9efe7105" account := "0x02f0d131f1f97aef08aec6e3291b957d9efe7105"
server := startGethWithRpc(t, "lightserver", "--allow-insecure-unlock", "--datadir", datadir, "--password", "./testdata/password.txt", "--unlock", account, "--mine", "--light.serve=100", "--light.maxpeers=1", "--nodiscover", "--nat=extip:127.0.0.1") server := startGethWithRpc(t, "lightserver", "--allow-insecure-unlock", "--datadir", datadir, "--password", "./testdata/password.txt", "--unlock", account, "--mine", "--light.serve=100", "--light.maxpeers=1", "--nodiscover", "--nat=extip:127.0.0.1")
// server.geth.InputLine(password)
return server return server
} }
@ -149,9 +139,6 @@ func TestPriorityClient(t *testing.T) {
freeCli := startClient(t, "freeCli") freeCli := startClient(t, "freeCli")
defer freeCli.killAndWait() defer freeCli.killAndWait()
freeCli.addPeer(lightServer) freeCli.addPeer(lightServer)
if true {
return
}
var peers []*p2p.PeerInfo var peers []*p2p.PeerInfo
freeCli.callRPC(&peers, "admin_peers") freeCli.callRPC(&peers, "admin_peers")