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

feat: change method params

Browse source 
ContentLookup and TraceContentLookup method
This commit is contained in:
fearlessfe 2024-03-25 22:07:37 +08:00 committed by Chen Kai
parent 021ce2ece9
commit 923ec257b4
5 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
p2p/discover/api.go
View file

@ -458,7 +458,8 @@ func (p *PortalProtocolAPI) RecursiveFindContent(contentKeyHex string) (*Content
if err != nil { if err != nil {
return nil, err return nil, err
} }
content, utpTransfer, err := p.portalProtocol.ContentLookup(contentKey) contentId := p.portalProtocol.toContentId(contentKey)
content, utpTransfer, err := p.portalProtocol.ContentLookup(contentKey, contentId)
if err != nil { if err != nil {
return nil, err return nil, err
@ -517,7 +518,11 @@ func (p *PortalProtocolAPI) Gossip(contentKeyHex, contentHex string) (int, error
return p.portalProtocol.NeighborhoodGossip(&id, [][]byte{contentKey}, [][]byte{content}) return p.portalProtocol.NeighborhoodGossip(&id, [][]byte{contentKey}, [][]byte{content})
} }
// TODO func (p *PortalProtocolAPI) TraceRecursiveFindContent(contentKeyHex string) (*TraceContentResult, error) {
func (p *PortalProtocolAPI) TraceRecursiveFindContent(contentKeyHex string) { contentKey, err := hexutil.Decode(contentKeyHex)
if err != nil {
return nil, err
}
contentId := p.portalProtocol.toContentId(contentKey)
return p.portalProtocol.TraceContentLookup(contentKey, contentId)
} }

12
p2p/discover/portal_protocol.go
View file

@ -1421,13 +1421,11 @@ func (p *PortalProtocol) collectTableNodes(rip net.IP, distances []uint, limit i
return nodes return nodes
} }
func (p *PortalProtocol) ContentLookup(contentKey []byte) ([]byte, bool, error) { func (p *PortalProtocol) ContentLookup(contentKey, contentId []byte) ([]byte, bool, error) {
lookupContext, cancel := context.WithCancel(context.Background()) lookupContext, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
resChan := make(chan *ContentInfoResp, 1) resChan := make(chan *ContentInfoResp, 1)
defer close(resChan) defer close(resChan)
contentId := p.ToContentId(contentKey)
newLookup(lookupContext, p.table, enode.ID(contentId), func(n *node) ([]*node, error) { newLookup(lookupContext, p.table, enode.ID(contentId), func(n *node) ([]*node, error) {
return p.contentLookupWorker(unwrapNode(n), contentKey, resChan) return p.contentLookupWorker(unwrapNode(n), contentKey, resChan)
}).run() }).run()
@ -1469,7 +1467,7 @@ func (p *PortalProtocol) contentLookupWorker(n *enode.Node, contentKey []byte, r
return wrapedNode, nil return wrapedNode, nil
} }
func (p *PortalProtocol) TraceContentLookup(contentKey []byte) (*TraceContentResult, error) { func (p *PortalProtocol) TraceContentLookup(contentKey, contentId []byte) (*TraceContentResult, error) {
lookupContext, cancel := context.WithCancel(context.Background()) lookupContext, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
requestNodeChan := make(chan *enode.Node, 3) requestNodeChan := make(chan *enode.Node, 3)
@ -1484,14 +1482,14 @@ func (p *PortalProtocol) TraceContentLookup(contentKey []byte) (*TraceContentRes
trace := &Trace{ trace := &Trace{
Origin: selfHexId, Origin: selfHexId,
TargetId: hexutil.Encode(p.ToContentId(contentKey)), TargetId: hexutil.Encode(contentId),
StartedAtMs: int(time.Now().UnixMilli()), StartedAtMs: int(time.Now().UnixMilli()),
Responses: make(map[string][]string), Responses: make(map[string][]string),
Metadata: make(map[string]*NodeMetadata), Metadata: make(map[string]*NodeMetadata),
Cancelled: make([]string, 0), Cancelled: make([]string, 0),
} }
nodes := p.table.findnodeByID(enode.ID(p.ToContentId(contentKey)), bucketSize, false) nodes := p.table.findnodeByID(enode.ID(contentId), bucketSize, false)
localResponse := make([]string, 0, len(nodes.entries)) localResponse := make([]string, 0, len(nodes.entries))
for _, node := range nodes.entries { for _, node := range nodes.entries {
@ -1500,8 +1498,6 @@ func (p *PortalProtocol) TraceContentLookup(contentKey []byte) (*TraceContentRes
} }
trace.Responses[selfHexId] = localResponse trace.Responses[selfHexId] = localResponse
contentId := p.ToContentId(contentKey)
dis := p.Distance(p.Self().ID(), enode.ID(contentId)) dis := p.Distance(p.Self().ID(), enode.ID(contentId))
trace.Metadata[selfHexId] = &NodeMetadata{ trace.Metadata[selfHexId] = &NodeMetadata{

7
p2p/discover/portal_protocol_test.go
View file

@ -455,11 +455,12 @@ func TestContentLookup(t *testing.T) {
err = node3.storage.Put(nil, contentId, content) err = node3.storage.Put(nil, contentId, content)
assert.NoError(t, err) assert.NoError(t, err)
res, _, err := node1.ContentLookup(contentKey) res, _, err := node1.ContentLookup(contentKey, contentId)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, res, content) assert.Equal(t, res, content)
res, _, err = node1.ContentLookup([]byte{0x2, 0x4}) nonExist := []byte{0x2, 0x4}
res, _, err = node1.ContentLookup(nonExist, node1.toContentId(nonExist))
assert.Equal(t, ContentNotFound, err) assert.Equal(t, ContentNotFound, err)
assert.Nil(t, res) assert.Nil(t, res)
} }
@ -494,7 +495,7 @@ func TestTraceContentLookup(t *testing.T) {
node2Id := hexutil.Encode(node2.Self().ID().Bytes()) node2Id := hexutil.Encode(node2.Self().ID().Bytes())
node3Id := hexutil.Encode(node3.Self().ID().Bytes()) node3Id := hexutil.Encode(node3.Self().ID().Bytes())
res, err := node3.TraceContentLookup(contentKey) res, err := node3.TraceContentLookup(contentKey, contentId)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, res.Content, hexutil.Encode(content)) assert.Equal(t, res.Content, hexutil.Encode(content))
assert.Equal(t, res.UtpTransfer, false) assert.Equal(t, res.UtpTransfer, false)

4
portalnetwork/history/api.go
View file

@ -64,8 +64,8 @@ func (p *API) HistoryGossip(contentKeyHex, contentHex string) (int, error) {
return p.Gossip(contentKeyHex, contentHex) return p.Gossip(contentKeyHex, contentHex)
} }
func (p *API) HistoryTraceRecursiveFindContent(contentKeyHex string) { func (p *API) HistoryTraceRecursiveFindContent(contentKeyHex string) (*discover.TraceContentResult, error) {
p.TraceRecursiveFindContent(contentKeyHex) return p.TraceRecursiveFindContent(contentKeyHex)
} }
func NewHistoryNetworkAPI(historyAPI *discover.PortalProtocolAPI) *API { func NewHistoryNetworkAPI(historyAPI *discover.PortalProtocolAPI) *API {

8
portalnetwork/history/history_network.go
View file

@ -119,7 +119,7 @@ func (h *HistoryNetwork) GetBlockHeader(blockHash []byte) (*types.Header, error)
} }
// no content in local storage // no content in local storage
for retries := 0; retries < requestRetries; retries++ { for retries := 0; retries < requestRetries; retries++ {
content, _, err := h.portalProtocol.ContentLookup(contentKey) content, _, err := h.portalProtocol.ContentLookup(contentKey, contentId)
if err != nil { if err != nil {
h.log.Error("getBlockHeader failed", "contentKey", hexutil.Encode(contentKey), "err", err) h.log.Error("getBlockHeader failed", "contentKey", hexutil.Encode(contentKey), "err", err)
continue continue
@ -176,7 +176,7 @@ func (h *HistoryNetwork) GetBlockBody(blockHash []byte) (*types.Body, error) {
// no content in local storage // no content in local storage
for retries := 0; retries < requestRetries; retries++ { for retries := 0; retries < requestRetries; retries++ {
content, _, err := h.portalProtocol.ContentLookup(contentKey) content, _, err := h.portalProtocol.ContentLookup(contentKey, contentId)
if err != nil { if err != nil {
h.log.Error("getBlockBody failed", "contentKey", hexutil.Encode(contentKey), "err", err) h.log.Error("getBlockBody failed", "contentKey", hexutil.Encode(contentKey), "err", err)
continue continue
@ -231,7 +231,7 @@ func (h *HistoryNetwork) GetReceipts(blockHash []byte) ([]*types.Receipt, error)
// no content in local storage // no content in local storage
for retries := 0; retries < requestRetries; retries++ { for retries := 0; retries < requestRetries; retries++ {
content, _, err := h.portalProtocol.ContentLookup(contentKey) content, _, err := h.portalProtocol.ContentLookup(contentKey, contentId)
if err != nil { if err != nil {
h.log.Error("getReceipts failed", "contentKey", hexutil.Encode(contentKey), "err", err) h.log.Error("getReceipts failed", "contentKey", hexutil.Encode(contentKey), "err", err)
continue continue
@ -265,7 +265,7 @@ func (h *HistoryNetwork) GetEpochAccumulator(epochHash []byte) (*EpochAccumulato
return epochAccu, err return epochAccu, err
} }
for retries := 0; retries < requestRetries; retries++ { for retries := 0; retries < requestRetries; retries++ {
content, _, err := h.portalProtocol.ContentLookup(contentKey) content, _, err := h.portalProtocol.ContentLookup(contentKey, contentId)
if err != nil { if err != nil {
h.log.Error("getEpochAccumulator failed", "contentKey", hexutil.Encode(contentKey), "err", err) h.log.Error("getEpochAccumulator failed", "contentKey", hexutil.Encode(contentKey), "err", err)
continue continue