From 26f8c179d69f12d604102e120d967c9930aad7e0 Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 25 Mar 2015 19:50:42 +0000 Subject: [PATCH] merge develop + quick fixes - ethutil -> common - rm bzz/test - import blockpool/test for testlogger/hashpool - adapt to p2p.Send - uniform use of new RLP --- bzz/chunker_test.go | 2 +- bzz/dbstore_test.go | 2 +- bzz/dpa_test.go | 3 +- bzz/httpaccess.go | 8 ++--- bzz/memstore_test.go | 2 +- bzz/protocol.go | 22 ++++++++++--- bzz/test/logger.go | 78 -------------------------------------------- 7 files changed, 26 insertions(+), 91 deletions(-) delete mode 100644 bzz/test/logger.go diff --git a/bzz/chunker_test.go b/bzz/chunker_test.go index 1cff67383b..2a8bc92fcc 100644 --- a/bzz/chunker_test.go +++ b/bzz/chunker_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/bzz/test" + "github.com/ethereum/go-ethereum/blockpool/test" ) /* diff --git a/bzz/dbstore_test.go b/bzz/dbstore_test.go index 79ee4315f8..a026177c6f 100644 --- a/bzz/dbstore_test.go +++ b/bzz/dbstore_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/bzz/test" + "github.com/ethereum/go-ethereum/blockpool/test" ) func initDbStore() (m *dbStore) { diff --git a/bzz/dpa_test.go b/bzz/dpa_test.go index d397d6c27d..e09d5a2cbe 100644 --- a/bzz/dpa_test.go +++ b/bzz/dpa_test.go @@ -2,12 +2,13 @@ package bzz import ( "bytes" - "github.com/ethereum/go-ethereum/bzz/test" "io" "io/ioutil" "os" "sync" "testing" + + "github.com/ethereum/go-ethereum/blockpool/test" ) const testDataSize = 0x1000000 diff --git a/bzz/httpaccess.go b/bzz/httpaccess.go index b60066e6a5..bfa85887e6 100644 --- a/bzz/httpaccess.go +++ b/bzz/httpaccess.go @@ -6,7 +6,7 @@ package bzz import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" "io" "net/http" "regexp" @@ -116,7 +116,7 @@ func handler(w http.ResponseWriter, r *http.Request, dpa *DPA) { if uriMatcher.MatchString(uri) { dpaLogger.Debugf("Swarm: Raw GET request %s received", uri) name := uri[5:69] - key := ethutil.Hex2Bytes(name) + key := common.Hex2Bytes(name) reader := dpa.Retrieve(key) dpaLogger.Debugf("Swarm: Reading %d bytes.", reader.Size()) mimeType := "application/octet-stream" @@ -131,7 +131,7 @@ func handler(w http.ResponseWriter, r *http.Request, dpa *DPA) { name := uri[1:65] path := uri[65:] // typically begins with a / dpaLogger.Debugf("Swarm: path \"%s\" requested.", path) - key := ethutil.Hex2Bytes(name) + key := common.Hex2Bytes(name) MANIFEST_RESOLUTION: for { manifestReader := dpa.Retrieve(key) @@ -180,7 +180,7 @@ func handler(w http.ResponseWriter, r *http.Request, dpa *DPA) { if len(path) >= pathLen && path[:pathLen] == entry.Path && prefix <= pathLen { dpaLogger.Debugf("Swarm: \"%s\" matches \"%s\".", path, entry.Path) prefix = pathLen - key = ethutil.Hex2Bytes(entry.Hash) + key = common.Hex2Bytes(entry.Hash) dpaLogger.Debugf("Swarm: Payload hash %064x", key) mimeType = entry.ContentType status = entry.Status diff --git a/bzz/memstore_test.go b/bzz/memstore_test.go index ee22f72a59..5878cc9b25 100644 --- a/bzz/memstore_test.go +++ b/bzz/memstore_test.go @@ -3,7 +3,7 @@ package bzz import ( "testing" - "github.com/ethereum/go-ethereum/bzz/test" + "github.com/ethereum/go-ethereum/blockpool/test" ) func testMemStore(l int64, branches int64, t *testing.T) { diff --git a/bzz/protocol.go b/bzz/protocol.go index c1bb6dbd7c..a81aec0faf 100644 --- a/bzz/protocol.go +++ b/bzz/protocol.go @@ -239,8 +239,7 @@ func (self *bzzProtocol) handleStatus() (err error) { Caps: []p2p.Cap{}, } - //if err := self.rw.WriteMsg(self.statusMsg()); err != nil { - if err = p2p.EncodeMsg(self.rw, statusMsg, handshake); err != nil { + if err = p2p.Send(self.rw, statusMsg, handshake); err != nil { return err } @@ -282,20 +281,33 @@ func (self *bzzProtocol) handleStatus() (err error) { // outgoing messages func (self *bzzProtocol) retrieve(req *retrieveRequestMsgData) { dpaLogger.Debugf("Request message: %#v", req) - err := p2p.EncodeMsg(self.rw, retrieveRequestMsg, req.Key, req.Id, req.MaxSize) + err := p2p.Send(self.rw, retrieveRequestMsg, req) if err != nil { dpaLogger.Errorf("EncodeMsg error: %v", err) } } func (self *bzzProtocol) store(req *storeRequestMsgData) { - p2p.EncodeMsg(self.rw, storeRequestMsg, req.Key, req.SData, req.Id) + p2p.Send(self.rw, storeRequestMsg, req) } func (self *bzzProtocol) peers(req *peersMsgData) { - p2p.EncodeMsg(self.rw, peersMsg, req) + p2p.Send(self.rw, peersMsg, req) } +// func (self *ethProtocol) protoError(code int, format string, params ...interface{}) (err *errs.Error) { +// err = self.errors.New(code, format, params...) +// err.Log(self.peer.Logger) +// return +// } + +// func (self *ethProtocol) protoErrorDisconnect(err *errs.Error) { +// err.Log(self.peer.Logger) +// if err.Fatal() { +// self.peer.Disconnect(p2p.DiscSubprotocolError) +// } +// } + // errors // TODO: should be reworked using errs pkg func (self *bzzProtocol) protoError(code int, format string, params ...interface{}) (err *protocolError) { diff --git a/bzz/test/logger.go b/bzz/test/logger.go deleted file mode 100644 index 5d26151c19..0000000000 --- a/bzz/test/logger.go +++ /dev/null @@ -1,78 +0,0 @@ -package test - -import ( - "log" - "os" - "sync" - "testing" - - "github.com/ethereum/go-ethereum/logger" -) - -var once sync.Once - -/* usage: -func TestFunc(t *testing.T) { - test.LogInit() - // test -} -*/ -func LogInit() { - once.Do(func() { - var logsys = logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(logger.WarnLevel)) - logger.AddLogSystem(logsys) - }) -} - -type testLogger struct{ t *testing.T } - -/* usage: -func TestFunc(t *testing.T) { - defer test.Testlog.Detach() - // test -} -*/ -func Testlog(t *testing.T) testLogger { - logger.Reset() - l := testLogger{t} - logger.AddLogSystem(l) - return l -} - -func (testLogger) GetLogLevel() logger.LogLevel { return logger.DebugLevel } -func (testLogger) SetLogLevel(logger.LogLevel) {} - -func (l testLogger) LogPrint(level logger.LogLevel, msg string) { - l.t.Logf("%s", msg) -} - -func (testLogger) Detach() { - logger.Flush() - logger.Reset() -} - -type benchLogger struct{ b *testing.B } - -/* usage: -func BenchmarkFunc(b *testing.B) { - defer test.Benchlog.Detach() - // test -} -*/ -func Benchlog(b *testing.B) benchLogger { - logger.Reset() - l := benchLogger{b} - logger.AddLogSystem(l) - return l -} - -func (benchLogger) GetLogLevel() logger.LogLevel { return logger.Silence } - -func (benchLogger) SetLogLevel(logger.LogLevel) {} -func (l benchLogger) LogPrint(level logger.LogLevel, msg string) { - l.b.Logf("%s", msg) -} -func (benchLogger) Detach() { - logger.Flush() - logger.Reset() -}