From c45ce799379341c037253f76408557cf7299bcc5 Mon Sep 17 00:00:00 2001 From: lash Date: Mon, 15 Jan 2018 15:08:24 +0100 Subject: [PATCH] swarm/storage: Rebase after swarm-mutableresource-index mergg --- swarm/storage/resource.go | 6 +++--- swarm/storage/resource_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/swarm/storage/resource.go b/swarm/storage/resource.go index 63c497c280..5057a03019 100644 --- a/swarm/storage/resource.go +++ b/swarm/storage/resource.go @@ -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 // `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) 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) } -func (self *ResourceHandler) getResource(name string) *resource { +func (self *RawResourceHandler) getResource(name string) *resource { self.resourceLock.RLock() defer self.resourceLock.RUnlock() rsrc := self.resources[name] return rsrc } -func (self *ResourceHandler) setResource(name string, rsrc *resource) { +func (self *RawResourceHandler) setResource(name string, rsrc *resource) { self.resourceLock.Lock() defer self.resourceLock.Unlock() self.resources[name] = rsrc diff --git a/swarm/storage/resource_test.go b/swarm/storage/resource_test.go index 5630738a7e..b699733447 100644 --- a/swarm/storage/resource_test.go +++ b/swarm/storage/resource_test.go @@ -286,7 +286,7 @@ func TestResourceHandler(t *testing.T) { if err != nil { teardownTest(t, err) } - err = rh2.SetResource(rsrc, true) + err = rh2.SetExternalResource(rsrc, true) if err != nil { teardownTest(t, err) }