Merge branch 'master' into badger-viewable

2020-11-06 19:34:25 +00:00
parent 0b2a02c8ea 426c2e8c2b
commit 3577300aee
37 changed files with 1724 additions and 213 deletions
@@ -160,7 +160,7 @@ func NewMemory(opts *MemRepoOptions) *MemRepo {

 	return &MemRepo{
 		repoLock:   make(chan struct{}, 1),
-		blockstore: llblockstore.WrapIDStore(llblockstore.NewTemporarySync()),
+		blockstore: blockstore.WrapIDStore(blockstore.NewTemporarySync()),
 		datastore:  opts.Ds,
 		configF:    opts.ConfigF,
 		keystore:   opts.KeyStore,