@agoric/cosmos 0.35.0-u12.0 → 0.35.0-u13.0

package/x/vibc/keeper/keeper.go

@@ -9,10 +9,10 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
 	capability "github.com/cosmos/cosmos-sdk/x/capability/types"
-	channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
-	porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types"
-	host "github.com/cosmos/ibc-go/v3/modules/core/24-host"
-	ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported"
+	channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
+	porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
+	host "github.com/cosmos/ibc-go/v4/modules/core/24-host"
+	ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported"
 
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 

package/x/vibc/types/expected_keepers.go

@@ -3,9 +3,9 @@ package types
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	capability "github.com/cosmos/cosmos-sdk/x/capability/types"
-	connection "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types"
-	channel "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
-	ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported"
+	connection "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types"
+	channel "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
+	ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported"
 )
 
 // ChannelKeeper defines the expected IBC channel keeper

package/x/vibc/types/msgs.go

@@ -4,7 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	chanTypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
+	chanTypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
 )
 
 const RouterKey = ModuleName // this was defined in your key.go file

package/x/vibc/types/msgs.pb.go

@@ -7,7 +7,7 @@ import (
 	context "context"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
-	types "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
+	types "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"

package/x/vstorage/keeper/querier_test.go

@@ -0,0 +1,112 @@
+package keeper
+
+import (
+	"bytes"
+	"testing"
+
+	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
+
+	abci "github.com/tendermint/tendermint/abci/types"
+
+	"github.com/cosmos/cosmos-sdk/codec"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+)
+
+func TestQuerier(t *testing.T) {
+	testKit := makeTestKit()
+	ctx, keeper := testKit.ctx, testKit.vstorageKeeper
+	legacyQuerierCdc := codec.NewAminoCodec(codec.NewLegacyAmino())
+	querier := NewQuerier(keeper, legacyQuerierCdc.LegacyAmino)
+
+	// Populate mock data
+	keeper.SetStorage(ctx, agoric.NewKVEntry("foo.bar", "42"))
+	keeper.SetStorage(ctx, agoric.NewKVEntry("foo.baz", "hello"))
+
+	type testCase struct {
+		label    string
+		path     []string
+		expected []byte
+		err      *sdkerrors.Error
+	}
+	testCases := []testCase{}
+
+	// Test invalid endpoint
+	testCases = append(testCases, []testCase{
+		{label: "invalid endpoint",
+			path: []string{"foo"},
+			err:  sdkerrors.ErrUnknownRequest,
+		},
+	}...)
+
+	// Test invalid arguments to valid data and children endpoints
+	for _, endpoint := range []string{"data", "children"} {
+		testCases = append(testCases, []testCase{
+			{label: endpoint + ": no entry path",
+				path: []string{endpoint},
+				err:  sdkerrors.ErrInvalidRequest,
+			},
+			{label: endpoint + ": too many segments",
+				path: []string{endpoint, "foo", "bar"},
+				err:  sdkerrors.ErrInvalidRequest,
+			},
+			{label: endpoint + ": invalid path",
+				path: []string{endpoint, ".", ""},
+				err:  sdkerrors.ErrInvalidRequest,
+			},
+		}...)
+	}
+
+	// Test data endpoint with valid vstorage path
+	testCases = append(testCases, []testCase{
+		{label: "data: non-existent path",
+			path: []string{"data", "bar"},
+			// DO NOT CHANGE
+			// The UI and CLI check for the specific cosmos-sdk error code & codespace
+			err: sdkerrors.ErrNotFound,
+		},
+		{label: "data: path with no data",
+			path: []string{"data", "foo"},
+			// DO NOT CHANGE
+			// The UI and CLI check for the specific cosmos-sdk error code & codespace
+			err: sdkerrors.ErrNotFound,
+		},
+		{label: "data: path with data",
+			path:     []string{"data", "foo.bar"},
+			expected: []byte("{\n  \"value\": \"42\"\n}"),
+		},
+	}...)
+
+	// Ensure stability of cosmos-sdk error codes
+	if codespace, code, _ := sdkerrors.ABCIInfo(sdkerrors.ErrNotFound, true); codespace != "sdk" || code != 38 {
+		t.Errorf("cosmos-sdk ErrNotFound has codespace %s, code %d, expected sdk/38", codespace, code)
+	}
+
+	// Test children endpoint with valid vstorage path
+	testCases = append(testCases, []testCase{
+		{label: "children: non-existent path",
+			path:     []string{"children", "bar"},
+			expected: []byte("{\n  \"children\": []\n}"),
+		},
+		{label: "children: path with no children",
+			path:     []string{"children", "foo.bar"},
+			expected: []byte("{\n  \"children\": []\n}"),
+		},
+		{label: "children: path with children",
+			path:     []string{"children", "foo"},
+			expected: []byte("{\n  \"children\": [\n    \"bar\",\n    \"baz\"\n  ]\n}"),
+		},
+	}...)
+
+	for _, desc := range testCases {
+		res, err := querier(ctx, desc.path, abci.RequestQuery{})
+		if desc.err != nil {
+			if err == nil {
+				t.Errorf("%s: got no error, want error %q", desc.label, *desc.err)
+			} else if codespace, code, _ := sdkerrors.ABCIInfo(err, true); codespace != desc.err.Codespace() || code != desc.err.ABCICode() {
+				t.Errorf("%s: got error %v, want error %q", desc.label, err, *desc.err)
+			}
+		} else if !bytes.Equal(res, desc.expected) {
+			t.Errorf("%s: wrong result: %#v, expected %#v", desc.label, string(res), string(desc.expected))
+		}
+	}
+}

package/x/swingset/legacy/v32/params.go

@@ -1,37 +0,0 @@
-package v32
-
-import (
-	"fmt"
-
-	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
-)
-
-// UpdateParams performs the parameter updates to migrate to version 2,
-// returning the updated params or an error.
-func UpdateParams(params types.Params) (types.Params, error) {
-	newBpu, err := addStorageBeanCost(params.BeansPerUnit)
-	if err != nil {
-		return params, err
-	}
-	params.BeansPerUnit = newBpu
-	return params, nil
-}
-
-// addStorageBeanCost adds the default beans per storage byte cost,
-// if it's not in the list of bean costs already, returning the possibly-updated list.
-// or an error if there's no default storage cost.
-func addStorageBeanCost(bpu []types.StringBeans) ([]types.StringBeans, error) {
-	for _, ob := range bpu {
-		if ob.Key == types.BeansPerStorageByte {
-			// success if there's already an entry
-			return bpu, nil
-		}
-	}
-	defaultParams := types.DefaultParams()
-	for _, b := range defaultParams.BeansPerUnit {
-		if b.Key == types.BeansPerStorageByte {
-			return append(bpu, b), nil
-		}
-	}
-	return bpu, fmt.Errorf("no beans per storage byte in default params %v", defaultParams)
-}

package/x/swingset/legacy/v32/params_test.go

@@ -1,133 +0,0 @@
-package v32
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-type beans = types.StringBeans
-
-func TestAddStorageBeanCost(t *testing.T) {
-	var defaultStorageCost beans
-	for _, b := range types.DefaultParams().BeansPerUnit {
-		if b.Key == types.BeansPerStorageByte {
-			defaultStorageCost = b
-		}
-	}
-	if defaultStorageCost.Key == "" {
-		t.Fatalf("no beans per storage byte in default params")
-	}
-
-	for _, tt := range []struct {
-		name string
-		in   []beans
-		want []beans
-	}{
-		{
-			name: "empty",
-			in:   []beans{},
-			want: []beans{defaultStorageCost},
-		},
-		{
-			name: "already_only_same",
-			in:   []beans{defaultStorageCost},
-			want: []beans{defaultStorageCost},
-		},
-		{
-			name: "already_only_different",
-			in:   []beans{types.NewStringBeans(types.BeansPerStorageByte, sdk.NewUint(123))},
-			want: []beans{types.NewStringBeans(types.BeansPerStorageByte, sdk.NewUint(123))},
-		},
-		{
-			name: "already_same",
-			in: []beans{
-				types.NewStringBeans("foo", sdk.NewUint(123)),
-				defaultStorageCost,
-				types.NewStringBeans("bar", sdk.NewUint(456)),
-			},
-			want: []beans{
-				types.NewStringBeans("foo", sdk.NewUint(123)),
-				defaultStorageCost,
-				types.NewStringBeans("bar", sdk.NewUint(456)),
-			},
-		},
-		{
-			name: "already_different",
-			in: []beans{
-				types.NewStringBeans("foo", sdk.NewUint(123)),
-				types.NewStringBeans(types.BeansPerStorageByte, sdk.NewUint(789)),
-				types.NewStringBeans("bar", sdk.NewUint(456)),
-			},
-			want: []beans{
-				types.NewStringBeans("foo", sdk.NewUint(123)),
-				types.NewStringBeans(types.BeansPerStorageByte, sdk.NewUint(789)),
-				types.NewStringBeans("bar", sdk.NewUint(456)),
-			},
-		},
-		{
-			name: "missing",
-			in: []beans{
-				types.NewStringBeans("foo", sdk.NewUint(123)),
-				types.NewStringBeans("bar", sdk.NewUint(456)),
-			},
-			want: []beans{
-				types.NewStringBeans("foo", sdk.NewUint(123)),
-				types.NewStringBeans("bar", sdk.NewUint(456)),
-				defaultStorageCost,
-			},
-		},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := addStorageBeanCost(tt.in)
-			if err != nil {
-				t.Errorf("got error %v", err)
-			} else if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("want %v, got %v", tt.want, got)
-			}
-		})
-	}
-}
-
-func TestUpdateParams(t *testing.T) {
-	var defaultStorageCost beans
-	for _, b := range types.DefaultParams().BeansPerUnit {
-		if b.Key == types.BeansPerStorageByte {
-			defaultStorageCost = b
-		}
-	}
-	if defaultStorageCost.Key == "" {
-		t.Fatalf("no beans per storage byte in default params")
-	}
-
-	in := types.Params{
-		BeansPerUnit: []beans{
-			types.NewStringBeans("foo", sdk.NewUint(123)),
-			types.NewStringBeans("bar", sdk.NewUint(456)),
-		},
-		BootstrapVatConfig: "baz",
-		FeeUnitPrice:       sdk.NewCoins(sdk.NewInt64Coin("denom", 789)),
-		PowerFlagFees:      types.DefaultPowerFlagFees,
-		QueueMax:           types.DefaultQueueMax,
-	}
-	want := types.Params{
-		BeansPerUnit: []beans{
-			types.NewStringBeans("foo", sdk.NewUint(123)),
-			types.NewStringBeans("bar", sdk.NewUint(456)),
-			defaultStorageCost,
-		},
-		BootstrapVatConfig: "baz",
-		FeeUnitPrice:       sdk.NewCoins(sdk.NewInt64Coin("denom", 789)),
-		PowerFlagFees:      types.DefaultPowerFlagFees,
-		QueueMax:           types.DefaultQueueMax,
-	}
-	got, err := UpdateParams(in)
-	if err != nil {
-		t.Fatalf("UpdateParam error %v", err)
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("got %v, want %v", got, want)
-	}
-}