Merge pull request ethereum#100 from fearlessfe/hs

refactor: history storage

Author: fearlessfe

cmd/shisui/main.go

@@ -23,7 +23,6 @@ import (
 	"github.com/ethereum/go-ethereum/portalnetwork/beacon"
 	"github.com/ethereum/go-ethereum/portalnetwork/history"
 	"github.com/ethereum/go-ethereum/portalnetwork/storage"
-	"github.com/ethereum/go-ethereum/portalnetwork/storage/sqlite"
 	"github.com/ethereum/go-ethereum/rpc"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/protolambda/zrnt/eth2/configs"
@@ -181,7 +180,15 @@ func initDiscV5(config Config, conn discover.UDPConn) (*discover.UDPv5, *enode.L
 }
 
 func initHistory(config Config, server *rpc.Server, conn discover.UDPConn, localNode *enode.LocalNode, discV5 *discover.UDPv5) error {
-	contentStorage, err := sqlite.NewContentStorage(config.DataCapacity, localNode.ID(), config.DataDir)
+	db, err := history.NewDB(config.DataDir)
+	if err != nil {
+		return err
+	}
+	contentStorage, err := history.NewHistoryStorage(storage.PortalStorageConfig{
+		StorageCapacityMB: config.DataCapacity,
+		DB:                db,
+		NodeId:            localNode.ID(),
+	})
 	if err != nil {
 		return err
 	}

portalnetwork/beacon/types.go

@@ -68,7 +68,10 @@ func (flcb *ForkedLightClientBootstrap) Deserialize(spec *common.Spec, dr *codec
 }
 
 func (flcb *ForkedLightClientBootstrap) Serialize(spec *common.Spec, w *codec.EncodingWriter) error {
-	return w.FixedLenContainer(flcb.ForkDigest, spec.Wrap(flcb.Bootstrap))
+	if err := w.Write(flcb.ForkDigest[:]); err != nil {
+		return err
+	}
+	return flcb.Bootstrap.Serialize(spec, w)
 }
 
 func (flcb *ForkedLightClientBootstrap) FixedLength(_ *common.Spec) uint64 {
@@ -113,7 +116,10 @@ func (flcu *ForkedLightClientUpdate) Deserialize(spec *common.Spec, dr *codec.De
 }
 
 func (flcu *ForkedLightClientUpdate) Serialize(spec *common.Spec, w *codec.EncodingWriter) error {
-	return w.FixedLenContainer(flcu.ForkDigest, spec.Wrap(flcu.LightClientUpdate))
+	if err := w.Write(flcu.ForkDigest[:]); err != nil {
+		return err
+	}
+	return flcu.LightClientUpdate.Serialize(spec, w)
 }
 
 func (flcu *ForkedLightClientUpdate) FixedLength(_ *common.Spec) uint64 {
@@ -195,7 +201,10 @@ func (flcou *ForkedLightClientOptimisticUpdate) Deserialize(spec *common.Spec, d
 }
 
 func (flcou *ForkedLightClientOptimisticUpdate) Serialize(spec *common.Spec, w *codec.EncodingWriter) error {
-	return w.FixedLenContainer(flcou.ForkDigest, spec.Wrap(flcou.LightClientOptimisticUpdate))
+	if err := w.Write(flcou.ForkDigest[:]); err != nil {
+		return err
+	}
+	return flcou.LightClientOptimisticUpdate.Serialize(spec, w)
 }
 
 func (flcou *ForkedLightClientOptimisticUpdate) FixedLength(_ *common.Spec) uint64 {
@@ -240,7 +249,10 @@ func (flcfu *ForkedLightClientFinalityUpdate) Deserialize(spec *common.Spec, dr
 }
 
 func (flcfu *ForkedLightClientFinalityUpdate) Serialize(spec *common.Spec, w *codec.EncodingWriter) error {
-	return w.FixedLenContainer(flcfu.ForkDigest, spec.Wrap(flcfu.LightClientFinalityUpdate))
+	if err := w.Write(flcfu.ForkDigest[:]); err != nil {
+		return err
+	}
+	return flcfu.LightClientFinalityUpdate.Serialize(spec, w)
 }
 
 func (flcfu *ForkedLightClientFinalityUpdate) FixedLength(_ *common.Spec) uint64 {