Merge pull request #396 from go-kivik/rd3

More updates to RevsDiff() method

db.go

@@ -645,10 +645,6 @@ func (db *DB) Close(ctx context.Context) error {
 	return nil
 }
 
-// RevLookup represents a rev lookup request, as sent to RevsDiff. The map
-// key is the document id, and the value is a slice of revisions.
-type RevLookup map[string][]string
-
 // RevDiff represents a rev diff for a single document, as returned by the
 // RevsDiff method.
 type RevDiff struct {
@@ -662,10 +658,11 @@ type Diffs map[string]RevDiff
 
 // RevsDiff the subset of document/revision IDs that do not correspond to
 // revisions stored in the database. This is used by the replication protocol,
-// and is normally never needed otherwise.
+// and is normally never needed otherwise.  revMap must marshal to the expected
+// format.
 //
 // See http://docs.couchdb.org/en/stable/api/database/misc.html#db-revs-diff
-func (db *DB) RevsDiff(ctx context.Context, revMap RevLookup) (Diffs, error) {
+func (db *DB) RevsDiff(ctx context.Context, revMap interface{}) (Diffs, error) {
 	if rd, ok := db.driverDB.(driver.RevsDiffer); ok {
 		result, err := rd.RevsDiff(ctx, revMap)
 		if err != nil {

db_test.go

@@ -1965,7 +1965,7 @@ func TestClientClose(t *testing.T) {
 func TestRevsDiff(t *testing.T) {
 	type tt struct {
 		db     *DB
-		revMap RevLookup
+		revMap interface{}
 		status int
 		err    string
 	}
@@ -1977,7 +1977,7 @@ func TestRevsDiff(t *testing.T) {
 	})
 	tests.Add("network error", tt{
 		db: &DB{driverDB: &mock.RevsDiffer{
-			RevsDiffFunc: func(_ context.Context, revMap map[string][]string) (map[string]driver.RevDiff, error) {
+			RevsDiffFunc: func(_ context.Context, revMap interface{}) (map[string]driver.RevDiff, error) {
 				return nil, errors.New("net error")
 			},
 		}},
@@ -1986,7 +1986,7 @@ func TestRevsDiff(t *testing.T) {
 	})
 	tests.Add("success", tt{
 		db: &DB{driverDB: &mock.RevsDiffer{
-			RevsDiffFunc: func(_ context.Context, revMap map[string][]string) (map[string]driver.RevDiff, error) {
+			RevsDiffFunc: func(_ context.Context, revMap interface{}) (map[string]driver.RevDiff, error) {
 				return map[string]driver.RevDiff{
 					"foo": {Missing: []string{"1", "2"}},
 					"bar": {PossibleAncestors: []string{"3", "4"}},

driver/driver.go

@@ -403,5 +403,5 @@ type RevDiff struct {
 
 // RevsDiffer is an optional interface that may be implemented by a DB.
 type RevsDiffer interface {
-	RevsDiff(ctx context.Context, revMap map[string][]string) (map[string]RevDiff, error)
+	RevsDiff(ctx context.Context, revMap interface{}) (map[string]RevDiff, error)
 }

mock/db.go

@@ -267,12 +267,12 @@ func (db *DBCloser) Close(ctx context.Context) error {
 // RevsDiffer mocks a driver.DB and driver.RevsDiffer.
 type RevsDiffer struct {
 	*BulkDocer
-	RevsDiffFunc func(context.Context, map[string][]string) (map[string]driver.RevDiff, error)
+	RevsDiffFunc func(context.Context, interface{}) (map[string]driver.RevDiff, error)
 }
 
 var _ driver.RevsDiffer = &RevsDiffer{}
 
 // RevsDiff calls db.RevsDiffFunc
-func (db *RevsDiffer) RevsDiff(ctx context.Context, revMap map[string][]string) (map[string]driver.RevDiff, error) {
+func (db *RevsDiffer) RevsDiff(ctx context.Context, revMap interface{}) (map[string]driver.RevDiff, error) {
 	return db.RevsDiffFunc(ctx, revMap)
 }