Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-07-03 11:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v0.1.1-dev' into v0.1.2-dev

Browse Source
This commit is contained in:
Mike Zak 2020-01-28 11:35:21 +02:00
commit 25bdaeed31
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blockdag/dag.go
View File

@ -1992,7 +1992,10 @@ func New(config *Config) (*BlockDAG, error) {
if genesis == nil { if genesis == nil {
genesisBlock := util.NewBlock(dag.dagParams.GenesisBlock) genesisBlock := util.NewBlock(dag.dagParams.GenesisBlock)
isOrphan, isDelayed, err := dag.ProcessBlock(genesisBlock, BFNone) // To prevent the creation of a new err variable unintentionally so the
// defered function above could read err - declare isOrphan and isDelayed explicitly.
var isOrphan, isDelayed bool
isOrphan, isDelayed, err = dag.ProcessBlock(genesisBlock, BFNone)
if err != nil { if err != nil {
return nil, err return nil, err
} }

3
database/ffldb/db.go
View File

@ -7,7 +7,6 @@ package ffldb
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"encoding/hex"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
@ -640,7 +639,7 @@ func (b *bucket) CreateBucket(key []byte) (database.Bucket, error) {
// Ensure bucket does not already exist. // Ensure bucket does not already exist.
bidxKey := bucketIndexKey(b.id, key) bidxKey := bucketIndexKey(b.id, key)
if b.tx.hasKey(bidxKey) { if b.tx.hasKey(bidxKey) {
str := fmt.Sprintf("bucket %s already exists", hex.EncodeToString(bidxKey)) str := fmt.Sprintf("bucket %s already exists", string(bidxKey))
return nil, makeDbErr(database.ErrBucketExists, str, nil) return nil, makeDbErr(database.ErrBucketExists, str, nil)
} }