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

swarm: cleanup, comment and tidy up for PR

Browse source
This commit is contained in:
Fabio Barone 2019-02-01 10:23:23 -05:00
parent b15960d933
commit fc919f562c
5 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
swarm/api/testapi.go
View file

@ -37,6 +37,7 @@ func (c *Control) Hive() string {
return c.hive.String() return c.hive.String()
} }
// DebugAPI is a umbrella structure to provide additional debug API endpoints
type DebugAPI struct { type DebugAPI struct {
netStore *storage.NetStore netStore *storage.NetStore
} }
@ -47,14 +48,13 @@ func NewDebugAPI(nstore *storage.NetStore) *DebugAPI {
} }
} }
func (dapi *DebugAPI) String() string { // HasChunk returns true if the underlying datastore has
return "debugapi" // the chunk stored with the given address, false if it does not store it
}
func (dapi *DebugAPI) HasChunk(chunkAddress storage.Address) bool { func (dapi *DebugAPI) HasChunk(chunkAddress storage.Address) bool {
return dapi.netStore.HasChunk(context.Background(), chunkAddress) return dapi.netStore.HasChunk(context.Background(), chunkAddress)
} }
// The description for the DebugAPI to add to the APIs if the flag is set
func GetDebugAPIDesc(nstore *storage.NetStore) rpc.API { func GetDebugAPIDesc(nstore *storage.NetStore) rpc.API {
return rpc.API{ return rpc.API{
Namespace: "debugapi", Namespace: "debugapi",

1
swarm/storage/common_test.go
View file

@ -266,6 +266,7 @@ func (m *MapChunkStore) Get(_ context.Context, ref Address) (Chunk, error) {
return chunk, nil return chunk, nil
} }
// Need to implement HasChunk from SyncChunkStore
func (m *MapChunkStore) HasChunk(ctx context.Context, ref Address) bool { func (m *MapChunkStore) HasChunk(ctx context.Context, ref Address) bool {
m.mu.RLock() m.mu.RLock()
defer m.mu.RUnlock() defer m.mu.RUnlock()

1
swarm/storage/memstore.go
View file

@ -48,6 +48,7 @@ func NewMemStore(params *StoreParams, _ *LDBStore) (m *MemStore) {
} }
} }
// HasChunk needed to implement SyncChunkStore
func (m *MemStore) HasChunk(_ context.Context, addr Address) bool { func (m *MemStore) HasChunk(_ context.Context, addr Address) bool {
return m.cache.Contains(addr) return m.cache.Contains(addr)
} }

3
swarm/storage/netstore.go
View file

@ -158,6 +158,9 @@ func (n *NetStore) get(ctx context.Context, ref Address) (Chunk, func(context.Co
return chunk, nil, nil return chunk, nil, nil
} }
// HasChunk is the storage layer entry point to query the underlying
// database to return if it has a chunk or not.
// Called from the DebugAPI
func (n *NetStore) HasChunk(ctx context.Context, ref Address) bool { func (n *NetStore) HasChunk(ctx context.Context, ref Address) bool {
return n.store.HasChunk(ctx, ref) return n.store.HasChunk(ctx, ref)
} }

1
swarm/swarm.go
View file

@ -514,6 +514,7 @@ func (self *Swarm) APIs() []rpc.API {
apis = append(apis, self.ps.APIs()...) apis = append(apis, self.ps.APIs()...)
} }
// Only provide certain endpoints if the `debug-api` flag is set
if self.config.DebugAPI { if self.config.DebugAPI {
log.Info("Running node with debug APIs attached") log.Info("Running node with debug APIs attached")
apis = append(apis, api.GetDebugAPIDesc(self.netStore)) apis = append(apis, api.GetDebugAPIDesc(self.netStore))