@@ -46,14 +46,14 @@ func (e unaryEncodingHandler) Handle(ctx context.Context, reqBody interface{}) (
 		return nil, err
 	}
 
-	if resType := thriftRes.Body.EnvelopeType(); resType != wire.Reply {
+	if resType := thriftRes.EnvelopeType(); resType != wire.Reply {
 		return nil, errUnexpectedEnvelopeType(resType)
 	}
 
-	resValue, err := thriftRes.Body.ToWire()
+	resValue, err := thriftRes.ToWire()
 	if err != nil {
 		return nil, err
 	}
 
-	return resValue, thriftRes.Exception
+	return resValue, nil
 }
// Copyright (c) 2018 Uber Technologies, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

package yarpcthrift

import (
	"context"

	"go.uber.org/thriftrw/wire"
	yarpc "go.uber.org/yarpc/v2"
	"go.uber.org/yarpc/v2/yarpcerror"
)

var _ yarpc.UnaryEncodingHandler = unaryEncodingHandler{}

type unaryEncodingHandler struct {
	h EncodingHandler
}

// Handle implements yarpc.UnaryEncodingHandler.
func (e unaryEncodingHandler) Handle(ctx context.Context, reqBody interface{}) (interface{}, error) {
	reqValue, ok := reqBody.(wire.Value)
	if !ok {
		return nil, yarpcerror.InternalErrorf("tried to handle a non-wire.Value in thrift handler")
	}

	thriftRes, err := e.h(ctx, reqValue)
	if err != nil {
		return nil, err
	}

	if resType := thriftRes.Body.EnvelopeType(); resType != wire.Reply {
		return nil, errUnexpectedEnvelopeType(resType)
	}

	resValue, err := thriftRes.Body.ToWire()
	if err != nil {
		return nil, err
	}

	return resValue, thriftRes.Exception
}

update the var `thriftRes` to `enveloper`, 'body`, etc