* swarm/network: DRY out repeated giga comment
I not necessarily agree with the way we wait for event propagation.
But I truly disagree with having duplicated giga comments.
* p2p/simulations: encapsulate Node.Up field so we avoid data races
The Node.Up field was accessed concurrently without "proper" locking.
There was a lock on Network and that was used sometimes to access
the  field. Other times the locking was missed and we had
a data race.
For example: https://github.com/ethereum/go-ethereum/pull/18464
The case above was solved, but there were still intermittent/hard to
reproduce races. So let's solve the issue permanently.
resolves: ethersphere/go-ethereum#1146
* p2p/simulations: fix unmarshal of simulations.Node
Making Node.Up field private in 13292ee897e345045fbfab3bda23a77589a271c1
broke TestHTTPNetwork and TestHTTPSnapshot. Because the default
UnmarshalJSON does not handle unexported fields.
Important: The fix is partial and not proper to my taste. But I cut
scope as I think the fix may require a change to the current
serialization format. New ticket:
https://github.com/ethersphere/go-ethereum/issues/1177
* p2p/simulations: Add a sanity test case for Node.Config UnmarshalJSON
* p2p/simulations: revert back to defer Unlock() pattern for Network
It's a good patten to call `defer Unlock()` right after `Lock()` so
(new) error cases won't miss to unlock. Let's get back to that pattern.
The patten was abandoned in 85a79b3ad3,
while fixing a data race. That data race does not exist anymore,
since the Node.Up field got hidden behind its own lock.
* p2p/simulations: consistent naming for test providers Node.UnmarshalJSON
* p2p/simulations: remove JSON annotation from private fields of Node
As unexported fields are not serialized.
* p2p/simulations: fix deadlock in Network.GetRandomDownNode()
Problem: GetRandomDownNode() locks -> getDownNodeIDs() ->
GetNodes() tries to lock -> deadlock
On Network type, unexported functions must assume that `net.lock`
is already acquired and should not call exported functions which
might try to lock again.
* p2p/simulations: ensure method conformity for Network
Connect* methods were moved to p2p/simulations.Network from
swarm/network/simulation. However these new methods did not follow
the pattern of Network methods, i.e., all exported method locks
the whole Network either for read or write.
* p2p/simulations: fix deadlock during network shutdown
`TestDiscoveryPersistenceSimulationSimAdapter` often got into deadlock.
The execution was stuck on two locks, i.e, `Kademlia.lock` and
`p2p/simulations.Network.lock`. Usually the test got stuck once in each
20 executions with high confidence.
`Kademlia` was stuck in `Kademlia.EachAddr()` and `Network` in
`Network.Stop()`.
Solution: in `Network.Stop()` `net.lock` must be released before
calling `node.Stop()` as stopping a node (somehow - I did not find
the exact code path) causes `Network.InitConn()` to be called from
`Kademlia.SuggestPeer()` and that blocks on `net.lock`.
Related ticket: https://github.com/ethersphere/go-ethereum/issues/1223
* swarm/state: simplify if statement in DBStore.Put()
* p2p/simulations: remove faulty godoc from private function
The comment started with the wrong method name.
The method is simple and self explanatory. Also, it's private.
=> Let's just remove the comment.
		
	
			
		
			
				
	
	
		
			112 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			112 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
// Copyright 2018 The go-ethereum Authors
 | 
						|
// This file is part of the go-ethereum library.
 | 
						|
//
 | 
						|
// The go-ethereum library is free software: you can redistribute it and/or modify
 | 
						|
// it under the terms of the GNU Lesser General Public License as published by
 | 
						|
// the Free Software Foundation, either version 3 of the License, or
 | 
						|
// (at your option) any later version.
 | 
						|
//
 | 
						|
// The go-ethereum library is distributed in the hope that it will be useful,
 | 
						|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 | 
						|
// GNU Lesser General Public License for more details.
 | 
						|
//
 | 
						|
// You should have received a copy of the GNU Lesser General Public License
 | 
						|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 | 
						|
 | 
						|
package state
 | 
						|
 | 
						|
