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

Full test written, but not working

Browse source
This commit is contained in:
Adam Schmideg 2020-02-07 12:58:24 +01:00
parent e5b0e0eded
commit 9f64fb4f7a
1 changed files with 28 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
cmd/geth/les_test.go
View file

@ -112,7 +112,8 @@ func (g *gethrpc) waitSynced() {
func startGethWithRpc(t *testing.T, name string, datadir string, args ...string) *gethrpc { func startGethWithRpc(t *testing.T, name string, datadir string, args ...string) *gethrpc {
ipcpath := filepath.Join(datadir, "geth.ipc") ipcpath := filepath.Join(datadir, "geth.ipc")
g := &gethrpc{test: t, name: name} g := &gethrpc{test: t, name: name}
args = append([]string{"--datadir", datadir, "--networkid=42", "--port=0", "--nousb", "--rpc", "--rpcport=0", "--rpcapi=admin,eth,les", "--verbosity=5"}, args...) args = append([]string{"--datadir", datadir, "--networkid=42", "--port=0", "--nousb", "--rpc", "--rpcport=0", "--rpcapi=admin,eth,les"}, args...)
//args = append([]string{"--verbosity=5"}, args...)
g.geth = runGeth(t, args...) g.geth = runGeth(t, args...)
// wait before we can attach to it. TODO: probe for it properly // wait before we can attach to it. TODO: probe for it properly
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
@ -139,13 +140,13 @@ func startLightServer(t *testing.T) *gethrpc {
return g return g
} }
func startClient(t *testing.T) *gethrpc { func startClient(t *testing.T, name string) *gethrpc {
// Create a temporary data directory to use // Create a temporary data directory to use
datadir := tmpdir(t) datadir := tmpdir(t)
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, "client", datadir, "--nodiscover", "--syncmode=light") g := startGethWithRpc(t, name, datadir, "--nodiscover", "--syncmode=light")
return g return g
} }
@ -155,13 +156,13 @@ func TestPriorityClient(t *testing.T) {
defer server.killAndWait() defer server.killAndWait()
nodeInfo := make(map[string]interface{}) nodeInfo := make(map[string]interface{})
server.callRPC(&nodeInfo, "admin_nodeInfo") server.callRPC(&nodeInfo, "admin_nodeInfo")
enode := nodeInfo["enode"].(string) serverEnode := nodeInfo["enode"].(string)
server.waitSynced() server.waitSynced()
server.test.Log("server node", enode, nodeInfo["id"])
client := startClient(t) // Start client and add server as peer
client := startClient(t, "client")
defer client.killAndWait() defer client.killAndWait()
client.addPeer(enode) client.addPeer(serverEnode)
var peers []interface{} var peers []interface{}
client.callRPC(&peers, "admin_peers") client.callRPC(&peers, "admin_peers")
if len(peers) != 1 { if len(peers) != 1 {
@ -169,45 +170,25 @@ func TestPriorityClient(t *testing.T) {
t.Fail() t.Fail()
} }
/* // Set up priority client, get its nodeID, increase its balance on the server
prio := startClient(t, "prio")
defer prio.killAndWait()
prioNodeInfo := make(map[string]interface{})
prio.callRPC(&prioNodeInfo, "admin_nodeInfo")
nodeID := prioNodeInfo["id"].(string)
tokens := 3_000_000_000
server.callRPC(nil, "les_addBalance", nodeID, tokens, "foobar")
prio.addPeer(serverEnode)
// Priority client // Check if priority client is actually syncing and the regular client got kicked out
priodir := "/tmp/prio" prio.callRPC(&peers, "admin_peers")
if err := runGeth(priodir, false, "init", "./initdata/testGenesis.json"); err != nil { if len(peers) != 1 {
t.Fatal("init prio", err) t.Logf("Expected: # of prio peers == 1, actual: %v", len(peers))
} t.Fail()
prio, err := startGeth(priodir, true, "--networkid=42", "--syncmode=light", "--nodiscover") }
defer prio.kill() client.callRPC(&peers, "admin_peers")
if err != nil { if len(peers) > 0 {
t.Fatal(prio.cmd.String(), err) t.Log("Expected: # of client peers == 0")
} t.Fail()
prioNodeInfo := make(map[string]interface{}) }
if err := prio.rpc.Call(&prioNodeInfo, "admin_nodeInfo"); err != nil {
t.Fatal("prio nodeInfo:", err)
}
nodeID := prioNodeInfo["id"].(string)
t.Log("nodeID", nodeID)
tokens := 3_000_000_000
if err := server.rpc.Call(nil, "les_addBalance", nodeID, tokens, "foobar"); err != nil {
t.Fatal("addBalance:", err)
}
if err := prio.addPeer(enode); err != nil {
t.Fatal("addPeer", err)
}
// Check if priority client is actually syncing and the regular client got kicked out
if err := prio.rpc.Call(&peers, "admin_peers"); err != nil {
t.Fatal("prio peers", err)
}
if len(peers) != 1 {
t.Fatal("Expected: # of prio peers == 1")
}
if err := client.rpc.Call(&peers, "admin_peers"); err != nil {
t.Fatal("client peers", err)
}
if len(peers) > 0 {
t.Fatal("Expected: # of client peers == 0")
}
*/
} }