Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions beacon/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@ func (bs *Storage) Radius() *uint256.Int {
return storage2.MaxDistance
}

func (bs *Storage) Close() error {
return bs.db.Close()
}

func (bs *Storage) getContentValue(contentId []byte) ([]byte, error) {
res := make([]byte, 0)
err := bs.db.QueryRowContext(context.Background(), ContentValueLookupQueryBeacon, contentId).Scan(&res)
Expand Down
9 changes: 5 additions & 4 deletions cmd/shisui/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
"github.com/optimism-java/shisui2/portalwire"
"github.com/optimism-java/shisui2/state"
"github.com/optimism-java/shisui2/storage"
"github.com/optimism-java/shisui2/storage/sqlite"
"github.com/optimism-java/shisui2/web3"
"github.com/protolambda/zrnt/eth2/configs"
"github.com/urfave/cli/v2"
Expand Down Expand Up @@ -378,11 +379,11 @@ func doPortMapping(natm nat.Interface, ln *enode.LocalNode, addr *net.UDPAddr) {

func initHistory(config Config, server *rpc.Server, conn discover.UDPConn, localNode *enode.LocalNode, discV5 *discover.UDPv5, utp *portalwire.PortalUtp) (*history.Network, error) {
networkName := portalwire.History.Name()
db, err := history.NewDB(config.DataDir, networkName)
db, err := sqlite.NewDB(config.DataDir, networkName)
if err != nil {
return nil, err
}
contentStorage, err := history.NewHistoryStorage(storage.PortalStorageConfig{
contentStorage, err := sqlite.NewHistoryStorage(storage.PortalStorageConfig{
StorageCapacityMB: config.DataCapacity,
DB: db,
NodeId: localNode.ID(),
Expand Down Expand Up @@ -472,11 +473,11 @@ func initBeacon(config Config, server *rpc.Server, conn discover.UDPConn, localN

func initState(config Config, server *rpc.Server, conn discover.UDPConn, localNode *enode.LocalNode, discV5 *discover.UDPv5, utp *portalwire.PortalUtp) (*state.Network, error) {
networkName := portalwire.State.Name()
db, err := history.NewDB(config.DataDir, networkName)
db, err := sqlite.NewDB(config.DataDir, networkName)
if err != nil {
return nil, err
}
contentStorage, err := history.NewHistoryStorage(storage.PortalStorageConfig{
contentStorage, err := sqlite.NewHistoryStorage(storage.PortalStorageConfig{
StorageCapacityMB: config.DataCapacity,
DB: db,
NodeId: localNode.ID(),
Expand Down
Binary file removed history/history.sqlite
Binary file not shown.
Loading
Loading