.

go/zodb/storage/demo/demo_test.go

@@ -20,9 +20,14 @@
 package demo
 
 import (
+	"bytes"
+	"context"
+	"regexp"
 	"testing"
 
 	"lab.nexedi.com/kirr/neo/go/internal/xtesting"
+	"lab.nexedi.com/kirr/neo/go/zodb"
+	"lab.nexedi.com/kirr/neo/go/zodb/zodbtools"
 )
 
 // tOptions represents options for testing.
@@ -48,8 +53,8 @@ func withDemoStorage(t *testing.T, f func(t *testing.T, dsrv *Storage/*XXX -> Sr
 	zdump := ""
 	if opt.Preload != "" {
 		ctx := context.Background()
-		buf := bytes.Buffer{}
-		stor, _, err := fs1.Open(ctx, opt.Preload, &zodb.DriverOptions{ReadOnly: true}); X(err)
+		buf := &bytes.Buffer{}
+		stor, err := zodb.Open(ctx, opt.Preload, &zodb.OpenOptions{ReadOnly: true}); X(err)
 		err = zodbtools.Dump(ctx, buf, stor, 0, zodb.TidMax, /*hashonly=*/false)
 		stor.Close()
 		X(err)
@@ -57,7 +62,7 @@ func withDemoStorage(t *testing.T, f func(t *testing.T, dsrv *Storage/*XXX -> Sr
 	}
 
 	// split zdump into transactions
-	// TODO -> zodbtools.DumpReader
+	// XXX hacky; TODO -> zodbtools.DumpReader
 	txnRe := regexp.MustCompile(`^txn (?P<tid>[0-9a-f]{16}) "(?P<status>.)"$`)
 	type zdumpTxn struct {
 		tid zodb.Tid
@@ -68,12 +73,13 @@ func withDemoStorage(t *testing.T, f func(t *testing.T, dsrv *Storage/*XXX -> Sr
 		// [m[0]:m[1]] refer to whole txn line
 		__ := zdump[m[2]:m[3]]
 		tid, err := zodb.ParseTid(__); X(err)
-		txnv = append(txnv, zdumpTxn{tid, m[0])
+		txnv = append(txnv, zdumpTxn{tid, m[0]})
 	}
 
-
 	// verify on all combinations of preload being split into base+δ 
-	txnv, err := xtesting.LoadDBHistory(opt.Preload); X(err)
 
+/*
+	txnv, err := xtesting.LoadDBHistory(opt.Preload); X(err)
 	_ = txnv
+*/
 }