From 2505b9a7dcca1e5d9d80ebfc6be7afcd97ba02dd Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Tue, 15 Apr 2014 23:45:06 -0400 Subject: Return bucket from CreateBucket() functions. This commit changes the API for: Tx.CreateBucket() Tx.CreateBucketIfNotExists() Bucket.CreateBucket() Bucket.CreateBucketIfNotExists() These functions now return the *Bucket and error instead of just the error. --- bolt_test.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'bolt_test.go') diff --git a/bolt_test.go b/bolt_test.go index bbf00f5..9c196c6 100644 --- a/bolt_test.go +++ b/bolt_test.go @@ -154,18 +154,16 @@ func simulateGetHandler(tx *Tx, qdb *QuickDB) { // Inserts a key into the database. func simulatePutHandler(tx *Tx, qdb *QuickDB) { + var err error keys, value := randKeys(), randValue() // Retrieve root bucket. b := tx.Bucket(keys[0]) if b == nil { - if err := tx.CreateBucket(keys[0]); err != nil { + b, err = tx.CreateBucket(keys[0]) + if err != nil { panic("create bucket: " + err.Error()) } - b = tx.Bucket(keys[0]) - if b == nil { - panic(fmt.Sprintf("bucket[0] nil: %v", keys[0])) - } } // Create nested buckets, if necessary. @@ -174,10 +172,10 @@ func simulatePutHandler(tx *Tx, qdb *QuickDB) { if child != nil { b = child } else { - if err := b.CreateBucket(key); err != nil { + b, err = b.CreateBucket(key) + if err != nil { panic("create bucket: " + err.Error()) } - b = b.Bucket(key) } } -- cgit v1.2.3