fix addressCodec nil error

ODIN-PROTOCOL · Aug 6, 2024 · b5eb155 · b5eb155
1 parent 0e969f0
commit b5eb155
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 33 deletions.
diff --git a/x/oracle/handler.go b/x/oracle/handler.go
@@ -18,28 +18,28 @@ func NewHandler(k keeper.Keeper) Handler {
 		ctx = ctx.WithEventManager(sdk.NewEventManager())
 		switch msg := msg.(type) {
 		case *types.MsgRequestData:
-			res, err := msgServer.RequestData(sdk.WrapSDKContext(ctx), msg)
+			res, err := msgServer.RequestData(ctx, msg)
 			return sdk.WrapServiceResult(ctx, res, err)
 		case *types.MsgReportData:
-			res, err := msgServer.ReportData(sdk.WrapSDKContext(ctx), msg)
+			res, err := msgServer.ReportData(ctx, msg)
 			return sdk.WrapServiceResult(ctx, res, err)
 		case *types.MsgCreateDataSource:
-			res, err := msgServer.CreateDataSource(sdk.WrapSDKContext(ctx), msg)
+			res, err := msgServer.CreateDataSource(ctx, msg)
 			return sdk.WrapServiceResult(ctx, res, err)
 		case *types.MsgEditDataSource:
-			res, err := msgServer.EditDataSource(sdk.WrapSDKContext(ctx), msg)
+			res, err := msgServer.EditDataSource(ctx, msg)
 			return sdk.WrapServiceResult(ctx, res, err)
 		case *types.MsgCreateOracleScript:
-			res, err := msgServer.CreateOracleScript(sdk.WrapSDKContext(ctx), msg)
+			res, err := msgServer.CreateOracleScript(ctx, msg)
 			return sdk.WrapServiceResult(ctx, res, err)
 		case *types.MsgEditOracleScript:
-			res, err := msgServer.EditOracleScript(sdk.WrapSDKContext(ctx), msg)
+			res, err := msgServer.EditOracleScript(ctx, msg)
 			return sdk.WrapServiceResult(ctx, res, err)
 		case *types.MsgActivate:
-			res, err := msgServer.Activate(sdk.WrapSDKContext(ctx), msg)
+			res, err := msgServer.Activate(ctx, msg)
 			return sdk.WrapServiceResult(ctx, res, err)
 		case *types.MsgUpdateParams:
-			res, err := msgServer.UpdateParams(sdk.WrapSDKContext(ctx), msg)
+			res, err := msgServer.UpdateParams(ctx, msg)
 			return sdk.WrapServiceResult(ctx, res, err)
 		default:
 			return nil, errors.Wrapf(sdkerrors.ErrUnknownRequest, "unrecognized %s message type: %T", types.ModuleName, msg)

diff --git a/x/oracle/keeper/grpc_query.go b/x/oracle/keeper/grpc_query.go
@@ -312,7 +312,7 @@ func (k Querier) IsReporter(
 	if err != nil {
 		return nil, err
 	}
-	rep, err := k.validatorAddressCodec.StringToBytes(req.ReporterAddress)
+	rep, err := k.addressCodec.StringToBytes(req.ReporterAddress)
 	if err != nil {
 		return nil, err
 	}

diff --git a/x/oracle/keeper/grpc_query_test.go b/x/oracle/keeper/grpc_query_test.go
@@ -93,7 +93,7 @@ func (suite *RequestVerificationTestSuite) TestSuccess() {
 	suite.assert.NoError(err)
 	req.Signature = signature
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
 	expectedResult := &types.QueryRequestVerificationResponse{
 		ChainId:      suite.ctx.ChainID(),
@@ -128,8 +128,9 @@ func (suite *RequestVerificationTestSuite) TestFailedRequestIDNotExist() {
 	suite.assert.NoError(err)
 	req.Signature = signature
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
+	suite.assert.Error(err)
 	suite.assert.Contains(err.Error(), "unable to get request from chain", "RequestVerification should failed")
 	suite.assert.Nil(res, "response should be nil")
 }
@@ -156,7 +157,7 @@ func (suite *RequestVerificationTestSuite) TestRequestInDelayRange() {
 	suite.assert.NoError(err)
 	req.Signature = signature
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
 	expectedResult := &types.QueryRequestVerificationResponse{
 		ChainId:      suite.ctx.ChainID(),
@@ -192,8 +193,9 @@ func (suite *RequestVerificationTestSuite) TestFailedExceedDelayRange() {
 	suite.assert.NoError(err)
 	req.Signature = signature
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
+	suite.assert.Error(err)
 	suite.assert.Contains(err.Error(), "unable to get request from chain", "RequestVerification should failed")
 	suite.assert.Nil(res, "response should be nil")
 }
@@ -219,8 +221,9 @@ func (suite *RequestVerificationTestSuite) TestFailedDataSourceIDNotMatch() {
 	suite.assert.NoError(err)
 	req.Signature = signature
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
+	suite.assert.Error(err)
 	suite.assert.Contains(
 		err.Error(),
 		"is not match with data source id provided in request",
@@ -230,8 +233,9 @@ func (suite *RequestVerificationTestSuite) TestFailedDataSourceIDNotMatch() {
 }
 
 func (suite *RequestVerificationTestSuite) TestFailedEmptyRequest() {
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), nil)
+	res, err := suite.querier.RequestVerification(suite.ctx, nil)
 
+	suite.assert.Error(err)
 	suite.assert.Contains(err.Error(), "empty request", "RequestVerification should failed")
 	suite.assert.Nil(res, "response should be nil")
 }
@@ -257,8 +261,9 @@ func (suite *RequestVerificationTestSuite) TestFailedChainIDNotMatch() {
 	suite.assert.NoError(err)
 	req.Signature = signature
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
+	suite.assert.Error(err)
 	suite.assert.Contains(
 		err.Error(),
 		"provided chain ID does not match the validator's chain ID",
@@ -288,8 +293,9 @@ func (suite *RequestVerificationTestSuite) TestFailedInvalidValidatorAddr() {
 	suite.assert.NoError(err)
 	req.Signature = signature
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
+	suite.assert.Error(err)
 	suite.assert.Contains(err.Error(), "unable to parse validator address", "RequestVerification should failed")
 	suite.assert.Nil(res, "response should be nil")
 }
@@ -315,8 +321,9 @@ func (suite *RequestVerificationTestSuite) TestFailedInvalidReporterPubKey() {
 	suite.assert.NoError(err)
 	req.Signature = signature
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
+	suite.assert.Error(err)
 	suite.assert.Contains(err.Error(), "unable to get reporter's public key", "RequestVerification should failed")
 	suite.assert.Nil(res, "response should be nil")
 }
@@ -330,8 +337,9 @@ func (suite *RequestVerificationTestSuite) TestFailedEmptySignature() {
 		Reporter:   hex.EncodeToString(suite.reporterPrivKey.PubKey().Bytes()),
 	}
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
+	suite.assert.Error(err)
 	suite.assert.Contains(err.Error(), "invalid reporter's signature", "RequestVerification should failed")
 	suite.assert.Nil(res, "response should be nil")
 }
@@ -360,8 +368,9 @@ func (suite *RequestVerificationTestSuite) TestFailedReporterUnauthorized() {
 	suite.assert.NoError(err)
 	req.Signature = signature
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
+	suite.assert.Error(err)
 	suite.assert.Contains(err.Error(), "is not an authorized reporter of", "RequestVerification should failed")
 	suite.assert.Nil(res, "response should be nil")
 }
@@ -391,8 +400,9 @@ func (suite *RequestVerificationTestSuite) TestFailedUnselectedValidator() {
 	suite.assert.NoError(err)
 	req.Signature = signature
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
+	suite.assert.Error(err)
 	suite.assert.Contains(err.Error(), "is not assigned for request ID", "RequestVerification should failed")
 	suite.assert.Nil(res, "response should be nil")
 }
@@ -422,8 +432,9 @@ func (suite *RequestVerificationTestSuite) TestFailedNoDataSourceFound() {
 	suite.assert.NoError(err)
 	req.Signature = signature
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
+	suite.assert.Error(err)
 	suite.assert.Contains(err.Error(), "no data source required by the request", "RequestVerification should failed")
 	suite.assert.Nil(res, "response should be nil")
 }
@@ -460,8 +471,9 @@ func (suite *RequestVerificationTestSuite) TestFailedValidatorAlreadyReported()
 	suite.assert.NoError(err)
 	req.Signature = signature
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
+	suite.assert.Error(err)
 	suite.assert.Contains(err.Error(), "already submitted data report", "RequestVerification should failed")
 	suite.assert.Nil(res, "response should be nil")
 }
@@ -489,8 +501,9 @@ func (suite *RequestVerificationTestSuite) TestFailedRequestAlreadyExpired() {
 	suite.assert.NoError(err)
 	req.Signature = signature
 
-	res, err := suite.querier.RequestVerification(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.RequestVerification(suite.ctx, req)
 
+	suite.assert.Error(err)
 	suite.assert.Contains(err.Error(), "Request with ID 1 is already expired", "RequestVerification should failed")
 	suite.assert.Nil(res, "response should be nil")
 }
@@ -499,7 +512,7 @@ func (suite *RequestVerificationTestSuite) TestGetReporters() {
 	req := &types.QueryReportersRequest{
 		ValidatorAddress: testapp.Validators[0].ValAddress.String(),
 	}
-	res, err := suite.querier.Reporters(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.Reporters(suite.ctx, req)
 
 	expectedResult := &types.QueryReportersResponse{
 		Reporter: []string{suite.reporterAddr.String()},
@@ -513,7 +526,7 @@ func (suite *RequestVerificationTestSuite) TestGetExpiredReporters() {
 	req := &types.QueryReportersRequest{
 		ValidatorAddress: testapp.Validators[0].ValAddress.String(),
 	}
-	res, err := suite.querier.Reporters(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.Reporters(suite.ctx, req)
 
 	expectedResult := &types.QueryReportersResponse{
 		Reporter: []string{},
@@ -527,7 +540,7 @@ func (suite *RequestVerificationTestSuite) TestIsReporter() {
 		ValidatorAddress: testapp.Validators[0].ValAddress.String(),
 		ReporterAddress:  suite.reporterAddr.String(),
 	}
-	res, err := suite.querier.IsReporter(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.IsReporter(suite.ctx, req)
 
 	expectedResult := &types.QueryIsReporterResponse{
 		IsReporter: true,
@@ -541,7 +554,7 @@ func (suite *RequestVerificationTestSuite) TestIsNotReporter() {
 		ValidatorAddress: testapp.Validators[0].ValAddress.String(),
 		ReporterAddress:  suite.granteeAddr.String(),
 	}
-	res, err := suite.querier.IsReporter(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.IsReporter(suite.ctx, req)
 
 	expectedResult := &types.QueryIsReporterResponse{
 		IsReporter: false,
@@ -556,7 +569,7 @@ func (suite *RequestVerificationTestSuite) TestRevokeReporters() {
 	req := &types.QueryReportersRequest{
 		ValidatorAddress: testapp.Validators[0].ValAddress.String(),
 	}
-	res, err := suite.querier.Reporters(sdk.WrapSDKContext(suite.ctx), req)
+	res, err := suite.querier.Reporters(suite.ctx, req)
 
 	expectedResult := &types.QueryReportersResponse{
 		Reporter: []string{},
@@ -701,7 +714,7 @@ func (suite *PendingRequestsTestSuite) TestSuccess() {
 	)
 	require.NoError(suite.T(), err)
 
-	r, err := suite.querier.PendingRequests(sdk.WrapSDKContext(suite.ctx), &types.QueryPendingRequestsRequest{
+	r, err := suite.querier.PendingRequests(suite.ctx, &types.QueryPendingRequestsRequest{
 		ValidatorAddress: sdk.ValAddress(testapp.Validators[0].Address).String(),
 	})
 

diff --git a/x/oracle/keeper/keeper.go b/x/oracle/keeper/keeper.go
@@ -97,6 +97,7 @@ func NewKeeper(
 		portKeeper:            portKeeper,
 		scopedKeeper:          scopeKeeper,
 		validatorAddressCodec: stakingKeeper.ValidatorAddressCodec(),
+		addressCodec:          authKeeper.AddressCodec(),
 		authority:             authority,
 		storeService:          storeService,
 

diff --git a/x/oracle/keeper/owasm_test.go b/x/oracle/keeper/owasm_test.go
@@ -133,7 +133,7 @@ func TestPrepareRequestSuccessBasic(t *testing.T) {
 	ctx = ctx.WithGasMeter(wrappedGasMeter)
 
 	balancesRes, err := app.BankKeeper.AllBalances(
-		sdk.WrapSDKContext(ctx),
+		ctx,
 		authtypes.NewQueryAllBalancesRequest(testapp.FeePayer.Address, &query.PageRequest{}, false),
 	)
 	require.NoError(t, err)
@@ -1040,7 +1040,7 @@ func TestCollectFeeBasicSuccess(t *testing.T) {
 	require.NoError(t, err)
 
 	balancesRes, err := app.BankKeeper.AllBalances(
-		sdk.WrapSDKContext(ctx),
+		ctx,
 		authtypes.NewQueryAllBalancesRequest(testapp.FeePayer.Address, &query.PageRequest{}, false),
 	)
 	require.NoError(t, err)
@@ -1074,7 +1074,7 @@ func TestCollectFeeBasicSuccessWithOtherAskCount(t *testing.T) {
 	require.NoError(t, err)
 
 	balancesRes, err := app.BankKeeper.AllBalances(
-		sdk.WrapSDKContext(ctx),
+		ctx,
 		authtypes.NewQueryAllBalancesRequest(testapp.FeePayer.Address, &query.PageRequest{}, false),
 	)
 	require.NoError(t, err)