cosmos-sdk/app.App -> cosmos-sdk/baseapp.BaseApp

examples/basecoin/app/app.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	apm "github.com/cosmos/cosmos-sdk/app"
+	bam "github.com/cosmos/cosmos-sdk/baseapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/tendermint/abci/server"
 	"github.com/tendermint/go-wire"
@@ -14,7 +14,7 @@ import (
 const appName = "BasecoinApp"
 
 type BasecoinApp struct {
-	*apm.App
+	*bam.BaseApp
 	cdc        *wire.Codec
 	multiStore sdk.CommitMultiStore
 
@@ -33,7 +33,7 @@ func NewBasecoinApp() *BasecoinApp {
 	var app = &BasecoinApp{}
 	app.initCapKeys() // ./capkeys.go
 	app.initStores()  // ./stores.go
-	app.initSDKApp()  // ./sdkapp.go
+	app.initBaseApp() // ./baseapp.go
 	app.initRoutes()  // ./routes.go
 
 	// TODO: Load genesis

examples/basecoin/app/baseapp.go

@@ -0,0 +1,29 @@
+package app
+
+import (
+	"github.com/cosmos/cosmos-sdk/baseapp"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/auth"
+)
+
+// initBaseApp() happens after initCapKeys() and initStores().
+// initBaseApp() happens before initRoutes().
+func (app *BasecoinApp) initBaseApp() {
+	app.BaseApp = baseapp.NewBaseApp(appName, app.multiStore)
+	app.initBaseAppTxDecoder()
+	app.initBaseAppAnteHandler()
+}
+
+func (app *BasecoinApp) initBaseAppTxDecoder() {
+	cdc := makeTxCodec()
+	app.BaseApp.SetTxDecoder(func(txBytes []byte) (sdk.Tx, error) {
+		var tx = sdk.StdTx{}
+		err := cdc.UnmarshalBinary(txBytes, &tx)
+		return tx, err
+	})
+}
+
+func (app *BasecoinApp) initBaseAppAnteHandler() {
+	var authAnteHandler = auth.NewAnteHandler(app.accStore)
+	app.BaseApp.SetDefaultAnteHandler(authAnteHandler)
+}

examples/basecoin/app/routes.go

@@ -6,7 +6,7 @@ import (
 
 // initRoutes() happens after initCapKeys(), initStores(), and initSDKApp().
 func (app *BasecoinApp) initRoutes() {
-	var router = app.App.Router()
+	var router = app.BaseApp.Router()
 	var accStore = app.accStore
 
 	// All handlers must be added here.

examples/basecoin/app/sdkapp.go

@@ -1,29 +0,0 @@
-package app
-
-import (
-	apm "github.com/cosmos/cosmos-sdk/app"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/auth"
-)
-
-// initSDKApp() happens after initCapKeys() and initStores().
-// initSDKApp() happens before initRoutes().
-func (app *BasecoinApp) initSDKApp() {
-	app.App = apm.NewApp(appName, app.multiStore)
-	app.initSDKAppTxDecoder()
-	app.initSDKAppAnteHandler()
-}
-
-func (app *BasecoinApp) initSDKAppTxDecoder() {
-	cdc := makeTxCodec()
-	app.App.SetTxDecoder(func(txBytes []byte) (sdk.Tx, error) {
-		var tx = sdk.StdTx{}
-		err := cdc.UnmarshalBinary(txBytes, &tx)
-		return tx, err
-	})
-}
-
-func (app *BasecoinApp) initSDKAppAnteHandler() {
-	var authAnteHandler = auth.NewAnteHandler(app.accStore)
-	app.App.SetDefaultAnteHandler(authAnteHandler)
-}

examples/dummy/main.go

@@ -10,7 +10,7 @@ import (
 	cmn "github.com/tendermint/tmlibs/common"
 	dbm "github.com/tendermint/tmlibs/db"
 
-	"github.com/cosmos/cosmos-sdk/app"
+	bam "github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/store"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
@@ -35,21 +35,21 @@ func main() {
 	multiStore := store.NewCommitMultiStore(db)
 	multiStore.SetSubstoreLoader(mainStoreKey, loader)
 
-	// Set everything on the app and load latest
-	app := app.NewApp("dummy", multiStore)
+	// Set everything on the baseApp and load latest
+	baseApp := bam.NewBaseApp("dummy", multiStore)
 
 	// Set Tx decoder
-	app.SetTxDecoder(decodeTx)
+	baseApp.SetTxDecoder(decodeTx)
 
-	app.Router().AddRoute("dummy", DummyHandler(mainStoreKey))
+	baseApp.Router().AddRoute("dummy", DummyHandler(mainStoreKey))
 
-	if err := app.LoadLatestVersion(mainStoreKey); err != nil {
+	if err := baseApp.LoadLatestVersion(mainStoreKey); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
 
 	// Start the ABCI server
-	srv, err := server.NewServer("0.0.0.0:46658", "socket", app)
+	srv, err := server.NewServer("0.0.0.0:46658", "socket", baseApp)
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)