Don't init native asset in init function (#324)

* Don't init native asset in init function

Previously, the init of logrus is after the invoke of creating native
asset, which may lead to incomplete logging.

* InitNativeAsset before NewRegistry

* Call initNativeAsset in NewRegistry

diff --git a/blockchain/asset/asset.go b/blockchain/asset/asset.go
index 5ad2e84..31abf50 100755 (executable)
--- a/blockchain/asset/asset.go
+++ b/blockchain/asset/asset.go
@@ -23,10 +23,6 @@ import (
        "github.com/bytom/protocol/vm/vmutil"
 )
 
-func init() {
-       DefaultNativeAsset = generateNativeAsset()
-}
-
 var DefaultNativeAsset *Asset
 
 const (
@@ -36,24 +32,24 @@ const (
        AliasPrefix = "ALS:"
        //ExternalAssetPrefix is external definition assets prefix
        ExternalAssetPrefix = "EXA"
-       indexPrefix   = "ASSIDX:"
+       indexPrefix         = "ASSIDX:"
 )
 
-func generateNativeAsset() *Asset {
+func initNativeAsset() {
        genesisBlock := cfg.GenerateGenesisBlock()
        signer := &signers.Signer{Type: "internal"}
        alias := consensus.BTMAlias
 
        definitionBytes, _ := serializeAssetDef(consensus.BTMDefinitionMap)
-
-       return &Asset{
+       DefaultNativeAsset = &Asset{
                Signer:            signer,
                AssetID:           *consensus.BTMAssetID,
                Alias:             &alias,
                VMVersion:         1,
                DefinitionMap:     consensus.BTMDefinitionMap,
                RawDefinitionByte: definitionBytes,
-               InitialBlockHash:  genesisBlock.Hash()}
+               InitialBlockHash:  genesisBlock.Hash(),
+       }
 }
 
 func AliasKey(name string) []byte {
@@ -89,6 +85,7 @@ var (
 
 //NewRegistry create new registry
 func NewRegistry(db dbm.DB, chain *protocol.Chain) *Registry {
+       initNativeAsset()
        return &Registry{
                db:               db,
                chain:            chain,