import (
 | 
						|
	"encoding"
 | 
						|
	"encoding/json"
 | 
						|
	"errors"
 | 
						|
 | 
						|
	"github.com/syndtr/goleveldb/leveldb"
 | 
						|
	"github.com/syndtr/goleveldb/leveldb/storage"
 | 
						|
)
 | 
						|
 | 
						|
// ErrNotFound is returned when no results are returned from the database
 | 
						|
var ErrNotFound = errors.New("ErrorNotFound")
 | 
						|
 | 
						|
// Store defines methods required to get, set, delete values for different keys
 | 
						|
// and close the underlying resources.
 | 
						|
type Store interface {
 | 
						|
	Get(key string, i interface{}) (err error)
 | 
						|
	Put(key string, i interface{}) (err error)
 | 
						|
	Delete(key string) (err error)
 | 
						|
	Close() error
 | 
						|
}
 | 
						|
 | 
						|
// DBStore uses LevelDB to store values.
 | 
						|
type DBStore struct {
 | 
						|
	db *leveldb.DB
 | 
						|
}
 | 
						|
 | 
						|
// NewDBStore creates a new instance of DBStore.
 | 
						|
func NewDBStore(path string) (s *DBStore, err error) {
 | 
						|
	db, err := leveldb.OpenFile(path, nil)
 | 
						|
	if err != nil {
 | 
						|
		return nil, err
 | 
						|
	}
 | 
						|
	return &DBStore{
 | 
						|
		db: db,
 | 
						|
	}, nil
 | 
						|
}
 | 
						|
 | 
						|
// NewInmemoryStore returns a new instance of DBStore. To be used only in tests and simulations.
 | 
						|
func NewInmemoryStore() *DBStore {
 | 
						|
	db, err := leveldb.Open(storage.NewMemStorage(), nil)
 | 
						|
	if err != nil {
 | 
						|
		panic(err)
 | 
						|
	}
 | 
						|
	return &DBStore{
 | 
						|
		db: db,
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
// Get retrieves a persisted value for a specific key. If there is no results
 | 
						|
// ErrNotFound is returned. The provided parameter should be either a byte slice or
 | 
						|
// a struct that implements the encoding.BinaryUnmarshaler interface
 | 
						|
func (s *DBStore) Get(key string, i interface{}) (err error) {
 | 
						|
	has, err := s.db.Has([]byte(key), nil)
 | 
						|
	if err != nil || !has {
 | 
						|
		return ErrNotFound
 | 
						|
	}
 | 
						|
 | 
						|
	data, err := s.db.Get([]byte(key), nil)
 | 
						|
	if err == leveldb.ErrNotFound {
 | 
						|
		return ErrNotFound
 | 
						|
	}
 | 
						|
 | 
						|
	unmarshaler, ok := i.(encoding.BinaryUnmarshaler)
 | 
						|
	if !ok {
 | 
						|
		return json.Unmarshal(data, i)
 | 
						|
	}
 | 
						|
	return unmarshaler.UnmarshalBinary(data)
 | 
						|
}
 | 
						|
 | 
						|
// Put stores an object that implements Binary for a specific key.
 | 
						|
func (s *DBStore) Put(key string, i interface{}) (err error) {
 | 
						|
	var bytes []byte
 | 
						|
	if marshaler, ok := i.(encoding.BinaryMarshaler); ok {
 | 
						|
		if bytes, err = marshaler.MarshalBinary(); err != nil {
 | 
						|
			return err
 | 
						|
		}
 | 
						|
	} else {
 | 
						|
		if bytes, err = json.Marshal(i); err != nil {
 | 
						|
			return err
 | 
						|
		}
 | 
						|
	}
 | 
						|
	return s.db.Put([]byte(key), bytes, nil)
 | 
						|
}
 | 
						|
 | 
						|
// Delete removes entries stored under a specific key.
 | 
						|
func (s *DBStore) Delete(key string) (err error) {
 | 
						|
	return s.db.Delete([]byte(key), nil)
 | 
						|
}
 | 
						|
 | 
						|
// Close releases the resources used by the underlying LevelDB.
 | 
						|
func (s *DBStore) Close() error {
 | 
						|
	return s.db.Close()
 | 
						|
}
 |