forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

les: renamed variables

Browse source
This commit is contained in:
Zsolt Felfoldi 2019-06-07 15:14:50 +02:00
parent 2de75e9e1c
commit 106af36aa9
1 changed files with 65 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
les/api.go
View file

@ -23,6 +23,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/common/mclock" "github.com/ethereum/go-ethereum/common/mclock"
"github.com/ethereum/go-ethereum/les/csvlogger" "github.com/ethereum/go-ethereum/les/csvlogger"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enode"
@ -30,15 +31,15 @@ import (
) )
var ( var (
ErrNoCheckpoint = errors.New("no local checkpoint provided") errNoCheckpoint = errors.New("no local checkpoint provided")
ErrNotActivated = errors.New("checkpoint registrar is not activated") errNotActivated = errors.New("checkpoint registrar is not activated")
ErrInvalidTag = errors.New("invalid client tag") errInvalidTag = errors.New("invalid client tag")
ErrInvalidParam = errors.New("invalid client parameter") errInvalidParam = errors.New("invalid client parameter")
ErrInvalidValue = errors.New("invalid parameter value") errInvalidValue = errors.New("invalid parameter value")
ErrTotalCap = errors.New("total capacity exceeded") errTotalCap = errors.New("total capacity exceeded")
ErrUnknownBenchmarkType = errors.New("unknown benchmark type") errUnknownBenchmarkType = errors.New("unknown benchmark type")
ErrMultiple = errors.New("multiple errors") errMultiple = errors.New("multiple errors")
ErrClientNotConnected = errors.New("client is not connected") errClientNotConnected = errors.New("client is not connected")
dropCapacityDelay = time.Second // delay applied to decreasing capacity changes dropCapacityDelay = time.Second // delay applied to decreasing capacity changes
) )
@ -90,63 +91,63 @@ func (api *PrivateLightServerAPI) SetClientParams(ids []enode.ID, tags []string,
if tt, ok := tag.(string); ok { if tt, ok := tag.(string); ok {
tags[i] = tt tags[i] = tt
} else { } else {
err = ErrInvalidTag err = errInvalidTag
} }
} }
if err == nil { if err == nil {
err = api.server.priorityClientPool.setClientTags(client, tags) err = api.server.priorityClientPool.setClientTags(client, tags)
} }
} else { } else {
err = ErrInvalidTag err = errInvalidTag
} }
case "capacity": case "capacity":
if cap, ok := value.(float64); ok && (cap == 0 || uint64(cap) >= api.server.minCapacity) { if capacity, ok := value.(float64); ok && (capacity == 0 || uint64(capacity) >= api.server.minCapacity) {
err = api.server.priorityClientPool.setClientCapacity(client, uint64(cap)) err = api.server.priorityClientPool.setClientCapacity(client, uint64(capacity))
updatePrice = true updatePrice = true
} else { } else {
err = ErrInvalidValue err = errInvalidValue
} }
case "pricing/timeFactor": case "pricing/timeFactor":
if val, ok := value.(float64); ok && val >= 0 { if val, ok := value.(float64); ok && val >= 0 {
client.timeFactor = val / 1000000000 client.timeFactor = val / 1000000000
updatePrice = true updatePrice = true
} else { } else {
err = ErrInvalidValue err = errInvalidValue
} }
case "pricing/capacityFactor": case "pricing/capacityFactor":
if val, ok := value.(float64); ok && val >= 0 { if val, ok := value.(float64); ok && val >= 0 {
client.capacityFactor = val / 1000000000 client.capacityFactor = val / 1000000000
updatePrice = true updatePrice = true
} else { } else {
err = ErrInvalidValue err = errInvalidValue
} }
case "pricing/requestCostFactor": case "pricing/requestCostFactor":
if val, ok := value.(float64); ok && val >= 0 { if val, ok := value.(float64); ok && val >= 0 {
client.requestCostFactor = val / 1000000000 client.requestCostFactor = val / 1000000000
updatePrice = true updatePrice = true
} else { } else {
err = ErrInvalidValue err = errInvalidValue
} }
case "pricing/alert": case "pricing/alert":
if val, ok := value.(float64); ok && val >= 0 { if val, ok := value.(float64); ok && val >= 0 {
api.server.priorityClientPool.setPriceUpdate(client, uint64(val), false) api.server.priorityClientPool.setPriceUpdate(client, uint64(val), false)
} else { } else {
err = ErrInvalidValue err = errInvalidValue
} }
case "pricing/periodicUpdate": case "pricing/periodicUpdate":
if val, ok := value.(float64); ok && val >= 0 { if val, ok := value.(float64); ok && val >= 0 {
api.server.priorityClientPool.setPriceUpdate(client, uint64(val), true) api.server.priorityClientPool.setPriceUpdate(client, uint64(val), true)
} else { } else {
err = ErrInvalidValue err = errInvalidValue
} }
default: default:
err = ErrInvalidParam err = errInvalidParam
} }
if err != nil { if err != nil {
if finalErr == nil { if finalErr == nil {
finalErr = err finalErr = err
} else { } else {
finalErr = ErrMultiple finalErr = errMultiple
} }
} }
} }
@ -230,10 +231,10 @@ func (api *PrivateLightServerAPI) Benchmark(setups []map[string]interface{}, pas
case "txStatus": case "txStatus":
benchmarks[i] = &benchmarkTxStatus{} benchmarks[i] = &benchmarkTxStatus{}
default: default:
return nil, ErrUnknownBenchmarkType return nil, errUnknownBenchmarkType
} }
} else { } else {
return nil, ErrUnknownBenchmarkType return nil, errUnknownBenchmarkType
} }
} }
rs := api.server.protocolManager.runBenchmark(benchmarks, passCount, time.Millisecond*time.Duration(length)) rs := api.server.protocolManager.runBenchmark(benchmarks, passCount, time.Millisecond*time.Duration(length))
@ -272,7 +273,7 @@ func (api *PrivateDebugAPI) FreezeClient(id enode.ID) error {
// priorityClientInfo entries exist for all prioritized clients and currently connected non-priority clients // priorityClientInfo entries exist for all prioritized clients and currently connected non-priority clients
type priorityClientInfo struct { type priorityClientInfo struct {
cap uint64 // zero for non-priority clients capacity uint64 // zero for non-priority clients
connected bool connected bool
userTags map[string]struct{} userTags map[string]struct{}
peer *peer peer *peer
@ -297,11 +298,11 @@ func (c *priorityClientInfo) matchTags(tags []string) bool {
return false return false
} }
case "$priority": case "$priority":
if c.cap == 0 { if c.capacity == 0 {
return false return false
} }
case "$free": case "$free":
if c.cap != 0 { if c.capacity != 0 {
return false return false
} }
default: default:
@ -373,15 +374,15 @@ func (v *priorityClientPool) registerPeer(p *peer) {
c = &priorityClientInfo{id: id} c = &priorityClientInfo{id: id}
v.clients[id] = c v.clients[id] = c
} }
v.logger.Event(fmt.Sprintf("priorityClientPool: registerPeer cap=%d connected=%v, %x", c.cap, c.connected, id.Bytes())) v.logger.Event(fmt.Sprintf("priorityClientPool: registerPeer capacity=%d connected=%v, %x", c.capacity, c.connected, id.Bytes()))
if c.connected { if c.connected {
return return
} }
if c.cap == 0 && v.child != nil { if c.capacity == 0 && v.child != nil {
v.child.registerPeer(p) v.child.registerPeer(p)
v.freeCount++ v.freeCount++
} }
if c.cap != 0 && v.totalConnectedCap+c.cap > v.totalCap { if c.capacity != 0 && v.totalConnectedCap+c.capacity > v.totalCap {
v.logger.Event(fmt.Sprintf("priorityClientPool: rejected, %x", id.Bytes())) v.logger.Event(fmt.Sprintf("priorityClientPool: rejected, %x", id.Bytes()))
go v.ps.Unregister(p.id) go v.ps.Unregister(p.id)
return return
@ -391,15 +392,15 @@ func (v *priorityClientPool) registerPeer(p *peer) {
v.updatePriceFactors(c) v.updatePriceFactors(c)
c.peer = p c.peer = p
p.priceTracker = &c.priceTracker p.priceTracker = &c.priceTracker
if c.cap != 0 { if c.capacity != 0 {
v.priorityCount++ v.priorityCount++
v.totalConnectedCap += c.cap v.totalConnectedCap += c.capacity
v.logger.Event(fmt.Sprintf("priorityClientPool: accepted with %d capacity, %x", c.cap, id.Bytes())) v.logger.Event(fmt.Sprintf("priorityClientPool: accepted with %d capacity, %x", c.capacity, id.Bytes()))
v.logTotalPriConn.Update(float64(v.totalConnectedCap)) v.logTotalPriConn.Update(float64(v.totalConnectedCap))
if v.child != nil { if v.child != nil {
v.child.setLimits(v.maxPeers-v.priorityCount, v.totalCap-v.totalConnectedCap) v.child.setLimits(v.maxPeers-v.priorityCount, v.totalCap-v.totalConnectedCap)
} }
p.updateCapacity(c.cap) p.updateCapacity(c.capacity)
} }
v.sendEvent("connect", c) v.sendEvent("connect", c)
} }
@ -415,15 +416,15 @@ func (v *priorityClientPool) unregisterPeer(p *peer) {
if c == nil { if c == nil {
return return
} }
v.logger.Event(fmt.Sprintf("priorityClientPool: unregisterPeer cap=%d connected=%v, %x", c.cap, c.connected, id.Bytes())) v.logger.Event(fmt.Sprintf("priorityClientPool: unregisterPeer capacity=%d connected=%v, %x", c.capacity, c.connected, id.Bytes()))
if !c.connected { if !c.connected {
return return
} }
c.priceTracker.setFactors(0, 0) c.priceTracker.setFactors(0, 0)
if c.cap != 0 { if c.capacity != 0 {
c.connected = false c.connected = false
v.priorityCount-- v.priorityCount--
v.totalConnectedCap -= c.cap v.totalConnectedCap -= c.capacity
v.logTotalPriConn.Update(float64(v.totalConnectedCap)) v.logTotalPriConn.Update(float64(v.totalConnectedCap))
if v.child != nil { if v.child != nil {
v.child.setLimits(v.maxPeers-v.priorityCount, v.totalCap-v.totalConnectedCap) v.child.setLimits(v.maxPeers-v.priorityCount, v.totalCap-v.totalConnectedCap)
@ -442,13 +443,13 @@ func (v *priorityClientPool) unregisterPeer(p *peer) {
func (v *priorityClientPool) clientInfo(c *priorityClientInfo) map[string]interface{} { func (v *priorityClientPool) clientInfo(c *priorityClientInfo) map[string]interface{} {
clientInfo := make(map[string]interface{}) clientInfo := make(map[string]interface{})
clientInfo["isConnected"] = c.connected clientInfo["isConnected"] = c.connected
cap := c.cap capacity := c.capacity
pri := true pri := true
if cap == 0 { if capacity == 0 {
cap = v.freeClientCap capacity = v.freeClientCap
pri = false pri = false
} }
clientInfo["capacity"] = cap clientInfo["capacity"] = capacity
clientInfo["hasPriority"] = pri clientInfo["hasPriority"] = pri
tags := make([]string, 0, len(c.userTags)) tags := make([]string, 0, len(c.userTags))
for tag, _ := range c.userTags { for tag, _ := range c.userTags {
@ -511,7 +512,7 @@ func (v *priorityClientPool) matchClients(ids []enode.ID, tags []string, cb func
v.clients[id] = c v.clients[id] = c
} }
cb(c) cb(c)
if c.cap == 0 && !c.connected { if c.capacity == 0 && !c.connected {
delete(v.clients, id) delete(v.clients, id)
} }
} }
@ -618,7 +619,7 @@ func (v *priorityClientPool) setLimitsNow(count int, totalCap uint64) {
if c.connected { if c.connected {
v.logger.Event(fmt.Sprintf("priorityClientPool: setLimitsNow kicked out, %x", id.Bytes())) v.logger.Event(fmt.Sprintf("priorityClientPool: setLimitsNow kicked out, %x", id.Bytes()))
c.connected = false c.connected = false
v.totalConnectedCap -= c.cap v.totalConnectedCap -= c.capacity
v.logTotalPriConn.Update(float64(v.totalConnectedCap)) v.logTotalPriConn.Update(float64(v.totalConnectedCap))
v.priorityCount-- v.priorityCount--
v.sendEvent("disconnect", c) v.sendEvent("disconnect", c)
@ -660,7 +661,7 @@ func (v *priorityClientPool) setClientTags(c *priorityClientInfo, tags []string)
c.userTags = make(map[string]struct{}) c.userTags = make(map[string]struct{})
for _, tag := range tags { for _, tag := range tags {
if len(tag) > 0 && tag[0] == '$' { if len(tag) > 0 && tag[0] == '$' {
return ErrInvalidTag return errInvalidTag
} }
c.userTags[tag] = struct{}{} c.userTags[tag] = struct{}{}
} }
@ -669,48 +670,48 @@ func (v *priorityClientPool) setClientTags(c *priorityClientInfo, tags []string)
} }
// setClientCapacity sets the priority capacity assigned to a given client // setClientCapacity sets the priority capacity assigned to a given client
func (v *priorityClientPool) setClientCapacity(c *priorityClientInfo, cap uint64) error { func (v *priorityClientPool) setClientCapacity(c *priorityClientInfo, capacity uint64) error {
if c.cap == cap { if c.capacity == capacity {
return nil return nil
} }
v.totalAssignedCap += cap - c.cap v.totalAssignedCap += capacity - c.capacity
if c.connected { if c.connected {
if v.totalConnectedCap+cap > v.totalCap+c.cap { if v.totalConnectedCap+capacity > v.totalCap+c.capacity {
return ErrTotalCap return errTotalCap
} }
if c.cap == 0 { if c.capacity == 0 {
if v.child != nil { if v.child != nil {
v.child.unregisterPeer(c.peer) v.child.unregisterPeer(c.peer)
v.freeCount-- v.freeCount--
} }
v.priorityCount++ v.priorityCount++
} }
if cap == 0 { if capacity == 0 {
v.priorityCount-- v.priorityCount--
} }
v.totalConnectedCap += cap - c.cap v.totalConnectedCap += capacity - c.capacity
v.logTotalPriConn.Update(float64(v.totalConnectedCap)) v.logTotalPriConn.Update(float64(v.totalConnectedCap))
if v.child != nil { if v.child != nil {
v.child.setLimits(v.maxPeers-v.priorityCount, v.totalCap-v.totalConnectedCap) v.child.setLimits(v.maxPeers-v.priorityCount, v.totalCap-v.totalConnectedCap)
} }
if cap == 0 { if capacity == 0 {
if v.child != nil { if v.child != nil {
v.child.registerPeer(c.peer) v.child.registerPeer(c.peer)
v.freeCount++ v.freeCount++
} }
c.peer.updateCapacity(v.freeClientCap) c.peer.updateCapacity(v.freeClientCap)
} else { } else {
c.peer.updateCapacity(cap) c.peer.updateCapacity(capacity)
} }
} }
if cap != 0 || c.connected { if capacity != 0 || c.connected {
c.cap = cap c.capacity = capacity
} else { } else {
delete(v.clients, c.id) delete(v.clients, c.id)
} }
v.sendEvent("updateCapacity", c) v.sendEvent("updateCapacity", c)
if c.connected { if c.connected {
v.logger.Event(fmt.Sprintf("priorityClientPool: changed capacity to %d, %x", cap, c.id.Bytes())) v.logger.Event(fmt.Sprintf("priorityClientPool: changed capacity to %d, %x", capacity, c.id.Bytes()))
} }
return nil return nil
} }
@ -725,17 +726,17 @@ func (v *priorityClientPool) freezeClient(id enode.ID) error {
c.peer.freezeClient() c.peer.freezeClient()
return nil return nil
} else { } else {
return ErrClientNotConnected return errClientNotConnected
} }
} }
// updatePriceFactors updates the price tracker for a client based on current parameters // updatePriceFactors updates the price tracker for a client based on current parameters
func (v *priorityClientPool) updatePriceFactors(c *priorityClientInfo) { func (v *priorityClientPool) updatePriceFactors(c *priorityClientInfo) {
cap := c.cap capacity := c.capacity
if cap == 0 { if capacity == 0 {
cap = v.freeClientCap capacity = v.freeClientCap
} }
c.priceTracker.setFactors(c.timeFactor+c.capacityFactor*float64(cap)/1000000, c.requestCostFactor) c.priceTracker.setFactors(c.timeFactor+c.capacityFactor*float64(capacity)/1000000, c.requestCostFactor)
} }
// priceTracker calculates service price for a single client based on connection time // priceTracker calculates service price for a single client based on connection time
@ -877,7 +878,7 @@ func (api *PrivateLightAPI) LatestCheckpoint() ([4]string, error) {
var res [4]string var res [4]string
cp := api.backend.latestLocalCheckpoint() cp := api.backend.latestLocalCheckpoint()
if cp.Empty() { if cp.Empty() {
return res, ErrNoCheckpoint return res, errNoCheckpoint
} }
res[0] = hexutil.EncodeUint64(cp.SectionIndex) res[0] = hexutil.EncodeUint64(cp.SectionIndex)
res[1], res[2], res[3] = cp.SectionHead.Hex(), cp.CHTRoot.Hex(), cp.BloomRoot.Hex() res[1], res[2], res[3] = cp.SectionHead.Hex(), cp.CHTRoot.Hex(), cp.BloomRoot.Hex()
@ -894,7 +895,7 @@ func (api *PrivateLightAPI) GetCheckpoint(index uint64) ([3]string, error) {
var res [3]string var res [3]string
cp := api.backend.getLocalCheckpoint(index) cp := api.backend.getLocalCheckpoint(index)
if cp.Empty() { if cp.Empty() {
return res, ErrNoCheckpoint return res, errNoCheckpoint
} }
res[0], res[1], res[2] = cp.SectionHead.Hex(), cp.CHTRoot.Hex(), cp.BloomRoot.Hex() res[0], res[1], res[2] = cp.SectionHead.Hex(), cp.CHTRoot.Hex(), cp.BloomRoot.Hex()
return res, nil return res, nil
@ -903,7 +904,7 @@ func (api *PrivateLightAPI) GetCheckpoint(index uint64) ([3]string, error) {
// GetCheckpointContractAddress returns the contract contract address in hex format. // GetCheckpointContractAddress returns the contract contract address in hex format.
func (api *PrivateLightAPI) GetCheckpointContractAddress() (string, error) { func (api *PrivateLightAPI) GetCheckpointContractAddress() (string, error) {
if api.reg == nil { if api.reg == nil {
return "", ErrNotActivated return "", errNotActivated
} }
return api.reg.config.ContractAddr.Hex(), nil return api.reg.config.ContractAddr.Hex(), nil
} }