chore!: rename payment module -> blob (celestiaorg#972)

speak now or forever hold your peace. 

NOTE: this PR does not rename MsgPayForData or MsgWirePayForData, as
this was already too big of a diff.

closes celestiaorg#961

README.md

@@ -56,7 +56,7 @@ rm -r ~/.celestia-app
 ./scripts/single-node.sh
 
 # Post data to the local devnet
-celestia-appd tx payment payForData [hexNamespace] [hexMessage] [flags]
+celestia-appd tx blob payForData [hexNamespace] [hexMessage] [flags]
 ```
 
 <!-- markdown-link-check-disable -->

app/app.go

@@ -79,9 +79,9 @@ import (
 
 	"github.com/celestiaorg/celestia-app/app/encoding"
 	"github.com/celestiaorg/celestia-app/pkg/prove"
-	paymentmodule "github.com/celestiaorg/celestia-app/x/payment"
-	paymentmodulekeeper "github.com/celestiaorg/celestia-app/x/payment/keeper"
-	paymentmoduletypes "github.com/celestiaorg/celestia-app/x/payment/types"
+	blobmodule "github.com/celestiaorg/celestia-app/x/blob"
+	blobmodulekeeper "github.com/celestiaorg/celestia-app/x/blob/keeper"
+	blobmoduletypes "github.com/celestiaorg/celestia-app/x/blob/types"
 
 	qgbmodule "github.com/celestiaorg/celestia-app/x/qgb"
 	qgbmodulekeeper "github.com/celestiaorg/celestia-app/x/qgb/keeper"
@@ -144,7 +144,7 @@ var (
 		evidence.AppModuleBasic{},
 		// transfer.AppModuleBasic{},
 		vesting.AppModuleBasic{},
-		paymentmodule.AppModuleBasic{},
+		blobmodule.AppModuleBasic{},
 		qgbmodule.AppModuleBasic{},
 	)
 
@@ -217,8 +217,8 @@ type App struct {
 	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
 	ScopedTransferKeeper capabilitykeeper.ScopedKeeper
 
-	PaymentKeeper paymentmodulekeeper.Keeper
-	QgbKeeper     qgbmodulekeeper.Keeper
+	BlobKeeper blobmodulekeeper.Keeper
+	QgbKeeper  qgbmodulekeeper.Keeper
 
 	// the module manager
 	mm *module.Manager
@@ -251,7 +251,7 @@ func New(
 		minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,
 		govtypes.StoreKey, paramstypes.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey,
 		evidencetypes.StoreKey, capabilitytypes.StoreKey,
-		paymentmoduletypes.StoreKey,
+		blobmoduletypes.StoreKey,
 		qgbmoduletypes.StoreKey,
 		// ibctransfertypes.StoreKey,
 		// ibchost.StoreKey,
@@ -365,10 +365,10 @@ func New(
 		&stakingKeeper, govRouter, app.msgSvcRouter, govConfig,
 	)
 
-	app.PaymentKeeper = *paymentmodulekeeper.NewKeeper(
+	app.BlobKeeper = *blobmodulekeeper.NewKeeper(
 		appCodec,
 	)
-	paymentmod := paymentmodule.NewAppModule(appCodec, app.PaymentKeeper)
+	blobmod := blobmodule.NewAppModule(appCodec, app.BlobKeeper)
 
 	// // Create static IBC router, add transfer route, then set and seal it
 	// ibcRouter := ibcporttypes.NewRouter()
@@ -405,7 +405,7 @@ func New(
 		// ibc.NewAppModule(app.IBCKeeper),
 		params.NewAppModule(app.ParamsKeeper),
 		// transferModule,
-		paymentmod,
+		blobmod,
 		qgbmod,
 	)
 
@@ -428,7 +428,7 @@ func New(
 		crisistypes.ModuleName,
 		govtypes.ModuleName,
 		genutiltypes.ModuleName,
-		paymentmoduletypes.ModuleName,
+		blobmoduletypes.ModuleName,
 		qgbmoduletypes.ModuleName,
 		paramstypes.ModuleName,
 		vestingtypes.ModuleName,
@@ -449,7 +449,7 @@ func New(
 		authtypes.ModuleName,
 		banktypes.ModuleName,
 		genutiltypes.ModuleName,
-		paymentmoduletypes.ModuleName,
+		blobmoduletypes.ModuleName,
 		qgbmoduletypes.ModuleName,
 		paramstypes.ModuleName,
 		vestingtypes.ModuleName,
@@ -474,7 +474,7 @@ func New(
 		genutiltypes.ModuleName,
 		evidencetypes.ModuleName,
 		// ibctransfertypes.ModuleName,
-		paymentmoduletypes.ModuleName,
+		blobmoduletypes.ModuleName,
 		qgbmoduletypes.ModuleName,
 		vestingtypes.ModuleName,
 		feegrant.ModuleName,
@@ -670,7 +670,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(crisistypes.ModuleName)
 	// paramsKeeper.Subspace(ibctransfertypes.ModuleName)
 	// paramsKeeper.Subspace(ibchost.ModuleName)
-	paramsKeeper.Subspace(paymentmoduletypes.ModuleName)
+	paramsKeeper.Subspace(blobmoduletypes.ModuleName)
 	paramsKeeper.Subspace(qgbmoduletypes.ModuleName)
 
 	return paramsKeeper

app/estimate_square_size_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 	"github.com/celestiaorg/celestia-app/pkg/shares"
 	"github.com/celestiaorg/celestia-app/testutil/namespace"
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

app/malleate_txs.go

@@ -6,7 +6,7 @@ import (
 	"sort"
 
 	"github.com/celestiaorg/celestia-app/pkg/shares"
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	core "github.com/tendermint/tendermint/proto/tendermint/types"
 )

app/parse_txs.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 
 	"github.com/celestiaorg/celestia-app/app/encoding"
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/x/auth/signing"
 	core "github.com/tendermint/tendermint/proto/tendermint/types"

app/process_proposal.go

@@ -7,7 +7,7 @@ import (
 	"github.com/celestiaorg/celestia-app/pkg/da"
 	"github.com/celestiaorg/celestia-app/pkg/inclusion"
 	"github.com/celestiaorg/celestia-app/pkg/shares"
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/celestiaorg/rsmt2d"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	abci "github.com/tendermint/tendermint/abci/types"

app/test/block_size_test.go

@@ -18,8 +18,8 @@ import (
 	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 	"github.com/celestiaorg/celestia-app/testutil/namespace"
 	"github.com/celestiaorg/celestia-app/testutil/network"
-	"github.com/celestiaorg/celestia-app/x/payment"
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	blob "github.com/celestiaorg/celestia-app/x/blob"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmrand "github.com/tendermint/tendermint/libs/rand"
 	rpctypes "github.com/tendermint/tendermint/rpc/core/types"
@@ -219,7 +219,7 @@ func (s *IntegrationTestSuite) TestSubmitWirePayForData() {
 	for _, tc := range tests {
 		s.Run(tc.name, func() {
 			signer := types.NewKeyringSigner(s.kr, s.accounts[0], val.ClientCtx.ChainID)
-			res, err := payment.SubmitPayForData(context.TODO(), signer, val.ClientCtx.GRPCClient, tc.ns, tc.message, 10000000, tc.opts...)
+			res, err := blob.SubmitPayForData(context.TODO(), signer, val.ClientCtx.GRPCClient, tc.ns, tc.message, 10000000, tc.opts...)
 			require.NoError(err)
 			require.NotNil(res)
 			assert.Equal(abci.CodeTypeOK, res.Code)

app/test/fuzz_abci_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/celestiaorg/celestia-app/app"
 	"github.com/celestiaorg/celestia-app/app/encoding"
 	"github.com/celestiaorg/celestia-app/testutil"
-	paytestutil "github.com/celestiaorg/celestia-app/testutil/payment"
+	paytestutil "github.com/celestiaorg/celestia-app/testutil/blob"
 	"github.com/stretchr/testify/require"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmrand "github.com/tendermint/tendermint/libs/rand"

app/test/prepare_proposal_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/celestiaorg/celestia-app/app/encoding"
 	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 	"github.com/celestiaorg/celestia-app/testutil"
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 )
 
 func TestPrepareProposal(t *testing.T) {

app/test/process_proposal_test.go

@@ -15,8 +15,8 @@ import (
 	"github.com/celestiaorg/celestia-app/app/encoding"
 	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 	"github.com/celestiaorg/celestia-app/testutil"
-	paytestutil "github.com/celestiaorg/celestia-app/testutil/payment"
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	paytestutil "github.com/celestiaorg/celestia-app/testutil/blob"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/celestiaorg/nmt/namespace"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )

app/test_util.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/celestiaorg/celestia-app/app/encoding"
 	"github.com/celestiaorg/celestia-app/testutil/namespace"
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/crypto/hd"

proto/payment/genesis.proto → proto/blob/genesis.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
-package payment;
+package blob;
 
-option go_package = "github.com/celestiaorg/celestia-app/x/payment/types";
+option go_package = "github.com/celestiaorg/celestia-app/x/blob/types";
 
 // GenesisState defines the capability module's genesis state.
 message GenesisState {}

proto/payment/query.proto → proto/blob/query.proto

@@ -1,10 +1,10 @@
 syntax = "proto3";
-package payment;
+package blob;
 
 import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 
-option go_package = "github.com/celestiaorg/celestia-app/x/payment/types";
+option go_package = "github.com/celestiaorg/celestia-app/x/blob/types";
 
 // Query defines the gRPC querier service.
 service Query {

proto/payment/tx.proto → proto/blob/tx.proto

@@ -1,16 +1,16 @@
 syntax = "proto3";
-package payment;
+package blob;
 
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
-option go_package = "github.com/celestiaorg/celestia-app/x/payment/types";
+option go_package = "github.com/celestiaorg/celestia-app/x/blob/types";
 
-// Msg defines the payment Msg service.
+// Msg defines the blob Msg service.
 service Msg {
   // PayForData allows the user to pay for the inclusion of a message
   rpc PayForData(MsgPayForData) returns (MsgPayForDataResponse) {
-    option (google.api.http).get = "/celestia/payment/payfordata";
+    option (google.api.http).get = "/celestia/blob/payfordata";
   }
 }
 

testutil/payment/testutil.go → testutil/blob/testutil.go

@@ -1,11 +1,11 @@
-package paytestutil
+package blobtestutil
 
 import (
 	"testing"
 
 	"github.com/celestiaorg/celestia-app/app"
 	"github.com/celestiaorg/celestia-app/testutil/namespace"
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"

testutil/test_app.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/celestiaorg/celestia-app/app"
 	"github.com/celestiaorg/celestia-app/app/encoding"
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"

testutil/testnode/node_interaction_api.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 	"github.com/celestiaorg/celestia-app/testutil/namespace"
-	"github.com/celestiaorg/celestia-app/x/payment"
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	blob "github.com/celestiaorg/celestia-app/x/blob"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -113,7 +113,7 @@ func (c *Context) PostData(account, broadcastMode string, ns, msg []byte) (*sdk.
 	signer.SetSequence(seq)
 
 	// create a random msg per row
-	pfd, err := payment.BuildPayForData(
+	pfd, err := blob.BuildPayForData(
 		c.rootCtx,
 		signer,
 		c.GRPCClient,
@@ -125,7 +125,7 @@ func (c *Context) PostData(account, broadcastMode string, ns, msg []byte) (*sdk.
 		return nil, err
 	}
 
-	signed, err := payment.SignPayForData(signer, pfd, opts...)
+	signed, err := blob.SignPayForData(signer, pfd, opts...)
 	if err != nil {
 		return nil, err
 	}

x/payment/client/cli/query.go → x/blob/client/cli/query.go

@@ -3,14 +3,14 @@ package cli
 import (
 	"fmt"
 
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/spf13/cobra"
 )
 
 // GetQueryCmd returns the CLI query commands for this module
 func GetQueryCmd(queryRoute string) *cobra.Command {
-	// Group payment queries under a subcommand
+	// Group blob queries under a subcommand
 	cmd := &cobra.Command{
 		Use:                        types.ModuleName,
 		Short:                      fmt.Sprintf("Querying commands for the %s module", types.ModuleName),

x/payment/client/cli/tx.go → x/blob/client/cli/tx.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/spf13/cobra"
 )

x/payment/client/cli/wirepayfordata.go → x/blob/client/cli/wirepayfordata.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"

x/payment/client/testutil/integration_test.go → x/blob/client/testutil/integration_test.go

@@ -15,10 +15,10 @@ import (
 	cosmosnet "github.com/cosmos/cosmos-sdk/testutil/network"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 
 	"github.com/celestiaorg/celestia-app/testutil/network"
-	paycli "github.com/celestiaorg/celestia-app/x/payment/client/cli"
+	paycli "github.com/celestiaorg/celestia-app/x/blob/client/cli"
 	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
 )
 

x/payment/doc.go → x/blob/doc.go

@@ -1,4 +1,4 @@
-// payment is a Cosmos SDK module that enables users to pay for data to be
+// blob is a Cosmos SDK module that enables users to pay for data to be
 // published to the Celestia blockchain. Please see ./specs/docs.md for the full
 // specification of this module.
-package payment
+package blob

x/payment/genesis.go → x/blob/genesis.go

@@ -1,8 +1,8 @@
-package payment
+package blob
 
 import (
-	"github.com/celestiaorg/celestia-app/x/payment/keeper"
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/keeper"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 

x/payment/handler.go → x/blob/handler.go

@@ -1,15 +1,15 @@
-package payment
+package blob
 
 import (
 	"fmt"
 
-	"github.com/celestiaorg/celestia-app/x/payment/keeper"
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/keeper"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
-// NewHandler uses the provided payment keeper to create an sdk.Handler
+// NewHandler uses the provided blob keeper to create an sdk.Handler
 func NewHandler(k keeper.Keeper) sdk.Handler {
 	msgServer := keeper.NewMsgServerImpl(k)
 

x/payment/keeper/gas_test.go → x/blob/keeper/gas_test.go

@@ -3,7 +3,7 @@ package keeper
 import (
 	"testing"
 
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"