Merge pull request #192 from osmosis-labs/trinity/handle-on-close-cha…

…nnel-logic feat: handle on close channel
osmosis-labs · Sep 6, 2024 · df5db2f · df5db2f
2 parents c9f14a2 + 9f88ecd
commit df5db2f
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 8 deletions.
diff --git a/tests/e2e/e2e.go b/tests/e2e/e2e.go
@@ -137,7 +137,7 @@ type example struct {
 	ProviderDenom    string
 	ConsumerDenom    string
 	MyProvChainActor string
-	MaxRetrieve      uint16
+	MaxRetrieve      uint32
 }
 
 func setupExampleChains(t *testing.T) example {

diff --git a/tests/testdata/mesh_converter.wasm.gz b/tests/testdata/mesh_converter.wasm.gz
diff --git a/tests/testdata/mesh_external_staking.wasm.gz b/tests/testdata/mesh_external_staking.wasm.gz
diff --git a/tests/testdata/mesh_native_staking.wasm.gz b/tests/testdata/mesh_native_staking.wasm.gz
diff --git a/tests/testdata/mesh_native_staking_proxy.wasm.gz b/tests/testdata/mesh_native_staking_proxy.wasm.gz
diff --git a/tests/testdata/mesh_osmosis_price_provider.wasm.gz b/tests/testdata/mesh_osmosis_price_provider.wasm.gz
diff --git a/tests/testdata/mesh_remote_price_feed.wasm.gz b/tests/testdata/mesh_remote_price_feed.wasm.gz
diff --git a/tests/testdata/mesh_simple_price_feed.wasm.gz b/tests/testdata/mesh_simple_price_feed.wasm.gz
diff --git a/tests/testdata/mesh_vault.wasm.gz b/tests/testdata/mesh_vault.wasm.gz
diff --git a/tests/testdata/mesh_virtual_staking.wasm.gz b/tests/testdata/mesh_virtual_staking.wasm.gz
diff --git a/tests/testdata/version.txt b/tests/testdata/version.txt
@@ -1 +1 @@
-7cf179e7c5f4a59264b062d7cefe24006f2ba84e
+9c1a08272a3c580544ae4978bb40ca56f38d6d71
diff --git a/x/meshsecurity/contract/query.go b/x/meshsecurity/contract/query.go
@@ -26,7 +26,7 @@ type (
 	}
 	AllDelegationsQuery struct {
 		Contract    string `json:"contract"`
-		MaxRetrieve uint16 `json:"max_retrieve"`
+		MaxRetrieve uint32 `json:"max_retrieve"`
 	}
 	AllDelegationsResponse struct {
 		Delegations []Delegation `json:"delegations"`

diff --git a/x/meshsecurity/keeper/keeper.go b/x/meshsecurity/keeper/keeper.go
@@ -167,7 +167,7 @@ func (k Keeper) GetDelegation(ctx sdk.Context, actor, delAddr sdk.AccAddress, va
 }
 
 // GetAllDelegations returns all delegations for a specific contract
-func (k Keeper) GetAllDelegations(ctx sdk.Context, actor sdk.AccAddress, maxRetrieve uint16) (delegations []types.Delegation) {
+func (k Keeper) GetAllDelegations(ctx sdk.Context, actor sdk.AccAddress, maxRetrieve uint32) (delegations []types.Delegation) {
 	delegations = make([]types.Delegation, maxRetrieve)
 	store := ctx.KVStore(k.storeKey)
 	contractPrefixKey := types.BuildDelegationsKey(actor)

diff --git a/x/meshsecurity/keeper/query_plugin.go b/x/meshsecurity/keeper/query_plugin.go
@@ -21,7 +21,7 @@ type (
 	viewKeeper interface {
 		GetMaxCapLimit(ctx sdk.Context, actor sdk.AccAddress) sdk.Coin
 		GetTotalDelegated(ctx sdk.Context, actor sdk.AccAddress) sdk.Coin
-		GetAllDelegations(ctx sdk.Context, actor sdk.AccAddress, maxRetrieve uint16) []types.Delegation
+		GetAllDelegations(ctx sdk.Context, actor sdk.AccAddress, maxRetrieve uint32) []types.Delegation
 	}
 	stakingKeeper interface {
 		BondDenom(ctx sdk.Context) string

diff --git a/x/meshsecurity/keeper/query_plugin_test.go b/x/meshsecurity/keeper/query_plugin_test.go
@@ -37,7 +37,7 @@ func TestChainedCustomQuerier(t *testing.T) {
 				GetTotalDelegatedFn: func(ctx sdk.Context, actor sdk.AccAddress) sdk.Coin {
 					return sdk.NewCoin("ALX", math.NewInt(456))
 				},
-				GetAllDelegationsFn: func(ctx sdk.Context, actor sdk.AccAddress, maxRetrieve uint16) []types.Delegation {
+				GetAllDelegationsFn: func(ctx sdk.Context, actor sdk.AccAddress, maxRetrieve uint32) []types.Delegation {
 					return []types.Delegation{}
 				},
 			},
@@ -91,7 +91,7 @@ var _ viewKeeper = &MockViewKeeper{}
 type MockViewKeeper struct {
 	GetMaxCapLimitFn    func(ctx sdk.Context, actor sdk.AccAddress) sdk.Coin
 	GetTotalDelegatedFn func(ctx sdk.Context, actor sdk.AccAddress) sdk.Coin
-	GetAllDelegationsFn func(ctx sdk.Context, actor sdk.AccAddress, maxRetrieve uint16) []types.Delegation
+	GetAllDelegationsFn func(ctx sdk.Context, actor sdk.AccAddress, maxRetrieve uint32) []types.Delegation
 }
 
 func (m MockViewKeeper) GetMaxCapLimit(ctx sdk.Context, actor sdk.AccAddress) sdk.Coin {
@@ -108,7 +108,7 @@ func (m MockViewKeeper) GetTotalDelegated(ctx sdk.Context, actor sdk.AccAddress)
 	return m.GetTotalDelegatedFn(ctx, actor)
 }
 
-func (m MockViewKeeper) GetAllDelegations(ctx sdk.Context, actor sdk.AccAddress, maxRetrieve uint16) []types.Delegation {
+func (m MockViewKeeper) GetAllDelegations(ctx sdk.Context, actor sdk.AccAddress, maxRetrieve uint32) []types.Delegation {
 	if m.GetAllDelegationsFn == nil {
 		panic("not expected to be called")
 	}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		7cf179e7c5f4a59264b062d7cefe24006f2ba84e
		9c1a08272a3c580544ae4978bb40ca56f38d6d71