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
133 lines
4.5 KiB
Go
133 lines
4.5 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"
|
|
"strconv"
|
|
|
|
"github.com/ethereum/go-ethereum/swarm/chunk"
|
|
)
|
|
|
|
// ProtocolVersion defines the current version of the protocol that will be included in each update message
|
|
const ProtocolVersion uint8 = 0
|
|
|
|
const headerLength = 8
|
|
|
|
// Header defines a update message header including a protocol version byte
|
|
type Header struct {
|
|
Version uint8 // Protocol version
|
|
Padding [headerLength - 1]uint8 // reserved for future use
|
|
}
|
|
|
|
// ResourceUpdate encapsulates the information sent as part of a resource update
|
|
type ResourceUpdate struct {
|
|
Header Header //
|
|
ID // Resource update identifying information
|
|
data []byte // actual data payload
|
|
}
|
|
|
|
const minimumUpdateDataLength = idLength + headerLength + 1
|
|
const maxUpdateDataLength = chunk.DefaultSize - signatureLength - idLength - headerLength
|
|
|
|
// binaryPut serializes the resource update information into the given slice
|
|
func (r *ResourceUpdate) binaryPut(serializedData []byte) error {
|
|
datalength := len(r.data)
|
|
if datalength == 0 {
|
|
return NewError(ErrInvalidValue, "cannot update a resource with no data")
|
|
}
|
|
|
|
if datalength > maxUpdateDataLength {
|
|
return NewErrorf(ErrInvalidValue, "data is too big (length=%d). Max length=%d", datalength, maxUpdateDataLength)
|
|
}
|
|
|
|
if len(serializedData) != r.binaryLength() {
|
|
return NewErrorf(ErrInvalidValue, "slice passed to putBinary must be of exact size. Expected %d bytes", r.binaryLength())
|
|
}
|
|
|
|
var cursor int
|
|
// serialize Header
|
|
serializedData[cursor] = r.Header.Version
|
|
copy(serializedData[cursor+1:headerLength], r.Header.Padding[:headerLength-1])
|
|
cursor += headerLength
|
|
|
|
// serialize ID
|
|
if err := r.ID.binaryPut(serializedData[cursor : cursor+idLength]); err != nil {
|
|
return err
|
|
}
|
|
cursor += idLength
|
|
|
|
// add the data
|
|
copy(serializedData[cursor:], r.data)
|
|
cursor += datalength
|
|
|
|
return nil
|
|
}
|
|
|
|
// binaryLength returns the expected number of bytes this structure will take to encode
|
|
func (r *ResourceUpdate) binaryLength() int {
|
|
return idLength + headerLength + len(r.data)
|
|
}
|
|
|
|
// binaryGet populates this instance from the information contained in the passed byte slice
|
|
func (r *ResourceUpdate) binaryGet(serializedData []byte) error {
|
|
if len(serializedData) < minimumUpdateDataLength {
|
|
return NewErrorf(ErrNothingToReturn, "chunk less than %d bytes cannot be a resource update chunk", minimumUpdateDataLength)
|
|
}
|
|
dataLength := len(serializedData) - idLength - headerLength
|
|
// at this point we can be satisfied that we have the correct data length to read
|
|
|
|
var cursor int
|
|
|
|
// deserialize Header
|
|
r.Header.Version = serializedData[cursor] // extract the protocol version
|
|
copy(r.Header.Padding[:headerLength-1], serializedData[cursor+1:headerLength]) // extract the padding
|
|
cursor += headerLength
|
|
|
|
if err := r.ID.binaryGet(serializedData[cursor : cursor+idLength]); err != nil {
|
|
return err
|
|
}
|
|
cursor += idLength
|
|
|
|
data := serializedData[cursor : cursor+dataLength]
|
|
cursor += dataLength
|
|
|
|
// now that all checks have passed, copy data into structure
|
|
r.data = make([]byte, dataLength)
|
|
copy(r.data, data)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
// FromValues deserializes this instance from a string key-value store
|
|
// useful to parse query strings
|
|
func (r *ResourceUpdate) FromValues(values Values, data []byte) error {
|
|
r.data = data
|
|
version, _ := strconv.ParseUint(values.Get("protocolVersion"), 10, 32)
|
|
r.Header.Version = uint8(version)
|
|
return r.ID.FromValues(values)
|
|
}
|
|
|
|
// AppendValues serializes this structure into the provided string key-value store
|
|
// useful to build query strings
|
|
func (r *ResourceUpdate) AppendValues(values Values) []byte {
|
|
r.ID.AppendValues(values)
|
|
values.Set("protocolVersion", fmt.Sprintf("%d", r.Header.Version))
|
|
return r.data
|
|
}
|