LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

gofmt.

Browse source
This commit is contained in:
Dave Collins 2013-09-09 15:50:13 -05:00
parent 30f2003301
commit 85553133ce
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ldb/boundary_test.go
View file

@ -13,7 +13,7 @@ import (
// we need to test for empty databas and make certain it returns proper value // we need to test for empty databas and make certain it returns proper value
func TestEmptyDB(t *testing.T) { func TestEmptyDB(t *testing.T) {
dbname := "tstdbempty" dbname := "tstdbempty"
_ = os.RemoveAll(dbname) _ = os.RemoveAll(dbname)
db, err := btcdb.CreateDB("leveldb", dbname) db, err := btcdb.CreateDB("leveldb", dbname)

19
ldb/leveldb.go
View file

@ -45,8 +45,8 @@ type LevelDb struct {
// leveldb pieces // leveldb pieces
lDb *leveldb.DB lDb *leveldb.DB
ro *opt.ReadOptions ro *opt.ReadOptions
wo *opt.WriteOptions wo *opt.WriteOptions
lbatch *leveldb.Batch lbatch *leveldb.Batch
@ -134,7 +134,7 @@ func openDB(dbpath string, flag opt.OptionsFlag) (pbdb btcdb.Db, err error) {
var tlDb *leveldb.DB var tlDb *leveldb.DB
defer func() { defer func() {
if err == nil { if err == nil {
db.lDb = tlDb db.lDb = tlDb
db.txUpdateMap = map[btcwire.ShaHash]*txUpdateObj{} db.txUpdateMap = map[btcwire.ShaHash]*txUpdateObj{}
@ -200,12 +200,12 @@ func (db *LevelDb) Close() {
func (db *LevelDb) DropAfterBlockBySha(sha *btcwire.ShaHash) (rerr error) { func (db *LevelDb) DropAfterBlockBySha(sha *btcwire.ShaHash) (rerr error) {
db.dbLock.Lock() db.dbLock.Lock()
defer db.dbLock.Unlock() defer db.dbLock.Unlock()
defer func () { defer func() {
if rerr == nil { if rerr == nil {
rerr = db.processBatches() rerr = db.processBatches()
} }
} () }()
startheight := db.nextBlock - 1 startheight := db.nextBlock - 1
@ -256,12 +256,11 @@ func (db *LevelDb) DropAfterBlockBySha(sha *btcwire.ShaHash) (rerr error) {
func (db *LevelDb) InsertBlock(block *btcutil.Block) (height int64, rerr error) { func (db *LevelDb) InsertBlock(block *btcutil.Block) (height int64, rerr error) {
db.dbLock.Lock() db.dbLock.Lock()
defer db.dbLock.Unlock() defer db.dbLock.Unlock()
defer func () { defer func() {
if rerr == nil { if rerr == nil {
rerr = db.processBatches() rerr = db.processBatches()
} }
} () }()
blocksha, err := block.Sha() blocksha, err := block.Sha()
if err != nil { if err != nil {
@ -448,12 +447,12 @@ func int64ToKey(keyint int64) []byte {
} }
func shaBlkToKey(sha *btcwire.ShaHash) []byte { func shaBlkToKey(sha *btcwire.ShaHash) []byte {
shaB := sha.Bytes() shaB := sha.Bytes()
return shaB return shaB
} }
func shaTxToKey(sha *btcwire.ShaHash) []byte { func shaTxToKey(sha *btcwire.ShaHash) []byte {
shaB := sha.Bytes() shaB := sha.Bytes()
shaB = append(shaB, "tx"...) shaB = append(shaB, "tx"...)
return shaB return shaB
} }

1
ldb/operational_test.go
View file

@ -282,7 +282,6 @@ func testBackout(t *testing.T, mode int) {
} }
} }
var savedblocks []*btcutil.Block var savedblocks []*btcutil.Block
func loadBlocks(t *testing.T, file string) (blocks []*btcutil.Block, err error) { func loadBlocks(t *testing.T, file string) (blocks []*btcutil.Block, err error) {