2c110c81ee
* swarm/storage/mru: Adaptive Frequency swarm/storage/mru/lookup: fixed getBaseTime Added NewEpoch constructor swarm/api/client: better error handling in GetResource() swarm/storage/mru: Renamed structures. Renamed ResourceMetadata to ResourceID. Renamed ResourceID.Name to ResourceID.Topic swarm/storage/mru: Added binarySerializer interface and test tools swarm/storage/mru/lookup: Changed base time to time and + marshallers swarm/storage/mru: Added ResourceID (former resourceMetadata) swarm/storage/mru: Added ResourceViewId and serialization tests swarm/storage/mru/lookup: fixed epoch unmarshaller. Added Epoch Equals swarm/storage/mru: Fixes as per review comments cmd/swarm: reworded resource create/update help text regarding topic swarm/storage/mru: Added UpdateLookup and serializer tests swarm/storage/mru: Added UpdateHeader, serializers and tests swarm/storage/mru: changed UpdateAddr / epoch to Base() swarm/storage/mru: Added resourceUpdate serializer and tests swarm/storage/mru: Added SignedResourceUpdate tests and serializers swarm/storage/mru/lookup: fixed GetFirstEpoch bug swarm/storage/mru: refactor, comments, cleanup Also added tests for Topic swarm/storage/mru: handler tests pass swarm/storage/mru: all resource package tests pass swarm/storage/mru: resource test pass after adding timestamp checking support swarm/storage/mru: Added JSON serializers to ResourceIDView structures swarm/storage/mru: Sever, client, API test pass swarm/storage/mru: server test pass swarm/storage/mru: Added topic length check swarm/storage/mru: removed some literals, improved "previous lookup" test case swarm/storage/mru: some fixes and comments as per review swarm/storage/mru: first working version without metadata chunk swarm/storage/mru: Various fixes as per review swarm/storage/mru: client test pass swarm/storage/mru: resource query strings and manifest-less queries swarm/storage/mru: simplify naming swarm/storage/mru: first autofreq working version swarm/storage/mru: renamed ToValues to AppendValues swarm/resource/mru: Added ToValues / FromValues for URL query strings swarm/storage/mru: Changed POST resource to work with query strings. No more JSON. swarm/storage/mru: removed resourceid swarm/storage/mru: Opened up structures swarm/storage/mru: Merged Request and SignedResourceUpdate swarm/storage/mru: removed initial data from CLI resource create swarm/storage/mru: Refactor Topic as a direct fixed-length array swarm/storage/mru/lookup: Comprehensive GetNextLevel tests swarm/storage/mru: Added comments Added length checks in Topic swarm/storage/mru: fixes in tests and some code comments swarm/storage/mru/lookup: new optimized lookup algorithm swarm/api: moved getResourceView to api out of server swarm/storage/mru: Lookup algorithm working swarm/storage/mru: comments and renamed NewLookupParams Deleted commented code swarm/storage/mru/lookup: renamed Epoch.LaterThan to After swarm/storage/mru/lookup: Comments and tidying naming swarm/storage/mru: fix lookup algorithm swarm/storage/mru: exposed lookup hint removed updateheader swarm/storage/mru/lookup: changed GetNextEpoch for initial values swarm/storage/mru: resource tests pass swarm/storage/mru: valueSerializer interface and tests swarm/storage/mru/lookup: Comments, improvements, fixes, more tests swarm/storage/mru: renamed UpdateLookup to ID, LookupParams to Query swarm/storage/mru: renamed query receiver var swarm/cmd: MRU CLI tests * cmd/swarm: remove rogue fmt * swarm/storage/mru: Add version / header for future use * swarm/storage/mru: Fixes/comments as per review cmd/swarm: remove rogue fmt swarm/storage/mru: Add version / header for future use- * swarm/storage/mru: fix linter errors * cmd/swarm: Speeded up TestCLIResourceUpdate
124 lines
3.7 KiB
Go
124 lines
3.7 KiB
Go
// Copyright 2018 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package mru
|
|
|
|
import (
|
|
"fmt"
|
|
"hash"
|
|
"strconv"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/swarm/storage/mru/lookup"
|
|
|
|
"github.com/ethereum/go-ethereum/swarm/storage"
|
|
)
|
|
|
|
// ID uniquely identifies an update on the network.
|
|
type ID struct {
|
|
View `json:"view"`
|
|
lookup.Epoch `json:"epoch"`
|
|
}
|
|
|
|
// ID layout:
|
|
// View viewLength bytes
|
|
// Epoch EpochLength
|
|
const idLength = viewLength + lookup.EpochLength
|
|
|
|
// Addr calculates the resource update chunk address corresponding to this ID
|
|
func (u *ID) Addr() (updateAddr storage.Address) {
|
|
serializedData := make([]byte, idLength)
|
|
var cursor int
|
|
u.View.binaryPut(serializedData[cursor : cursor+viewLength])
|
|
cursor += viewLength
|
|
|
|
eid := u.Epoch.ID()
|
|
copy(serializedData[cursor:cursor+lookup.EpochLength], eid[:])
|
|
|
|
hasher := hashPool.Get().(hash.Hash)
|
|
defer hashPool.Put(hasher)
|
|
hasher.Reset()
|
|
hasher.Write(serializedData)
|
|
return hasher.Sum(nil)
|
|
}
|
|
|
|
// binaryPut serializes this instance into the provided slice
|
|
func (u *ID) binaryPut(serializedData []byte) error {
|
|
if len(serializedData) != idLength {
|
|
return NewErrorf(ErrInvalidValue, "Incorrect slice size to serialize ID. Expected %d, got %d", idLength, len(serializedData))
|
|
}
|
|
var cursor int
|
|
if err := u.View.binaryPut(serializedData[cursor : cursor+viewLength]); err != nil {
|
|
return err
|
|
}
|
|
cursor += viewLength
|
|
|
|
epochBytes, err := u.Epoch.MarshalBinary()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
copy(serializedData[cursor:cursor+lookup.EpochLength], epochBytes[:])
|
|
cursor += lookup.EpochLength
|
|
|
|
return nil
|
|
}
|
|
|
|
// binaryLength returns the expected size of this structure when serialized
|
|
func (u *ID) binaryLength() int {
|
|
return idLength
|
|
}
|
|
|
|
// binaryGet restores the current instance from the information contained in the passed slice
|
|
func (u *ID) binaryGet(serializedData []byte) error {
|
|
if len(serializedData) != idLength {
|
|
return NewErrorf(ErrInvalidValue, "Incorrect slice size to read ID. Expected %d, got %d", idLength, len(serializedData))
|
|
}
|
|
|
|
var cursor int
|
|
if err := u.View.binaryGet(serializedData[cursor : cursor+viewLength]); err != nil {
|
|
return err
|
|
}
|
|
cursor += viewLength
|
|
|
|
if err := u.Epoch.UnmarshalBinary(serializedData[cursor : cursor+lookup.EpochLength]); err != nil {
|
|
return err
|
|
}
|
|
cursor += lookup.EpochLength
|
|
|
|
return nil
|
|
}
|
|
|
|
// FromValues deserializes this instance from a string key-value store
|
|
// useful to parse query strings
|
|
func (u *ID) FromValues(values Values) error {
|
|
level, _ := strconv.ParseUint(values.Get("level"), 10, 32)
|
|
u.Epoch.Level = uint8(level)
|
|
u.Epoch.Time, _ = strconv.ParseUint(values.Get("time"), 10, 64)
|
|
|
|
if u.View.User == (common.Address{}) {
|
|
return u.View.FromValues(values)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// AppendValues serializes this structure into the provided string key-value store
|
|
// useful to build query strings
|
|
func (u *ID) AppendValues(values Values) {
|
|
values.Set("level", fmt.Sprintf("%d", u.Epoch.Level))
|
|
values.Set("time", fmt.Sprintf("%d", u.Epoch.Time))
|
|
u.View.AppendValues(values)
|
|
}
|