Statediffing #5

Closed
elizabethengelman wants to merge 122 commits from statediff-for-archive-node into master
3 changed files with 4 additions and 30 deletions
Showing only changes of commit d322c9d550 - Show all commits

View File

@ -23,7 +23,6 @@ import (
"context" "context"
"fmt" "fmt"
"sync" "sync"
"time"
"github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup"
@ -32,12 +31,10 @@ import (
) )
type Handler struct { type Handler struct {
chunkStore *storage.NetStore chunkStore *storage.NetStore
HashSize int HashSize int
cache map[uint64]*cacheEntry cache map[uint64]*cacheEntry
cacheLock sync.RWMutex cacheLock sync.RWMutex
storeTimeout time.Duration
queryMaxPeriods uint32
} }
// HandlerParams pass parameters to the Handler constructor NewHandler // HandlerParams pass parameters to the Handler constructor NewHandler

View File

@ -40,7 +40,6 @@ var (
} }
cleanF func() cleanF func()
subtopicName = "føø.bar" subtopicName = "føø.bar"
hashfunc = storage.MakeHashFunc(storage.DefaultHash)
) )
func init() { func init() {

View File

@ -17,7 +17,6 @@
package feed package feed
import ( import (
"encoding/binary"
"encoding/json" "encoding/json"
"time" "time"
) )
@ -30,32 +29,11 @@ type Timestamp struct {
Time uint64 `json:"time"` // Unix epoch timestamp, in seconds Time uint64 `json:"time"` // Unix epoch timestamp, in seconds
} }
// 8 bytes uint64 Time
const timestampLength = 8
// timestampProvider interface describes a source of timestamp information // timestampProvider interface describes a source of timestamp information
type timestampProvider interface { type timestampProvider interface {
Now() Timestamp // returns the current timestamp information Now() Timestamp // returns the current timestamp information
} }
// binaryGet populates the timestamp structure from the given byte slice
func (t *Timestamp) binaryGet(data []byte) error {
if len(data) != timestampLength {
return NewError(ErrCorruptData, "timestamp data has the wrong size")
}
t.Time = binary.LittleEndian.Uint64(data[:8])
return nil
}
// binaryPut Serializes a Timestamp to a byte slice
func (t *Timestamp) binaryPut(data []byte) error {
if len(data) != timestampLength {
return NewError(ErrCorruptData, "timestamp data has the wrong size")
}
binary.LittleEndian.PutUint64(data, t.Time)
return nil
}
// UnmarshalJSON implements the json.Unmarshaller interface // UnmarshalJSON implements the json.Unmarshaller interface
func (t *Timestamp) UnmarshalJSON(data []byte) error { func (t *Timestamp) UnmarshalJSON(data []byte) error {
return json.Unmarshal(data, &t.Time) return json.Unmarshal(data, &t.Time)