From 0063f66349067d91c5b52977e9c49dc963fb0117 Mon Sep 17 00:00:00 2001 From: Alex Peters Date: Wed, 19 Jul 2023 15:21:44 +0200 Subject: [PATCH] Resolve conflicts --- x/wasm/client/cli/tx_test.go | 73 ++-------------------------------- x/wasm/keeper/keeper_test.go | 4 -- x/wasm/keeper/query_plugins.go | 2 +- x/wasm/keeper/reflect_test.go | 4 +- 4 files changed, 6 insertions(+), 77 deletions(-) diff --git a/x/wasm/client/cli/tx_test.go b/x/wasm/client/cli/tx_test.go index 4ad4a68502..1be235b4d1 100644 --- a/x/wasm/client/cli/tx_test.go +++ b/x/wasm/client/cli/tx_test.go @@ -12,71 +12,6 @@ import ( "github.com/CosmWasm/wasmd/x/wasm/types" ) -<<<<<<< HEAD -======= -func TestParseVerificationFlags(t *testing.T) { - mySender := sdk.MustAccAddressFromBech32("cosmos1wyqh3n50ecatjg4vww5crmtd0nmyzusnwckw4at4gluc0m5m477q4arfek") - - specs := map[string]struct { - srcPath string - args []string - expErr bool - expSource string - expBuilder string - expCodeHash string - }{ - "gov store zipped": { - srcPath: "../../keeper/testdata/hackatom.wasm.gzip", - args: []string{ - "--instantiate-everybody=true", "--code-hash=5ca46abb8e9b1b754a5c906f9c0f4eec9121ee09e3cee55ea0faba54763706e2", - "--code-source-url=https://example.com", "--builder=cosmwasm/workspace-optimizer:0.12.11", - }, - expBuilder: "cosmwasm/workspace-optimizer:0.12.11", - expSource: "https://example.com", - expCodeHash: "5ca46abb8e9b1b754a5c906f9c0f4eec9121ee09e3cee55ea0faba54763706e2", - }, - "gov store raw": { - srcPath: "../../keeper/testdata/hackatom.wasm", - args: []string{ - "--instantiate-everybody=true", "--code-hash=5ca46abb8e9b1b754a5c906f9c0f4eec9121ee09e3cee55ea0faba54763706e2", - "--code-source-url=https://example.com", "--builder=cosmwasm/workspace-optimizer:0.12.11", - }, - expBuilder: "cosmwasm/workspace-optimizer:0.12.11", - expSource: "https://example.com", - expCodeHash: "5ca46abb8e9b1b754a5c906f9c0f4eec9121ee09e3cee55ea0faba54763706e2", - }, - "gov store checksum mismatch": { - srcPath: "../../keeper/testdata/hackatom.wasm", - args: []string{ - "--instantiate-everybody=true", "--code-hash=0000de5e9b93b52e514c74ce87ccddb594b9bcd33b7f1af1bb6da63fc883917b", - "--code-source-url=https://example.com", "--builder=cosmwasm/workspace-optimizer:0.12.11", - }, - expErr: true, - }, - } - for name, spec := range specs { - t.Run(name, func(t *testing.T) { - flagSet := ProposalStoreAndInstantiateContractCmd().Flags() - require.NoError(t, flagSet.Parse(spec.args)) - - gotMsg, err := parseStoreCodeArgs(spec.srcPath, mySender.String(), flagSet) - require.NoError(t, err) - require.True(t, ioutils.IsGzip(gotMsg.WASMByteCode)) - - gotSource, gotBuilder, gotCodeHash, gotErr := parseVerificationFlags(gotMsg.WASMByteCode, flagSet) - if spec.expErr { - require.Error(t, gotErr) - return - } - require.NoError(t, gotErr) - assert.Equal(t, spec.expSource, gotSource) - assert.Equal(t, spec.expBuilder, gotBuilder) - assert.Equal(t, spec.expCodeHash, hex.EncodeToString(gotCodeHash)) - }) - } -} - ->>>>>>> fe3afd52 (Test coin metadata query (#1520)) func TestParseAccessConfigFlags(t *testing.T) { specs := map[string]struct { args []string @@ -140,22 +75,22 @@ func TestParseVerificationFlags(t *testing.T) { "gov store zipped": { srcPath: "../../keeper/testdata/hackatom.wasm.gzip", args: []string{ - "--instantiate-everybody=true", "--code-hash=beb3de5e9b93b52e514c74ce87ccddb594b9bcd33b7f1af1bb6da63fc883917b", + "--instantiate-everybody=true", "--code-hash=5ca46abb8e9b1b754a5c906f9c0f4eec9121ee09e3cee55ea0faba54763706e2", "--code-source-url=https://example.com", "--builder=cosmwasm/workspace-optimizer:0.12.11", }, expBuilder: "cosmwasm/workspace-optimizer:0.12.11", expSource: "https://example.com", - expCodeHash: "beb3de5e9b93b52e514c74ce87ccddb594b9bcd33b7f1af1bb6da63fc883917b", + expCodeHash: "5ca46abb8e9b1b754a5c906f9c0f4eec9121ee09e3cee55ea0faba54763706e2", }, "gov store raw": { srcPath: "../../keeper/testdata/hackatom.wasm", args: []string{ - "--instantiate-everybody=true", "--code-hash=beb3de5e9b93b52e514c74ce87ccddb594b9bcd33b7f1af1bb6da63fc883917b", + "--instantiate-everybody=true", "--code-hash=5ca46abb8e9b1b754a5c906f9c0f4eec9121ee09e3cee55ea0faba54763706e2", "--code-source-url=https://example.com", "--builder=cosmwasm/workspace-optimizer:0.12.11", }, expBuilder: "cosmwasm/workspace-optimizer:0.12.11", expSource: "https://example.com", - expCodeHash: "beb3de5e9b93b52e514c74ce87ccddb594b9bcd33b7f1af1bb6da63fc883917b", + expCodeHash: "5ca46abb8e9b1b754a5c906f9c0f4eec9121ee09e3cee55ea0faba54763706e2", }, "gov store checksum mismatch": { srcPath: "../../keeper/testdata/hackatom.wasm", diff --git a/x/wasm/keeper/keeper_test.go b/x/wasm/keeper/keeper_test.go index 1628150186..22714aa710 100644 --- a/x/wasm/keeper/keeper_test.go +++ b/x/wasm/keeper/keeper_test.go @@ -412,11 +412,7 @@ func TestInstantiate(t *testing.T) { gasAfter := ctx.GasMeter().GasConsumed() if types.EnableGasVerification { -<<<<<<< HEAD - require.Equal(t, uint64(0x1a7b6), gasAfter-gasBefore) -======= require.Equal(t, uint64(0x1b5bd), gasAfter-gasBefore) ->>>>>>> fe3afd52 (Test coin metadata query (#1520)) } // ensure it is stored properly diff --git a/x/wasm/keeper/query_plugins.go b/x/wasm/keeper/query_plugins.go index a2e1372a7a..6f7df819c2 100644 --- a/x/wasm/keeper/query_plugins.go +++ b/x/wasm/keeper/query_plugins.go @@ -216,7 +216,7 @@ func BankQuerier(bankKeeper types.BankViewKeeper) func(ctx sdk.Context, request return json.Marshal(res) } if request.AllDenomMetadata != nil { - bankQueryRes, err := bankKeeper.DenomsMetadata(ctx.Context(), ConvertToDenomsMetadataRequest(request.AllDenomMetadata)) + bankQueryRes, err := bankKeeper.DenomsMetadata(sdk.WrapSDKContext(ctx), ConvertToDenomsMetadataRequest(request.AllDenomMetadata)) if err != nil { return nil, sdkerrors.ErrInvalidRequest } diff --git a/x/wasm/keeper/reflect_test.go b/x/wasm/keeper/reflect_test.go index d2cdaf3763..6fcec0a446 100644 --- a/x/wasm/keeper/reflect_test.go +++ b/x/wasm/keeper/reflect_test.go @@ -592,8 +592,6 @@ func TestQueryDenomsIntegration(t *testing.T) { Display: "alx", Name: "my test denom", Symbol: "XALX", - URI: "https://example.com/ualx", - URIHash: "my_hash", } metadata2 = banktypes.Metadata{ Description: "testing2", @@ -615,7 +613,7 @@ func TestQueryDenomsIntegration(t *testing.T) { specs := map[string]struct { query string exp []byte - expErr *errorsmod.Error + expErr *sdkerrors.Error }{ "all denoms": { query: `{"denoms":{}}`,