resolved conflicts

neutron-org · Jan 26, 2024 · 188613c · 188613c
1 parent 5c0afc2
commit 188613c
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 60 deletions.
diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go
@@ -6,7 +6,7 @@ import (
 	cosmostypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramChange "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
-	"github.com/neutron-org/neutron/x/dex/types"
+	"github.com/neutron-org/neutron/v2/x/dex/types"
 	feetypes "github.com/neutron-org/neutron/v2/x/feerefunder/types"
 	icqtypes "github.com/neutron-org/neutron/v2/x/interchainqueries/types"
 	transferwrappertypes "github.com/neutron-org/neutron/v2/x/transfer/types"

diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go
@@ -3,9 +3,9 @@ package bindings
 import (
 	"cosmossdk.io/math"
 	"encoding/json"
-	utils_math "github.com/neutron-org/neutron/utils/math"
+	utils_math "github.com/neutron-org/neutron/v2/utils/math"
 	contractmanagertypes "github.com/neutron-org/neutron/v2/x/contractmanager/types"
-	dextypes "github.com/neutron-org/neutron/x/dex/types"
+	dextypes "github.com/neutron-org/neutron/v2/x/dex/types"
 	"time"
 
 	feerefundertypes "github.com/neutron-org/neutron/v2/x/feerefunder/types"

diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	dexkeeper "github.com/neutron-org/neutron/x/dex/keeper"
-	dextypes "github.com/neutron-org/neutron/x/dex/types"
+	dexkeeper "github.com/neutron-org/neutron/v2/x/dex/keeper"
+	dextypes "github.com/neutron-org/neutron/v2/x/dex/types"
 	"time"
 
 	contractmanagerkeeper "github.com/neutron-org/neutron/v2/x/contractmanager/keeper"
@@ -105,56 +105,56 @@ func (m *CustomMessenger) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddre
 		)
 		return nil, nil, errors.Wrap(err, "failed to decode incoming custom cosmos message")
 	}
-	    // Dispatch the message based on its type by checking each possible field
-		if contractMsg.SubmitTx != nil {
-			return m.submitTx(ctx, contractAddr, contractMsg.SubmitTx)
-		}
-		if contractMsg.RegisterInterchainAccount != nil {
-			return m.registerInterchainAccount(ctx, contractAddr, contractMsg.RegisterInterchainAccount)
-		}
-		if contractMsg.RegisterInterchainQuery != nil {
-			return m.registerInterchainQuery(ctx, contractAddr, contractMsg.RegisterInterchainQuery)
-		}
-		if contractMsg.UpdateInterchainQuery != nil {
-			return m.updateInterchainQuery(ctx, contractAddr, contractMsg.UpdateInterchainQuery)
-		}
-		if contractMsg.RemoveInterchainQuery != nil {
-			return m.removeInterchainQuery(ctx, contractAddr, contractMsg.RemoveInterchainQuery)
-		}
-		if contractMsg.IBCTransfer != nil {
-			return m.ibcTransfer(ctx, contractAddr, *contractMsg.IBCTransfer)
-		}
-		if contractMsg.SubmitAdminProposal != nil {
-			return m.submitAdminProposal(ctx, contractAddr, &contractMsg.SubmitAdminProposal.AdminProposal)
-		}
-		if contractMsg.CreateDenom != nil {
-			return m.createDenom(ctx, contractAddr, contractMsg.CreateDenom)
-		}
-		if contractMsg.MintTokens != nil {
-			return m.mintTokens(ctx, contractAddr, contractMsg.MintTokens)
-		}
-		if contractMsg.SetBeforeSendHook != nil {
-			return m.setBeforeSendHook(ctx, contractAddr, contractMsg.SetBeforeSendHook)
-		}
-		if contractMsg.ChangeAdmin != nil {
-			return m.changeAdmin(ctx, contractAddr, contractMsg.ChangeAdmin)
-		}
-		if contractMsg.BurnTokens != nil {
-			return m.burnTokens(ctx, contractAddr, contractMsg.BurnTokens)
-		}
-		if contractMsg.AddSchedule != nil {
-			return m.addSchedule(ctx, contractAddr, contractMsg.AddSchedule)
-		}
-		if contractMsg.RemoveSchedule != nil {
-			return m.removeSchedule(ctx, contractAddr, contractMsg.RemoveSchedule)
-		}
-		if contractMsg.ResubmitFailure != nil {
-			return m.resubmitFailure(ctx, contractAddr, contractMsg.ResubmitFailure)
-		}
-		if contractMsg.Dex != nil {
-			data, err := m.dispatchDexMsg(ctx, contractAddr, *(contractMsg.Dex))
-			return nil, data, err
-		}
+
+	// Dispatch the message based on its type by checking each possible field
+	if contractMsg.SubmitTx != nil {
+		return m.submitTx(ctx, contractAddr, contractMsg.SubmitTx)
+	}
+	if contractMsg.RegisterInterchainAccount != nil {
+		return m.registerInterchainAccount(ctx, contractAddr, contractMsg.RegisterInterchainAccount)
+	}
+	if contractMsg.RegisterInterchainQuery != nil {
+		return m.registerInterchainQuery(ctx, contractAddr, contractMsg.RegisterInterchainQuery)
+	}
+	if contractMsg.UpdateInterchainQuery != nil {
+		return m.updateInterchainQuery(ctx, contractAddr, contractMsg.UpdateInterchainQuery)
+	}
+	if contractMsg.RemoveInterchainQuery != nil {
+		return m.removeInterchainQuery(ctx, contractAddr, contractMsg.RemoveInterchainQuery)
+	}
+	if contractMsg.IBCTransfer != nil {
+		return m.ibcTransfer(ctx, contractAddr, *contractMsg.IBCTransfer)
+	}
+	if contractMsg.SubmitAdminProposal != nil {
+		return m.submitAdminProposal(ctx, contractAddr, &contractMsg.SubmitAdminProposal.AdminProposal)
+	}
+	if contractMsg.CreateDenom != nil {
+		return m.createDenom(ctx, contractAddr, contractMsg.CreateDenom)
+	}
+	if contractMsg.MintTokens != nil {
+		return m.mintTokens(ctx, contractAddr, contractMsg.MintTokens)
+	}
+	if contractMsg.SetBeforeSendHook != nil {
+		return m.setBeforeSendHook(ctx, contractAddr, contractMsg.SetBeforeSendHook)
+	}
+	if contractMsg.ChangeAdmin != nil {
+		return m.changeAdmin(ctx, contractAddr, contractMsg.ChangeAdmin)
+	}
+	if contractMsg.BurnTokens != nil {
+		return m.burnTokens(ctx, contractAddr, contractMsg.BurnTokens)
+	}
+	if contractMsg.AddSchedule != nil {
+		return m.addSchedule(ctx, contractAddr, contractMsg.AddSchedule)
+	}
+	if contractMsg.RemoveSchedule != nil {
+		return m.removeSchedule(ctx, contractAddr, contractMsg.RemoveSchedule)
+	}
+	if contractMsg.ResubmitFailure != nil {
+		return m.resubmitFailure(ctx, contractAddr, contractMsg.ResubmitFailure)
+	}
+	if contractMsg.Dex != nil {
+		data, err := m.dispatchDexMsg(ctx, contractAddr, *(contractMsg.Dex))
+		return nil, data, err
 	}
 
 	// If none of the conditions are met, forward the message to the wrapped handler

diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go
@@ -8,8 +8,7 @@ import (
 	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkquery "github.com/cosmos/cosmos-sdk/types/query"
-	contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types"
-	dextypes "github.com/neutron-org/neutron/x/dex/types"
+	dextypes "github.com/neutron-org/neutron/v2/x/dex/types"
 	"time"
 
 	contractmanagertypes "github.com/neutron-org/neutron/v2/x/contractmanager/types"

diff --git a/wasmbinding/query_plugin.go b/wasmbinding/query_plugin.go
@@ -2,7 +2,7 @@ package wasmbinding
 
 import (
 	contractmanagerkeeper "github.com/neutron-org/neutron/v2/x/contractmanager/keeper"
-	dexkeeper "github.com/neutron-org/neutron/x/dex/keeper"
+	dexkeeper "github.com/neutron-org/neutron/v2/x/dex/keeper"
 	feeburnerkeeper "github.com/neutron-org/neutron/v2/x/feeburner/keeper"
 	feerefunderkeeper "github.com/neutron-org/neutron/v2/x/feerefunder/keeper"
 	icqkeeper "github.com/neutron-org/neutron/v2/x/interchainqueries/keeper"

diff --git a/wasmbinding/wasm.go b/wasmbinding/wasm.go
@@ -6,7 +6,7 @@ import (
 
 	contractmanagerkeeper "github.com/neutron-org/neutron/v2/x/contractmanager/keeper"
 	cronkeeper "github.com/neutron-org/neutron/v2/x/cron/keeper"
-	dexkeeper "github.com/neutron-org/neutron/x/dex/keeper"
+	dexkeeper "github.com/neutron-org/neutron/v2/x/dex/keeper"
 	feeburnerkeeper "github.com/neutron-org/neutron/v2/x/feeburner/keeper"
 	feerefunderkeeper "github.com/neutron-org/neutron/v2/x/feerefunder/keeper"
 

diff --git a/x/dex/types/wasm.go b/x/dex/types/wasm.go
@@ -3,7 +3,7 @@ package types
 import (
 	"cosmossdk.io/math"
 	"github.com/cosmos/cosmos-sdk/types/query"
-	math_utils "github.com/neutron-org/neutron/utils/math"
+	math_utils "github.com/neutron-org/neutron/v2/utils/math"
 )
 
 /*