INS-1644 fix GetLedgerComponents

insolar · Feb 27, 2019 · 0e991a5 · 0e991a5
1 parent 1e3aac3
commit 0e991a5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/configuration/ledger.go b/configuration/ledger.go
@@ -79,9 +79,6 @@ type Ledger struct {
 	// IMPORTANT: It should be the same on ALL nodes.
 	LightChainLimit int
 
-	// JetSizesHistoryDepth holds maximum number of drop sizes
-	JetSizesHistoryDepth int
-
 	// Exporter holds configuration of Exporter
 	Exporter Exporter
 
@@ -116,8 +113,6 @@ func NewLedger() Ledger {
 
 		LightChainLimit: 5, // 5 pulses
 
-		JetSizesHistoryDepth: 10,
-
 		Exporter: Exporter{
 			ExportLag: 40, // 40 seconds
 		},

diff --git a/ledger/ledger.go b/ledger/ledger.go
@@ -20,6 +20,8 @@ import (
 	"context"
 
 	"github.com/insolar/insolar/ledger/recentstorage"
+	"github.com/insolar/insolar/ledger/storage/genesis"
+	"github.com/insolar/insolar/ledger/storage/jet"
 	"github.com/insolar/insolar/ledger/storage/nodes"
 	"github.com/pkg/errors"
 
@@ -87,25 +89,36 @@ func GetLedgerComponents(conf configuration.Ledger, certificate core.Certificate
 	}
 
 	var pulseTracker storage.PulseTracker
+	var dropModifier jet.DropModifier
+	var dropAccessor jet.DropAccessor
 	// TODO: @imarkin 18.02.18 - Comparision with core.StaticRoleUnknown is a hack for genesis pulse (INS-1537)
 	switch certificate.GetRole() {
 	case core.StaticRoleUnknown, core.StaticRoleHeavyMaterial:
 		pulseTracker = storage.NewPulseTracker()
+
+		dbDropStorage := jet.NewDropStorageDB()
+		dropModifier = dbDropStorage
+		dropAccessor = dbDropStorage
 	default:
 		pulseTracker = storage.NewPulseTrackerMemory()
+
+		memoryDropStorage := jet.NewDropStorageMemory()
+		dropModifier = memoryDropStorage
+		dropAccessor = memoryDropStorage
 	}
 
 	return []interface{}{
 		db,
 		storage.NewCleaner(),
 		pulseTracker,
 		storage.NewPulseStorage(),
-		storage.NewJetStorage(),
-		storage.NewDropStorage(conf.JetSizesHistoryDepth),
+		jet.NewJetStorage(),
+		dropModifier,
+		dropAccessor,
 		nodes.NewStorage(),
 		storage.NewObjectStorage(),
 		storage.NewReplicaStorage(),
-		storage.NewGenesisInitializer(),
+		genesis.NewGenesisInitializer(),
 		recentstorage.NewRecentStorageProvider(conf.RecentStorage.DefaultTTL),
 		artifactmanager.NewHotDataWaiterConcrete(),
 		artifactmanager.NewArtifactManger(),