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

swarm/storage: Rebase after swarm-mutableresource-index mergg

Browse source
This commit is contained in:
lash 2018-01-15 15:08:24 +01:00
parent eef7578724
commit c45ce79937
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
swarm/storage/resource.go
View file

@ -236,7 +236,7 @@ func (self *RawResourceHandler) NewResource(name string, frequency uint64) (*res
// //
// Method will fail if resource is already registered in this session, unless // Method will fail if resource is already registered in this session, unless
// `allowOverwrite` is set // `allowOverwrite` is set
func (self *RawResourceHandler) SetResource(rsrc *resource, allowOverwrite bool) error { func (self *RawResourceHandler) SetExternalResource(rsrc *resource, allowOverwrite bool) error {
utfname, err := idna.ToUnicode(rsrc.name) utfname, err := idna.ToUnicode(rsrc.name)
if err != nil { if err != nil {
@ -552,14 +552,14 @@ func (self *RawResourceHandler) PeriodToBlock(name string, period uint32) uint64
return self.resources[name].startBlock + (uint64(period) * self.resources[name].frequency) return self.resources[name].startBlock + (uint64(period) * self.resources[name].frequency)
} }
func (self *ResourceHandler) getResource(name string) *resource { func (self *RawResourceHandler) getResource(name string) *resource {
self.resourceLock.RLock() self.resourceLock.RLock()
defer self.resourceLock.RUnlock() defer self.resourceLock.RUnlock()
rsrc := self.resources[name] rsrc := self.resources[name]
return rsrc return rsrc
} }
func (self *ResourceHandler) setResource(name string, rsrc *resource) { func (self *RawResourceHandler) setResource(name string, rsrc *resource) {
self.resourceLock.Lock() self.resourceLock.Lock()
defer self.resourceLock.Unlock() defer self.resourceLock.Unlock()
self.resources[name] = rsrc self.resources[name] = rsrc

2
swarm/storage/resource_test.go
View file

@ -286,7 +286,7 @@ func TestResourceHandler(t *testing.T) {
if err != nil { if err != nil {
teardownTest(t, err) teardownTest(t, err)
} }
err = rh2.SetResource(rsrc, true) err = rh2.SetExternalResource(rsrc, true)
if err != nil { if err != nil {
teardownTest(t, err) teardownTest(t, err)
} }