modify fractal db interface (#487)

fractalplatform · Sep 12, 2019 · 9e9bb5c · 9e9bb5c
1 parent 3973a42
commit 9e9bb5c
Show file tree

Hide file tree

Showing 27 changed files with 146 additions and 118 deletions.
diff --git a/accountmanager/accountmanager_test.go b/accountmanager/accountmanager_test.go
@@ -27,9 +27,9 @@ import (
 	"github.com/fractalplatform/fractal/common"
 	"github.com/fractalplatform/fractal/crypto"
 	"github.com/fractalplatform/fractal/params"
+	"github.com/fractalplatform/fractal/rawdb"
 	"github.com/fractalplatform/fractal/state"
 	"github.com/fractalplatform/fractal/types"
-	memdb "github.com/fractalplatform/fractal/utils/fdb/memdb"
 	"github.com/fractalplatform/fractal/utils/rlp"
 )
 
@@ -40,7 +40,7 @@ var sysName = "fractal.account"
 var blockNumber = uint64(0)
 
 func getStateDB() *state.StateDB {
-	db := memdb.NewMemDatabase()
+	db := rawdb.NewMemoryDatabase()
 	trieDB := state.NewDatabase(db)
 	stateDB, err := state.New(common.Hash{}, trieDB)
 	if err != nil {

diff --git a/asset/asset_test.go b/asset/asset_test.go
@@ -22,16 +22,16 @@ import (
 	"testing"
 
 	"github.com/fractalplatform/fractal/common"
+	"github.com/fractalplatform/fractal/rawdb"
 	"github.com/fractalplatform/fractal/state"
-	memdb "github.com/fractalplatform/fractal/utils/fdb/memdb"
 )
 
 var assetDB = getStateDB()
 
 var ast = getAsset()
 
 func getStateDB() *state.StateDB {
-	db := memdb.NewMemDatabase()
+	db := rawdb.NewMemoryDatabase()
 	trieDB := state.NewDatabase(db)
 	stateDB, err := state.New(common.Hash{}, trieDB)
 	if err != nil {
@@ -48,7 +48,7 @@ func TestAsset_InitAssetCount(t *testing.T) {
 	type fields struct {
 		sdb *state.StateDB
 	}
-	db := memdb.NewMemDatabase()
+	db := rawdb.NewMemoryDatabase()
 	trieDB := state.NewDatabase(db)
 	stateDB, err := state.New(common.Hash{}, trieDB)
 	if err != nil {

diff --git a/blockchain/forkcontroller_test.go b/blockchain/forkcontroller_test.go
@@ -22,9 +22,9 @@ import (
 
 	"github.com/fractalplatform/fractal/common"
 	"github.com/fractalplatform/fractal/params"
+	"github.com/fractalplatform/fractal/rawdb"
 	"github.com/fractalplatform/fractal/state"
 	"github.com/fractalplatform/fractal/types"
-	memdb "github.com/fractalplatform/fractal/utils/fdb/memdb"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -40,7 +40,7 @@ func (h headerMap) setHeader(num uint64, header *types.Header) {
 func TestForkController1(t *testing.T) {
 	var (
 		testcfg    = &ForkConfig{ForkBlockNum: 10, Forkpercentage: 80}
-		db         = memdb.NewMemDatabase()
+		db         = rawdb.NewMemoryDatabase()
 		statedb, _ = state.New(common.Hash{}, state.NewDatabase(db))
 		hm         = make(headerMap)
 	)
@@ -80,7 +80,7 @@ func TestForkController1(t *testing.T) {
 func TestForkController2(t *testing.T) {
 	var (
 		testcfg    = &ForkConfig{ForkBlockNum: 10, Forkpercentage: 80}
-		db         = memdb.NewMemDatabase()
+		db         = rawdb.NewMemoryDatabase()
 		statedb, _ = state.New(common.Hash{}, state.NewDatabase(db))
 		hm         = make(headerMap)
 	)
@@ -143,7 +143,7 @@ func TestForkController2(t *testing.T) {
 func TestUpdateDifferentForkBlock(t *testing.T) {
 	var (
 		testcfg    = &ForkConfig{ForkBlockNum: 10, Forkpercentage: 80}
-		db         = memdb.NewMemDatabase()
+		db         = rawdb.NewMemoryDatabase()
 		statedb, _ = state.New(common.Hash{}, state.NewDatabase(db))
 		hm         = make(headerMap)
 	)
@@ -175,7 +175,7 @@ func TestUpdateDifferentForkBlock(t *testing.T) {
 func TestFillForkID(t *testing.T) {
 	var (
 		testcfg    = &ForkConfig{ForkBlockNum: 10, Forkpercentage: 80}
-		db         = memdb.NewMemDatabase()
+		db         = rawdb.NewMemoryDatabase()
 		statedb, _ = state.New(common.Hash{}, state.NewDatabase(db))
 	)
 	if err := initForkController(params.DefaultChainconfig.ChainName, statedb, 0); err != nil {

diff --git a/blockchain/genesis.go b/blockchain/genesis.go
@@ -37,7 +37,6 @@ import (
 	"github.com/fractalplatform/fractal/state"
 	"github.com/fractalplatform/fractal/types"
 	"github.com/fractalplatform/fractal/utils/fdb"
-	memdb "github.com/fractalplatform/fractal/utils/fdb/memdb"
 	"github.com/fractalplatform/fractal/utils/rlp"
 )
 
@@ -183,7 +182,7 @@ func SetupGenesisBlock(db fdb.Database, genesis *Genesis) (*params.ChainConfig,
 // to the given database (or discards it if nil).
 func (g *Genesis) ToBlock(db fdb.Database) (*types.Block, []*types.Receipt, error) {
 	if db == nil {
-		db = memdb.NewMemDatabase()
+		db = rawdb.NewMemoryDatabase()
 	}
 	detailTx := &types.DetailTx{}
 	var internals []*types.DetailAction

diff --git a/blockchain/genesis_test.go b/blockchain/genesis_test.go
@@ -29,7 +29,6 @@ import (
 	"github.com/fractalplatform/fractal/params"
 	"github.com/fractalplatform/fractal/rawdb"
 	"github.com/fractalplatform/fractal/utils/fdb"
-	memdb "github.com/fractalplatform/fractal/utils/fdb/memdb"
 )
 
 var defaultgenesisBlockHash = common.HexToHash("0xfff77195a34bae2cbe56990436ef0ae4f41f1a466a1a7943f7040ecdd19eceba")
@@ -115,7 +114,7 @@ func TestSetupGenesis(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		db := memdb.NewMemDatabase()
+		db := rawdb.NewMemoryDatabase()
 
 		config, _, hash, err := test.fn(db)
 

diff --git a/blockchain/test_utils.go b/blockchain/test_utils.go
@@ -38,7 +38,7 @@ import (
 	"github.com/fractalplatform/fractal/txpool"
 	"github.com/fractalplatform/fractal/types"
 	"github.com/fractalplatform/fractal/utils/fdb"
-	memDB "github.com/fractalplatform/fractal/utils/fdb/memdb"
+	"github.com/fractalplatform/fractal/utils/fdb/memdb"
 )
 
 var (
@@ -56,7 +56,7 @@ func (fe *fakeEngine) VerifySeal(chain consensus.IChainReader, header *types.Hea
 
 func newCanonical(t *testing.T, genesis *Genesis) *BlockChain {
 	// Initialize a fresh chain with only a genesis block
-	chainDb := memDB.NewMemDatabase()
+	chainDb := rawdb.NewMemoryDatabase()
 
 	chainCfg, dposCfg, _, err := SetupGenesisBlock(chainDb, genesis)
 	if err != nil {
@@ -130,7 +130,7 @@ func makeNewChain(t *testing.T, genesis *Genesis, chain *BlockChain, n, seed int
 }
 
 func deepCopyDB(db fdb.Database) (fdb.Database, error) {
-	mdb, ok := db.(*memDB.MemDatabase)
+	mdb, ok := db.(*memdb.MemDatabase)
 	if !ok {
 		return nil, errors.New("db must fdb.MemDatabase")
 	}

diff --git a/consensus/dpos/ldb_test.go b/consensus/dpos/ldb_test.go
@@ -24,9 +24,9 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/fractalplatform/fractal/rawdb"
 	"github.com/fractalplatform/fractal/types"
 	"github.com/fractalplatform/fractal/utils/fdb"
-	ldb "github.com/fractalplatform/fractal/utils/fdb/leveldb"
 )
 
 type levelDB struct {
@@ -75,7 +75,7 @@ func newTestLDB() (*levelDB, func()) {
 	if err != nil {
 		panic("failed to create test file: " + err.Error())
 	}
-	db, err := ldb.NewLDBDatabase(dirname, 0, 0)
+	db, err := rawdb.NewLevelDBDatabase(dirname, 0, 0)
 	if err != nil {
 		panic("failed to create test database: " + err.Error())
 	}

diff --git a/feemanager/fee_test.go b/feemanager/fee_test.go
@@ -24,8 +24,8 @@ import (
 	"github.com/fractalplatform/fractal/asset"
 	"github.com/fractalplatform/fractal/common"
 	"github.com/fractalplatform/fractal/params"
+	"github.com/fractalplatform/fractal/rawdb"
 	"github.com/fractalplatform/fractal/state"
-	memdb "github.com/fractalplatform/fractal/utils/fdb/memdb"
 )
 
 var sdb = getStateDB()
@@ -38,7 +38,7 @@ func getAsset() *asset.Asset {
 }
 
 func getStateDB() *state.StateDB {
-	db := memdb.NewMemDatabase()
+	db := rawdb.NewMemoryDatabase()
 	tridb := state.NewDatabase(db)
 	statedb, err := state.New(common.Hash{}, tridb)
 	if err != nil {

diff --git a/node/service.go b/node/service.go
@@ -22,10 +22,9 @@ import (
 	"github.com/fractalplatform/fractal/p2p"
 	"github.com/fractalplatform/fractal/p2p/enode"
 	adaptor "github.com/fractalplatform/fractal/p2p/protoadaptor"
+	"github.com/fractalplatform/fractal/rawdb"
 	"github.com/fractalplatform/fractal/rpc"
 	"github.com/fractalplatform/fractal/utils/fdb"
-	ldb "github.com/fractalplatform/fractal/utils/fdb/leveldb"
-	mdb "github.com/fractalplatform/fractal/utils/fdb/memdb"
 )
 
 // ServiceContext is a collection of service independent options inherited from
@@ -42,9 +41,9 @@ type ServiceContext struct {
 // node is an ephemeral one, a memory database is returned.
 func (ctx *ServiceContext) OpenDatabase(name string, cache int, handles int) (fdb.Database, error) {
 	if ctx.config.DataDir == "" {
-		return mdb.NewMemDatabase(), nil
+		return rawdb.NewMemoryDatabase(), nil
 	}
-	db, err := ldb.NewLDBDatabase(ctx.config.resolvePath(name), cache, handles)
+	db, err := rawdb.NewLevelDBDatabase(ctx.config.resolvePath(name), cache, handles)
 	if err != nil {
 		return nil, err
 	}

diff --git a/processor/vm/runtime/run_test.go b/processor/vm/runtime/run_test.go
@@ -21,19 +21,18 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/fractalplatform/fractal/params"
-
 	"github.com/fractalplatform/fractal/accountmanager"
 	"github.com/fractalplatform/fractal/common"
+	"github.com/fractalplatform/fractal/params"
+	"github.com/fractalplatform/fractal/rawdb"
 	"github.com/fractalplatform/fractal/state"
 	"github.com/fractalplatform/fractal/types"
-	mdb "github.com/fractalplatform/fractal/utils/fdb/memdb"
 )
 
 //TestRunCode run runtime code directly
 func TestRunCode(t *testing.T) {
 	//fmt.Println("in TestRunCode ...")
-	state, _ := state.New(common.Hash{}, state.NewDatabase(mdb.NewMemDatabase()))
+	state, _ := state.New(common.Hash{}, state.NewDatabase(rawdb.NewMemoryDatabase()))
 	account, _ := accountmanager.NewAccountManager(state)
 	//fmt.Println("in TestRunCode2 ...")
 	//sender

diff --git a/processor/vm/runtime/runtime_test.go b/processor/vm/runtime/runtime_test.go
@@ -25,17 +25,15 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/fractalplatform/fractal/params"
-	"github.com/stretchr/testify/assert"
-
 	"github.com/fractalplatform/fractal/accountmanager"
-	//"github.com/fractalplatform/fractal/asset"
 	"github.com/fractalplatform/fractal/common"
+	"github.com/fractalplatform/fractal/params"
+	"github.com/fractalplatform/fractal/rawdb"
 	"github.com/fractalplatform/fractal/state"
 	"github.com/fractalplatform/fractal/types"
 	"github.com/fractalplatform/fractal/utils/abi"
-	mdb "github.com/fractalplatform/fractal/utils/fdb/memdb"
 	"github.com/fractalplatform/fractal/utils/rlp"
+	"github.com/stretchr/testify/assert"
 )
 
 func input(abifile string, method string, params ...interface{}) ([]byte, error) {
@@ -115,7 +113,7 @@ func issueAssetAction(ownerName, toName common.Name) *types.Action {
 }
 
 func TestAsset(t *testing.T) {
-	state, _ := state.New(common.Hash{}, state.NewDatabase(mdb.NewMemDatabase()))
+	state, _ := state.New(common.Hash{}, state.NewDatabase(rawdb.NewMemoryDatabase()))
 	account, _ := accountmanager.NewAccountManager(state)
 
 	senderName := common.Name("jacobwolf12345")
@@ -308,7 +306,7 @@ func TestAsset(t *testing.T) {
 	}
 }
 func TestVEN(t *testing.T) {
-	state, _ := state.New(common.Hash{}, state.NewDatabase(mdb.NewMemDatabase()))
+	state, _ := state.New(common.Hash{}, state.NewDatabase(rawdb.NewMemoryDatabase()))
 	account, _ := accountmanager.NewAccountManager(state)
 
 	senderName := common.Name("jacobwolf12345")

diff --git a/processor/vm/vm_example_test.go b/processor/vm/vm_example_test.go
@@ -25,18 +25,16 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/fractalplatform/fractal/params"
-	"github.com/fractalplatform/fractal/processor/vm/runtime"
-	"github.com/stretchr/testify/assert"
-
 	"github.com/fractalplatform/fractal/accountmanager"
-	//"github.com/fractalplatform/fractal/asset"
 	"github.com/fractalplatform/fractal/common"
+	"github.com/fractalplatform/fractal/params"
+	"github.com/fractalplatform/fractal/processor/vm/runtime"
+	"github.com/fractalplatform/fractal/rawdb"
 	"github.com/fractalplatform/fractal/state"
 	"github.com/fractalplatform/fractal/types"
 	"github.com/fractalplatform/fractal/utils/abi"
-	mdb "github.com/fractalplatform/fractal/utils/fdb/memdb"
 	"github.com/fractalplatform/fractal/utils/rlp"
+	"github.com/stretchr/testify/assert"
 )
 
 func input(abifile string, method string, params ...interface{}) ([]byte, error) {
@@ -116,7 +114,7 @@ func issueAssetAction(ownerName, toName common.Name) *types.Action {
 }
 
 func TestAsset(t *testing.T) {
-	state, _ := state.New(common.Hash{}, state.NewDatabase(mdb.NewMemDatabase()))
+	state, _ := state.New(common.Hash{}, state.NewDatabase(rawdb.NewMemoryDatabase()))
 	account, _ := accountmanager.NewAccountManager(state)
 
 	senderName := common.Name("jacobwolf12345")
@@ -309,7 +307,7 @@ func TestAsset(t *testing.T) {
 	}
 }
 func TestVEN(t *testing.T) {
-	state, _ := state.New(common.Hash{}, state.NewDatabase(mdb.NewMemDatabase()))
+	state, _ := state.New(common.Hash{}, state.NewDatabase(rawdb.NewMemoryDatabase()))
 	account, _ := accountmanager.NewAccountManager(state)
 
 	senderName := common.Name("jacobwolf12345")