roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Rlp update

Browse Source
This commit is contained in:
obscuren 2014-02-18 01:34:06 +01:00
parent 68028f492f
commit d7eca7bcc1
3 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ethereum.go
View File

@ -85,7 +85,6 @@ func New(caps Caps, usePnp bool) (*Ethereum, error) {
Nonce: nonce, Nonce: nonce,
serverCaps: caps, serverCaps: caps,
nat: nat, nat: nat,
MaxPeers: 5,
} }
ethereum.TxPool = ethchain.NewTxPool() ethereum.TxPool = ethchain.NewTxPool()
ethereum.TxPool.Speaker = ethereum ethereum.TxPool.Speaker = ethereum
@ -114,6 +113,7 @@ func (s *Ethereum) ProcessPeerList(addrs []string) {
} }
func (s *Ethereum) ConnectToPeer(addr string) error { func (s *Ethereum) ConnectToPeer(addr string) error {
if s.peers.Len() < s.MaxPeers {
var alreadyConnected bool var alreadyConnected bool
eachPeer(s.peers, func(p *Peer, v *list.Element) { eachPeer(s.peers, func(p *Peer, v *list.Element) {
@ -137,6 +137,9 @@ func (s *Ethereum) ConnectToPeer(addr string) error {
s.peers.PushBack(peer) s.peers.PushBack(peer)
log.Printf("[SERV] Adding peer %d / %d\n", s.peers.Len(), s.MaxPeers)
}
return nil return nil
} }

3
ethutil/encoding.go
View File

@ -3,7 +3,6 @@ package ethutil
import ( import (
"bytes" "bytes"
"encoding/hex" "encoding/hex"
_ "fmt"
"strings" "strings"
) )
@ -36,7 +35,7 @@ func CompactEncode(hexSlice []int) string {
func CompactDecode(str string) []int { func CompactDecode(str string) []int {
base := CompactHexDecode(str) base := CompactHexDecode(str)
base = base[:len(base)-1] base = base[:len(base)-1]
if base[0] >= 2 { // && base[len(base)-1] != 16 { if base[0] >= 2 {
base = append(base, 16) base = append(base, 16)
} }
if base[0]%2 == 1 { if base[0]%2 == 1 {

8
ethutil/rlp.go
View File

@ -86,13 +86,6 @@ func DecodeWithReader(reader *bytes.Buffer) interface{} {
// TODO Use a bytes.Buffer instead of a raw byte slice. // TODO Use a bytes.Buffer instead of a raw byte slice.
// Cleaner code, and use draining instead of seeking the next bytes to read // Cleaner code, and use draining instead of seeking the next bytes to read
func Decode(data []byte, pos uint64) (interface{}, uint64) { func Decode(data []byte, pos uint64) (interface{}, uint64) {
/*
if pos > uint64(len(data)-1) {
log.Println(data)
log.Panicf("index out of range %d for data %q, l = %d", pos, data, len(data))
}
*/
var slice []interface{} var slice []interface{}
char := int(data[pos]) char := int(data[pos])
switch { switch {
@ -131,7 +124,6 @@ func Decode(data []byte, pos uint64) (interface{}, uint64) {
case char <= 0xff: case char <= 0xff:
l := uint64(data[pos]) - 0xf7 l := uint64(data[pos]) - 0xf7
//b := BigD(data[pos+1 : pos+1+l]).Uint64()
b := ReadVarint(bytes.NewReader(data[pos+1 : pos+1+l])) b := ReadVarint(bytes.NewReader(data[pos+1 : pos+1+l]))
pos = pos + l + 1 pos = pos + l + 1