From 62db9d82bcfe7e4dcc476e76d8035c55b66f98c0 Mon Sep 17 00:00:00 2001
From: icodezjb <icodezjb@163.com>
Date: Sat, 23 Sep 2017 18:01:46 +0800
Subject: [PATCH] store RawDefinition1 instead of rawDefinition in struct Asset
 to leveldb

---
 blockchain/asset/asset.go              | 12 ++++++------
 protocol/validation/validation_test.go |  2 +-
 testutil/expect.go                     |  2 +-
 testutil/keys.go                       |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/blockchain/asset/asset.go b/blockchain/asset/asset.go
index 033ae8c6..64912ab7 100644
--- a/blockchain/asset/asset.go
+++ b/blockchain/asset/asset.go
@@ -64,14 +64,14 @@ type Asset struct {
 	InitialBlockHash bc.Hash
 	*signers.Signer
 	Tags             map[string]interface{}
-	rawDefinition    []byte
+	RawDefinition1    []byte
 	definition       map[string]interface{}
 	sortID           string
 }
 
 func (asset *Asset) Definition() (map[string]interface{}, error) {
-	if asset.definition == nil && len(asset.rawDefinition) > 0 {
-		err := json.Unmarshal(asset.rawDefinition, &asset.definition)
+	if asset.definition == nil && len(asset.RawDefinition1) > 0 {
+		err := json.Unmarshal(asset.RawDefinition1, &asset.definition)
 		if err != nil {
 			return nil, errors.Wrap(err)
 		}
@@ -80,7 +80,7 @@ func (asset *Asset) Definition() (map[string]interface{}, error) {
 }
 
 func (asset *Asset) RawDefinition() []byte {
-	return asset.rawDefinition
+	return asset.RawDefinition1
 }
 
 func (asset *Asset) SetDefinition(def map[string]interface{}) error {
@@ -89,7 +89,7 @@ func (asset *Asset) SetDefinition(def map[string]interface{}) error {
 		return err
 	}
 	asset.definition = def
-	asset.rawDefinition = rawdef
+	asset.RawDefinition1 = rawdef
 	return nil
 }
 
@@ -116,7 +116,7 @@ func (reg *Registry) Define(ctx context.Context, xpubs []chainkd.XPub, quorum in
 	defhash := bc.NewHash(sha3.Sum256(rawDefinition))
 	asset := &Asset{
 		definition:       definition,
-		rawDefinition:    rawDefinition,
+		RawDefinition1:   rawDefinition,
 		VMVersion:        vmver,
 		IssuanceProgram:  issuanceProgram,
 		InitialBlockHash: reg.initialBlockHash,
diff --git a/protocol/validation/validation_test.go b/protocol/validation/validation_test.go
index 9ac3bd75..7a004ce9 100644
--- a/protocol/validation/validation_test.go
+++ b/protocol/validation/validation_test.go
@@ -1,7 +1,7 @@
 package validation
 
 import (
-	"blockchain/consensus"
+	"github.com/bytom/consensus"
 	"fmt"
 	"math"
 	"testing"
diff --git a/testutil/expect.go b/testutil/expect.go
index 791622f8..bb899cb4 100644
--- a/testutil/expect.go
+++ b/testutil/expect.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"chain/errors"
+	"github.com/bytom/errors"
 )
 
 var wd, _ = os.Getwd()
diff --git a/testutil/keys.go b/testutil/keys.go
index 2fc389f6..6a65e31d 100644
--- a/testutil/keys.go
+++ b/testutil/keys.go
@@ -1,8 +1,8 @@
 package testutil
 
 import (
-	"chain/crypto/ed25519"
-	"chain/crypto/ed25519/chainkd"
+	"github.com/bytom/crypto/ed25519"
+	"github.com/bytom/crypto/ed25519/chainkd"
 )
 
 var (
-- 
2.11.0