address comments

axelarnetwork · Sep 5, 2024 · 1d2a9fb · 1d2a9fb
1 parent 2df1f54
commit 1d2a9fb
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 56 deletions.
diff --git a/app/wasm_test.go b/app/wasm_test.go
@@ -377,7 +377,7 @@ func TestQueryPlugins(t *testing.T) {
 				Then("it should return an error", func(t *testing.T) {
 					txHash := [32]byte(rand.Bytes(32))
 					index := uint64(rand.PosI64())
-					txIDGenerator.CurrFunc = func(ctx sdk.Context) ([32]byte, uint64) {
+					txIDGenerator.CurrIDFunc = func(ctx sdk.Context) ([32]byte, uint64) {
 						return txHash, index
 					}
 

diff --git a/x/nexus/keeper/general_message.go b/x/nexus/keeper/general_message.go
@@ -31,7 +31,7 @@ func getProcessingMessageKey(destinationChain exported.ChainName, id string) key
 // GenerateMessageID generates a unique general message ID, and returns the message ID, current transacation ID and a unique integer nonce
 // The message ID is just a concatenation of the transaction ID and the nonce
 func (k Keeper) GenerateMessageID(ctx sdk.Context) (string, []byte, uint64) {
-	hash, nonce := k.Next(ctx)
+	hash, nonce := k.NextID(ctx)
 
 	return fmt.Sprintf("0x%s-%d", hex.EncodeToString(hash[:]), nonce), hash[:], nonce
 }

diff --git a/x/nexus/keeper/tx_id_generator.go b/x/nexus/keeper/tx_id_generator.go
@@ -15,12 +15,12 @@ func getTxHash(ctx sdk.Context) [32]byte {
 	return sha256.Sum256(ctx.TxBytes())
 }
 
-// Next returns the next transaction hash and index, and increments the index
-func (k Keeper) Next(ctx sdk.Context) ([32]byte, uint64) {
+// NextID returns the next transaction hash and index, and increments the index
+func (k Keeper) NextID(ctx sdk.Context) ([32]byte, uint64) {
 	return getTxHash(ctx), utils.NewCounter[uint64](messageNonceKey, k.getStore(ctx)).Incr(ctx)
 }
 
-// Curr returns the current transaction hash and index
-func (k Keeper) Curr(ctx sdk.Context) ([32]byte, uint64) {
+// CurrID returns the current transaction hash and index
+func (k Keeper) CurrID(ctx sdk.Context) ([32]byte, uint64) {
 	return getTxHash(ctx), utils.NewCounter[uint64](messageNonceKey, k.getStore(ctx)).Curr(ctx)
 }
diff --git a/x/nexus/keeper/wasm_querier.go b/x/nexus/keeper/wasm_querier.go
@@ -24,7 +24,7 @@ func NewWasmQuerier(txIDGenerator types.TxIDGenerator) *WasmQuerier {
 // Query handles the wasm queries for the nexus module
 func (q WasmQuerier) Query(ctx sdk.Context, req exported.WasmQueryRequest) ([]byte, error) {
 	if req.TxID != nil {
-		txHash, index := q.txIDGenerator.Curr(ctx)
+		txHash, index := q.txIDGenerator.CurrID(ctx)
 
 		return funcs.Must(json.Marshal(exported.WasmQueryTxIDResponse{
 			TxHash: txHash,

diff --git a/x/nexus/keeper/wasmer_engine.go b/x/nexus/keeper/wasmer_engine.go
@@ -38,7 +38,7 @@ func (w *WasmerEngine) Instantiate(
 	gasLimit uint64,
 	deserCost wasmvmtypes.UFraction,
 ) (*wasmvmtypes.Response, uint64, error) {
-	defer w.txIDGenerator.Next(getCtx(querier))
+	defer w.txIDGenerator.NextID(getCtx(querier))
 
 	return w.WasmerEngine.Instantiate(checksum, env, info, initMsg, store, goapi, querier, gasMeter, gasLimit, deserCost)
 }
@@ -56,7 +56,7 @@ func (w *WasmerEngine) Execute(
 	gasLimit uint64,
 	deserCost wasmvmtypes.UFraction,
 ) (*wasmvmtypes.Response, uint64, error) {
-	defer w.txIDGenerator.Next(getCtx(querier))
+	defer w.txIDGenerator.NextID(getCtx(querier))
 
 	return w.WasmerEngine.Execute(code, env, info, executeMsg, store, goapi, querier, gasMeter, gasLimit, deserCost)
 }
@@ -73,7 +73,7 @@ func (w *WasmerEngine) Migrate(
 	gasLimit uint64,
 	deserCost wasmvmtypes.UFraction,
 ) (*wasmvmtypes.Response, uint64, error) {
-	defer w.txIDGenerator.Next(getCtx(querier))
+	defer w.txIDGenerator.NextID(getCtx(querier))
 
 	return w.WasmerEngine.Migrate(checksum, env, migrateMsg, store, goapi, querier, gasMeter, gasLimit, deserCost)
 }
@@ -90,7 +90,7 @@ func (w *WasmerEngine) Sudo(
 	gasLimit uint64,
 	deserCost wasmvmtypes.UFraction,
 ) (*wasmvmtypes.Response, uint64, error) {
-	defer w.txIDGenerator.Next(getCtx(querier))
+	defer w.txIDGenerator.NextID(getCtx(querier))
 
 	return w.WasmerEngine.Sudo(checksum, env, sudoMsg, store, goapi, querier, gasMeter, gasLimit, deserCost)
 }
@@ -107,7 +107,7 @@ func (w *WasmerEngine) Reply(
 	gasLimit uint64,
 	deserCost wasmvmtypes.UFraction,
 ) (*wasmvmtypes.Response, uint64, error) {
-	defer w.txIDGenerator.Next(getCtx(querier))
+	defer w.txIDGenerator.NextID(getCtx(querier))
 
 	return w.WasmerEngine.Reply(checksum, env, reply, store, goapi, querier, gasMeter, gasLimit, deserCost)
 }
diff --git a/x/nexus/types/expected_keepers.go b/x/nexus/types/expected_keepers.go
@@ -54,8 +54,8 @@ type Nexus interface {
 
 // TxIDGenerator provides functionality to generate transaction IDs
 type TxIDGenerator interface {
-	Next(ctx sdk.Context) ([32]byte, uint64)
-	Curr(ctx sdk.Context) ([32]byte, uint64)
+	NextID(ctx sdk.Context) ([32]byte, uint64)
+	CurrID(ctx sdk.Context) ([32]byte, uint64)
 }
 
 // Snapshotter provides functionality to the snapshot module

diff --git a/x/nexus/types/mock/expected_keepers.go b/x/nexus/types/mock/expected_keepers.go