Merge branch 'release/0.9.0'

1 files changed, 0 insertions, 40 deletions

diff --git a/cmd/peerserver/main.go b/cmd/peerserver/main.go
deleted file mode 100644
index 0fa7a9b44..000000000
--- a/cmd/peerserver/main.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package main
-
-import (
-	"crypto/elliptic"
-	"fmt"
-	"log"
-	"net"
-	"os"
-
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/logger"
-	"github.com/ethereum/go-ethereum/p2p"
-)
-
-func main() {
-	logger.AddLogSystem(logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.InfoLevel))
-	key, _ := crypto.GenerateKey()
-	marshaled := elliptic.Marshal(crypto.S256(), key.PublicKey.X, key.PublicKey.Y)
-
-	srv := p2p.Server{
-		MaxPeers:   10,
-		Identity:   p2p.NewSimpleClientIdentity("Ethereum(G)", "0.1", "Peer Server Two", string(marshaled)),
-		ListenAddr: ":30301",
-		NAT:        p2p.UPNP(),
-	}
-	if err := srv.Start(); err != nil {
-		fmt.Println("could not start server:", err)
-		os.Exit(1)
-	}
-
-	// add seed peers
-	seed, err := net.ResolveTCPAddr("tcp", "poc-7.ethdev.com:30300")
-	if err != nil {
-		fmt.Println("couldn't resolve:", err)
-		os.Exit(1)
-	}
-	srv.SuggestPeer(seed.IP, seed.Port, nil)
-
-	select {}
-}