.

go/zodb/storage/demo/demo.go

@@ -117,7 +117,7 @@ func (d *Storage) watcher(ctx context.Context) error {
 			}
 
 			d.shutdown(edown)
-			ev := &zodb.EventError{edown} // XXX + context
+			ev := &zodb.EventError{&zodb.OpError{URL: d.URL(), Op: "watch", Err: edown}}
 			if d.watchq != nil {
 				d.watchq <- ev	// XXX + select on close ?
 			}

go/zodb/storage/demo/demo_test.go

@@ -238,7 +238,7 @@ func TestWatchLoad_vs_BaseMutate(t *testing.T) {
 			baseAt0:  0,
 			baseHead: tid,
 		}
-		evErrOk := &zodb.EventError{Err: errBaseMutated}
+		evErrOk := &zodb.EventError{&zodb.OpError{URL: ddrv.URL(), Op: "watch", Err: errBaseMutated}}
 		if !reflect.DeepEqual(evErr, evErrOk) {
 			t.Fatalf("after base mutate: unexpected event:\nhave: %s\nwant: %s", evErr, evErrOk)
 		}