forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 04:36:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'bzz' of github.com:ethersphere/go-ethereum into bzz

Browse source
This commit is contained in:
Daniel A. Nagy 2015-03-26 14:07:21 +01:00
commit 971af2a631
7 changed files with 26 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bzz/chunker_test.go
View file

@ -7,7 +7,7 @@ import (
"testing"
"time"
"github.com/ethereum/go-ethereum/bzz/test"
"github.com/ethereum/go-ethereum/blockpool/test"
)
/*

2
bzz/dbstore_test.go
View file

@ -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) {

3
bzz/dpa_test.go
View file

@ -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

8
bzz/httpaccess.go
View file

@ -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

2
bzz/memstore_test.go
View file

@ -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) {

22
bzz/protocol.go
View file

@ -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) {

78
bzz/test/logger.go
View file

@ -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()
}