swarm: rename MemStore to InmemoryStore

swarm/network/stream/common_test.go

@@ -78,7 +78,7 @@ func NewStreamerService(ctx *adapters.ServiceContext) (node.Service, error) {
 	db := storage.NewDBAPI(store)
 	delivery := NewDelivery(kad, db)
 	deliveries[id] = delivery
-	r := NewRegistry(addr, delivery, db, state.NewMemStore(), &RegistryOptions{
+	r := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), &RegistryOptions{
 		SkipCheck: defaultSkipCheck,
 	})
 	RegisterSwarmSyncerServer(r, db)
@@ -111,7 +111,7 @@ func newStreamerTester(t *testing.T) (*p2ptest.ProtocolTester, *Registry, *stora
 
 	db := storage.NewDBAPI(localStore)
 	delivery := NewDelivery(to, db)
-	streamer := NewRegistry(addr, delivery, db, state.NewMemStore(), &RegistryOptions{
+	streamer := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), &RegistryOptions{
 		SkipCheck: defaultSkipCheck,
 	})
 	teardown := func() {

swarm/network/stream/intervals/store_test.go

@@ -25,9 +25,9 @@ import (
 
 var ErrNotFound = errors.New("not found")
 
-// TestMemStore tests basic functionality of MemStore.
+// TestInmemoryStore tests basic functionality of InmemoryStore.
-func TestMemStore(t *testing.T) {
+func TestInmemoryStore(t *testing.T) {
-	testStore(t, state.NewMemStore())
+	testStore(t, state.NewInmemoryStore())
 }
 
 // testStore is a helper function to test various Store implementations.

swarm/network/stream/intervals_test.go

@@ -50,7 +50,7 @@ func newIntervalsStreamerService(ctx *adapters.ServiceContext) (node.Service, er
 	db := storage.NewDBAPI(store)
 	delivery := NewDelivery(kad, db)
 	deliveries[id] = delivery
-	r := NewRegistry(addr, delivery, db, state.NewMemStore(), &RegistryOptions{
+	r := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), &RegistryOptions{
 		SkipCheck: defaultSkipCheck,
 	})
 

swarm/pss/client/client_test.go

@@ -212,7 +212,7 @@ func setupNetwork(numnodes int) (clients []*rpc.Client, err error) {
 }
 
 func newServices() adapters.Services {
-	stateStore := state.NewMemStore()
+	stateStore := state.NewInmemoryStore()
 	kademlias := make(map[discover.NodeID]*network.Kademlia)
 	kademlia := func(id discover.NodeID) *network.Kademlia {
 		if k, ok := kademlias[id]; ok {

swarm/pss/pss_test.go

@@ -1127,7 +1127,7 @@ func setupNetwork(numnodes int) (clients []*rpc.Client, err error) {
 }
 
 func newServices() adapters.Services {
-	stateStore := state.NewMemStore()
+	stateStore := state.NewInmemoryStore()
 	kademlias := make(map[discover.NodeID]*network.Kademlia)
 	kademlia := func(id discover.NodeID) *network.Kademlia {
 		if k, ok := kademlias[id]; ok {

swarm/state/inmemorystore.go

@@ -22,23 +22,23 @@ import (
 	"sync"
 )
 
-// MemStore is the reference implementation of Store interface that is supposed
+// InmemoryStore is the reference implementation of Store interface that is supposed
 // to be used in tests.
-type MemStore struct {
+type InmemoryStore struct {
 	db map[string][]byte
 	mu sync.RWMutex
 }
 
-// NewMemStore returns a new instance of MemStore.
+// NewInmemoryStore returns a new instance of InmemoryStore.
-func NewMemStore() *MemStore {
+func NewInmemoryStore() *InmemoryStore {
-	return &MemStore{
+	return &InmemoryStore{
 		db: make(map[string][]byte),
 	}
 }
 
 // Get retrieves a value stored for a specific key. If there is no value found,
 // ErrNotFound is returned.
-func (s *MemStore) Get(key string, i interface{}) (err error) {
+func (s *InmemoryStore) Get(key string, i interface{}) (err error) {
 	s.mu.RLock()
 	defer s.mu.RUnlock()
 
@@ -56,7 +56,7 @@ func (s *MemStore) Get(key string, i interface{}) (err error) {
 }
 
 // Put stores a value for a specific key.
-func (s *MemStore) Put(key string, i interface{}) (err error) {
+func (s *InmemoryStore) Put(key string, i interface{}) (err error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	bytes := []byte{}
@@ -77,7 +77,7 @@ func (s *MemStore) Put(key string, i interface{}) (err error) {
 }
 
 // Delete removes value stored under a specific key.
-func (s *MemStore) Delete(key string) (err error) {
+func (s *InmemoryStore) Delete(key string) (err error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
@@ -89,6 +89,6 @@ func (s *MemStore) Delete(key string) (err error) {
 }
 
 // Close does not do anything.
-func (s *MemStore) Close() error {
+func (s *InmemoryStore) Close() error {
 	return nil
 }

swarm/storage/mock/mem/mem_test.go

@@ -22,9 +22,9 @@ import (
 	"github.com/ethereum/go-ethereum/swarm/storage/mock/test"
 )
 
-// TestDBStore is running test for a GlobalStore
+// TestGlobalStore is running test for a GlobalStore
 // using test.MockStore function.
-func TestMemStore(t *testing.T) {
+func TestGlobalStore(t *testing.T) {
 	test.MockStore(t, NewGlobalStore(), 100)
 }