Server testing blocks

This commit is contained in:
obscuren 2014-01-12 16:50:59 +01:00
parent fedbd9a962
commit e280a2a7e3
2 changed files with 31 additions and 18 deletions

View File

@ -65,7 +65,7 @@ func main() {
go func() {
for {
res := dagger.Search(ethutil.Big("0"), ethutil.BigPow(2, 36))
server.Broadcast("block", Encode(res.String()))
server.Broadcast("block", ethutil.Encode(res.String()))
}
}()
}
@ -74,8 +74,10 @@ func main() {
err = server.ConnectToPeer("localhost:12345")
if err != nil {
log.Println(err)
log.Println("Error starting server", err)
server.Stop()
return
}

View File

@ -4,46 +4,56 @@ import (
"container/list"
"github.com/ethereum/ethdb-go"
"github.com/ethereum/ethutil-go"
"github.com/ethereum/ethwire-go"
"log"
"net"
_ "time"
"time"
)
type Server struct {
// Channel for shutting down the server
shutdownChan chan bool
// DB interface
db *ethdb.LDBDatabase
//db *ethdb.LDBDatabase
db *ethdb.MemDatabase
// Block manager for processing new blocks and managing the block chain
blockManager *BlockManager
// Peers (NYI)
peers *list.List
// Nonce
Nonce uint64
}
func NewServer() (*Server, error) {
db, err := ethdb.NewLDBDatabase()
//db, err := ethdb.NewLDBDatabase()
db, err := ethdb.NewMemDatabase()
if err != nil {
return nil, err
}
ethutil.SetConfig(db)
nonce, _ := ethutil.RandomUint64()
server := &Server{
shutdownChan: make(chan bool),
blockManager: NewBlockManager(),
db: db,
peers: list.New(),
Nonce: nonce,
}
return server, nil
}
func (s *Server) AddPeer(conn net.Conn) {
peer := NewPeer(conn, s)
s.peers.PushBack(peer)
peer.Start()
peer := NewPeer(conn, s, true)
log.Println("Peer connected ::", conn.RemoteAddr())
if peer != nil {
s.peers.PushBack(peer)
peer.Start()
log.Println("Peer connected ::", conn.RemoteAddr())
}
}
func (s *Server) ConnectToPeer(addr string) error {
@ -53,7 +63,7 @@ func (s *Server) ConnectToPeer(addr string) error {
return err
}
peer := NewPeer(conn, s)
peer := NewPeer(conn, s, false)
s.peers.PushBack(peer)
peer.Start()
@ -65,7 +75,7 @@ func (s *Server) ConnectToPeer(addr string) error {
func (s *Server) Broadcast(msgType string, data []byte) {
for e := s.peers.Front(); e != nil; e = e.Next() {
if peer, ok := e.Value.(*Peer); ok {
peer.QueueMessage(msgType, data)
peer.QueueMessage(ethwire.NewMessage(msgType, 0, data))
}
}
}
@ -83,6 +93,7 @@ func (s *Server) Start() {
conn, err := ln.Accept()
if err != nil {
log.Println(err)
continue
}
@ -91,13 +102,13 @@ func (s *Server) Start() {
}()
// TMP
//go func() {
// for {
// s.Broadcast("block", Encode("blockdata"))
//
// time.Sleep(100 * time.Millisecond)
// }
// }()
go func() {
for {
s.Broadcast("block", s.blockManager.bc.GenesisBlock().MarshalRlp())
time.Sleep(1000 * time.Millisecond)
}
}()
}
func (s *Server) Stop() {