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-11 15:18:30 +01:00
parent d0f848f422
commit 155dc297af
1 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
cmd/geth/les_test.go
View file

@ -11,31 +11,6 @@ import (
"github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/rpc"
) )
/*
func (g *gethNode) waitSynced() error {
ch := make(chan interface{})
sub, err := g.rpc.Subscribe(context.Background(), "eth", ch, "syncing")
if err != nil {
return fmt.Errorf("syncing: %v", err)
}
defer sub.Unsubscribe()
timeout := time.After(40 * time.Second)
for {
select {
case ev := <-ch:
syncing, ok := ev.(bool)
if ok && !syncing {
return nil
}
case err := <-sub.Err():
return fmt.Errorf("notification: %v", err)
case <-timeout:
return fmt.Errorf("timeout syncing")
}
}
}
*/
type gethrpc struct { type gethrpc struct {
name string name string
rpc *rpc.Client rpc *rpc.Client
@ -133,8 +108,9 @@ func startMiner(t *testing.T) *gethrpc {
runGeth(t, "--datadir", datadir, "init", "./testdata/genesis.json").WaitExit() runGeth(t, "--datadir", datadir, "init", "./testdata/genesis.json").WaitExit()
runGeth(t, "--datadir", datadir, "--gcmode=archive", "import", "./testdata/blockchain.blocks").WaitExit() runGeth(t, "--datadir", datadir, "--gcmode=archive", "import", "./testdata/blockchain.blocks").WaitExit()
etherbase := "0x8888f1f195afa192cfee860698584c030f4c9db1" //etherbase := "0x8888f1f195afa192cfee860698584c030f4c9db1"
g := startGethWithRpc(t, "miner", datadir, "--mine", "--nodiscover", "--light.serve=1", "--miner.etherbase", etherbase, "--nat=extip:127.0.0.1") // g := startGethWithRpc(t, "miner", datadir, "--mine", "--nodiscover", "--light.serve=1", "--miner.etherbase", etherbase, "--nat=extip:127.0.0.1")
g := startGethWithRpc(t, "miner", datadir, "--nodiscover", "--light.serve=1", "--nat=extip:127.0.0.1")
return g return g
} }
@ -143,7 +119,7 @@ func startLightServer(t *testing.T) *gethrpc {
defer os.RemoveAll(datadir) defer os.RemoveAll(datadir)
runGeth(t, "--datadir", datadir, "init", "./testdata/genesis.json").WaitExit() runGeth(t, "--datadir", datadir, "init", "./testdata/genesis.json").WaitExit()
g := startGethWithRpc(t, "miner", datadir, "--light.serve=100", "--light.maxpeers=1", "--nodiscover", "--nat=extip:127.0.0.1") g := startGethWithRpc(t, "server", datadir, "--light.serve=100", "--light.maxpeers=1", "--nodiscover", "--nat=extip:127.0.0.1")
return g return g
} }
func startClient(t *testing.T, name string) *gethrpc { func startClient(t *testing.T, name string) *gethrpc {