rename/dummy-memory (#82)

* renames dummy to memory

* unexported
This commit is contained in:
Dean Eigenmann
2019-11-02 15:52:39 +01:00
committed by GitHub
parent 2512e45906
commit 9f50ecac54
7 changed files with 25 additions and 25 deletions

View File

@@ -113,7 +113,7 @@ OUTER:
}
func createNode(transport transport.Transport, id state.PeerID, mode node.Mode) (*node.Node, error) {
ds := store.NewDummyStore()
ds := store.NewMemoryMessageStore()
logger, err := zap.NewDevelopment()
if err != nil {
return nil, err
@@ -122,7 +122,7 @@ func createNode(transport transport.Transport, id state.PeerID, mode node.Mode)
return node.NewNode(
ds,
transport,
state.NewSyncState(),
state.NewMemorySyncState(),
Calc,
0,
id,

View File

@@ -36,16 +36,16 @@ func (s *MVDSBatchSuite) SetupTest() {
in1 := make(chan transport.Packet)
t1 := transport.NewChannelTransport(0, in1)
s.ds1 = store.NewDummyStore()
s.state1 = state.NewSyncState()
s.ds1 = store.NewMemoryMessageStore()
s.state1 = state.NewMemorySyncState()
s.peers1 = peers.NewMemoryPersistence()
p1 := [65]byte{0x01}
s.client1 = node.NewNode(s.ds1, t1, s.state1, Calc, 0, p1, node.BATCH, s.peers1, logger)
in2 := make(chan transport.Packet)
t2 := transport.NewChannelTransport(0, in2)
s.ds2 = store.NewDummyStore()
s.state2 = state.NewSyncState()
s.ds2 = store.NewMemoryMessageStore()
s.state2 = state.NewMemorySyncState()
p2 := [65]byte{0x02}
s.peers2 = peers.NewMemoryPersistence()
s.client2 = node.NewNode(s.ds2, t2, s.state2, Calc, 0, p2, node.BATCH, s.peers2, logger)

View File

@@ -36,16 +36,16 @@ func (s *MVDSInteractiveSuite) SetupTest() {
in1 := make(chan transport.Packet)
t1 := transport.NewChannelTransport(0, in1)
s.ds1 = store.NewDummyStore()
s.state1 = state.NewSyncState()
s.ds1 = store.NewMemoryMessageStore()
s.state1 = state.NewMemorySyncState()
s.peers1 = peers.NewMemoryPersistence()
p1 := [65]byte{0x01}
s.client1 = node.NewNode(s.ds1, t1, s.state1, Calc, 0, p1, node.INTERACTIVE, s.peers1, logger)
in2 := make(chan transport.Packet)
t2 := transport.NewChannelTransport(0, in2)
s.ds2 = store.NewDummyStore()
s.state2 = state.NewSyncState()
s.ds2 = store.NewMemoryMessageStore()
s.state2 = state.NewMemorySyncState()
p2 := [65]byte{0x02}
s.peers2 = peers.NewMemoryPersistence()
s.client2 = node.NewNode(s.ds2, t2, s.state2, Calc, 0, p2, node.INTERACTIVE, s.peers2, logger)

View File

@@ -111,9 +111,9 @@ func NewEphemeralNode(
ID: id,
ctx: ctx,
cancel: cancel,
store: store.NewDummyStore(),
store: store.NewMemoryMessageStore(),
transport: t,
syncState: state.NewSyncState(),
syncState: state.NewMemorySyncState(),
peers: peers.NewMemoryPersistence(),
payloads: newPayloads(),
nextEpoch: nextEpoch,

View File

@@ -2,22 +2,22 @@ package peers
import "github.com/vacp2p/mvds/state"
type MemoryPersistence struct {
type memoryPersistence struct {
peers map[state.GroupID][]state.PeerID
}
func NewMemoryPersistence() *MemoryPersistence {
return &MemoryPersistence{
func NewMemoryPersistence() *memoryPersistence {
return &memoryPersistence{
peers: make(map[state.GroupID][]state.PeerID),
}
}
func (p *MemoryPersistence) Add(groupID state.GroupID, peerID state.PeerID) error {
func (p *memoryPersistence) Add(groupID state.GroupID, peerID state.PeerID) error {
p.peers[groupID] = append(p.peers[groupID], peerID)
return nil
}
func (p *MemoryPersistence) Exists(groupID state.GroupID, peerID state.PeerID) (bool, error) {
func (p *memoryPersistence) Exists(groupID state.GroupID, peerID state.PeerID) (bool, error) {
for _, peer := range p.peers[groupID] {
if peer == peerID {
return true, nil
@@ -26,7 +26,7 @@ func (p *MemoryPersistence) Exists(groupID state.GroupID, peerID state.PeerID) (
return false, nil
}
func (p *MemoryPersistence) GetByGroupID(groupID state.GroupID) ([]state.PeerID, error) {
func (p *memoryPersistence) GetByGroupID(groupID state.GroupID) ([]state.PeerID, error) {
return p.peers[groupID], nil
}

View File

@@ -10,7 +10,7 @@ type memorySyncState struct {
state []State
}
func NewSyncState() *memorySyncState {
func NewMemorySyncState() *memorySyncState {
return &memorySyncState{}
}

View File

@@ -8,16 +8,16 @@ import (
"github.com/vacp2p/mvds/state"
)
type DummyStore struct {
type memoryMessageStore struct {
sync.Mutex
ms map[state.MessageID]*protobuf.Message
}
func NewDummyStore() *DummyStore {
return &DummyStore{ms: make(map[state.MessageID]*protobuf.Message)}
func NewMemoryMessageStore() *memoryMessageStore {
return &memoryMessageStore{ms: make(map[state.MessageID]*protobuf.Message)}
}
func (ds *DummyStore) Has(id state.MessageID) (bool, error) {
func (ds *memoryMessageStore) Has(id state.MessageID) (bool, error) {
ds.Lock()
defer ds.Unlock()
@@ -25,7 +25,7 @@ func (ds *DummyStore) Has(id state.MessageID) (bool, error) {
return ok, nil
}
func (ds *DummyStore) Get(id state.MessageID) (*protobuf.Message, error) {
func (ds *memoryMessageStore) Get(id state.MessageID) (*protobuf.Message, error) {
ds.Lock()
defer ds.Unlock()
@@ -37,7 +37,7 @@ func (ds *DummyStore) Get(id state.MessageID) (*protobuf.Message, error) {
return m, nil
}
func (ds *DummyStore) Add(message *protobuf.Message) error {
func (ds *memoryMessageStore) Add(message *protobuf.Message) error {
ds.Lock()
defer ds.Unlock()
ds.ms[message.ID()] = message