address comment

state/factory/factory.go

@@ -267,15 +267,14 @@ func (sf *factory) newWorkingSet(ctx context.Context, height uint64) (*workingSe
 		return nil, err
 	}
 	var (
-		rootKey    = ArchiveTrieRootKey
-		createTrie = true
+		store workingSetStore
 	)
 	if height < sf.currentChainHeight {
 		// archive mode
-		rootKey = fmt.Sprintf("%s-%d", ArchiveTrieRootKey, height)
-		createTrie = false
+		store, err = newFactoryWorkingSetStoreAtHeight(sf.protocolView, flusher, height)
+	} else {
+		store, err = newFactoryWorkingSetStore(sf.protocolView, flusher)
 	}
-	store, err := newFactoryWorkingSetStore(sf.protocolView, flusher, rootKey, createTrie)
 	if err != nil {
 		return nil, err
 	}

state/factory/workingset.go

@@ -333,7 +333,7 @@ func (ws *workingSet) Commit(ctx context.Context) error {
 		return err
 	}
 	ws.Reset()
-	return ws.store.Stop(ctx)
+	return nil
 }
 
 // State pulls a state from DB

state/factory/workingsetstore.go

@@ -56,8 +56,23 @@ func newStateDBWorkingSetStore(view protocol.View, flusher db.KVStoreFlusher, re
 	}
 }
 
-func newFactoryWorkingSetStore(view protocol.View, flusher db.KVStoreFlusher, trieRootKey string, createTrie bool) (workingSetStore, error) {
-	tlt, err := newTwoLayerTrie(ArchiveTrieNamespace, flusher.KVStoreWithBuffer(), trieRootKey, createTrie)
+func newFactoryWorkingSetStore(view protocol.View, flusher db.KVStoreFlusher) (workingSetStore, error) {
+	tlt, err := newTwoLayerTrie(ArchiveTrieNamespace, flusher.KVStoreWithBuffer(), ArchiveTrieRootKey, true)
+	if err != nil {
+		return nil, err
+	}
+
+	return &factoryWorkingSetStore{
+		flusher:   flusher,
+		view:      view,
+		tlt:       tlt,
+		trieRoots: make(map[int][]byte),
+	}, nil
+}
+
+func newFactoryWorkingSetStoreAtHeight(view protocol.View, flusher db.KVStoreFlusher, height uint64) (workingSetStore, error) {
+	rootKey := fmt.Sprintf("%s-%d", ArchiveTrieRootKey, height)
+	tlt, err := newTwoLayerTrie(ArchiveTrieNamespace, flusher.KVStoreWithBuffer(), rootKey, false)
 	if err != nil {
 		return nil, err
 	}