Merge branch 'develop' of https://github.com/ethereum/go-ethereum into develop

1 files changed, 0 insertions, 58 deletions

diff --git a/cmd/peerserver/main.go b/cmd/peerserver/main.go
deleted file mode 100644
index 341c4dbb9..000000000
--- a/cmd/peerserver/main.go
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-	This file is part of go-ethereum
-
-	go-ethereum is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	go-ethereum is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package main
-
-import (
-	"crypto/elliptic"
-	"flag"
-	"log"
-	"os"
-
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/logger"
-	"github.com/ethereum/go-ethereum/p2p"
-)
-
-var (
-	natType    = flag.String("nat", "", "NAT traversal implementation")
-	pmpGateway = flag.String("gateway", "", "gateway address for NAT-PMP")
-	listenAddr = flag.String("addr", ":30301", "listen address")
-)
-
-func main() {
-	flag.Parse()
-	nat, err := p2p.ParseNAT(*natType, *pmpGateway)
-	if err != nil {
-		log.Fatal("invalid nat:", err)
-	}
-
-	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:   100,
-		Identity:   p2p.NewSimpleClientIdentity("Ethereum(G)", "0.1", "Peer Server Two", marshaled),
-		ListenAddr: *listenAddr,
-		NAT:        nat,
-		NoDial:     true,
-	}
-	if err := srv.Start(); err != nil {
-		log.Fatal("could not start server:", err)
-	}
-	select {}
-}