@agoric/cosmos 0.34.2-dev-ecf2d8e.0 → 0.35.0-other-dev-70beeb7.0

package/x/vstorage/types/query.pb.gw.go

@@ -87,78 +87,6 @@ func local_request_Query_Data_0(ctx context.Context, marshaler runtime.Marshaler
 
 }
 
-var (
-	filter_Query_CapData_0 = &utilities.DoubleArray{Encoding: map[string]int{"path": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
-)
-
-func request_Query_CapData_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq QueryCapDataRequest
-	var metadata runtime.ServerMetadata
-
-	var (
-		val string
-		ok  bool
-		err error
-		_   = err
-	)
-
-	val, ok = pathParams["path"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "path")
-	}
-
-	protoReq.Path, err = runtime.String(val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "path", err)
-	}
-
-	if err := req.ParseForm(); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_CapData_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := client.CapData(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-	return msg, metadata, err
-
-}
-
-func local_request_Query_CapData_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq QueryCapDataRequest
-	var metadata runtime.ServerMetadata
-
-	var (
-		val string
-		ok  bool
-		err error
-		_   = err
-	)
-
-	val, ok = pathParams["path"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "path")
-	}
-
-	protoReq.Path, err = runtime.String(val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "path", err)
-	}
-
-	if err := req.ParseForm(); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_CapData_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := server.CapData(ctx, &protoReq)
-	return msg, metadata, err
-
-}
-
 var (
 	filter_Query_Children_0 = &utilities.DoubleArray{Encoding: map[string]int{"path": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
 )
@@ -260,29 +188,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 
 	})
 
-	mux.Handle("GET", pattern_Query_CapData_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		var stream runtime.ServerTransportStream
-		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := local_request_Query_CapData_0(rctx, inboundMarshaler, server, req, pathParams)
-		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
-		ctx = runtime.NewServerMetadataContext(ctx, md)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_Query_CapData_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
 	mux.Handle("GET", pattern_Query_Children_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -367,26 +272,6 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 
 	})
 
-	mux.Handle("GET", pattern_Query_CapData_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := request_Query_CapData_0(rctx, inboundMarshaler, client, req, pathParams)
-		ctx = runtime.NewServerMetadataContext(ctx, md)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_Query_CapData_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
 	mux.Handle("GET", pattern_Query_Children_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -413,15 +298,11 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 var (
 	pattern_Query_Data_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"agoric", "vstorage", "data", "path"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_CapData_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"agoric", "vstorage", "capdata", "path"}, "", runtime.AssumeColonVerbOpt(false)))
-
 	pattern_Query_Children_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"agoric", "vstorage", "children", "path"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (
 	forward_Query_Data_0 = runtime.ForwardResponseMessage
 
-	forward_Query_CapData_0 = runtime.ForwardResponseMessage
-
 	forward_Query_Children_0 = runtime.ForwardResponseMessage
 )

package/x/vstorage/vstorage.go

@@ -1,7 +1,6 @@
 package vstorage
 
 import (
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -9,6 +8,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
+	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 )
 
 type vstorageHandler struct {
@@ -41,8 +41,7 @@ func unmarshalSinglePathFromArgs(args []json.RawMessage, path *string) error {
 	return json.Unmarshal(args[0], path)
 }
 
-func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string, err error) {
-	ctx := sdk.UnwrapSDKContext(cctx)
+func (sh vstorageHandler) Receive(cctx *vm.ControllerContext, str string) (ret string, err error) {
 	keeper := sh.keeper
 	msg := new(vstorageMessage)
 	err = json.Unmarshal([]byte(str), &msg)
@@ -57,7 +56,7 @@ func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string,
 			case sdk.ErrorOutOfGas:
 				err = fmt.Errorf(
 					"out of gas in location: %v; gasUsed: %d",
-					rType.Descriptor, ctx.GasMeter().GasConsumed(),
+					rType.Descriptor, cctx.Context.GasMeter().GasConsumed(),
 				)
 			default:
 				// Not ErrorOutOfGas, so panic again.
@@ -75,7 +74,7 @@ func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string,
 			if err != nil {
 				return
 			}
-			keeper.SetStorageAndNotify(ctx, entry)
+			keeper.SetStorageAndNotify(cctx.Context, entry)
 		}
 		return "true", nil
 
@@ -90,7 +89,7 @@ func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string,
 				return
 			}
 			//fmt.Printf("giving Keeper.SetStorage(%s) %s\n", entry.Path(), entry.Value())
-			keeper.LegacySetStorageAndNotify(ctx, entry)
+			keeper.LegacySetStorageAndNotify(cctx.Context, entry)
 		}
 		return "true", nil
 
@@ -101,7 +100,7 @@ func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string,
 			if err != nil {
 				return
 			}
-			keeper.SetStorage(ctx, entry)
+			keeper.SetStorage(cctx.Context, entry)
 		}
 		return "true", nil
 
@@ -116,7 +115,7 @@ func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string,
 				err = fmt.Errorf("no value for append entry with path: %q", entry.Key())
 				return
 			}
-			err = keeper.AppendStorageValueAndNotify(ctx, entry.Key(), entry.StringValue())
+			err = keeper.AppendStorageValueAndNotify(cctx.Context, entry.Key(), entry.StringValue())
 			if err != nil {
 				return
 			}
@@ -131,7 +130,7 @@ func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string,
 			return
 		}
 
-		entry := keeper.GetEntry(ctx, path)
+		entry := keeper.GetEntry(cctx.Context, path)
 		bz, err := json.Marshal(entry.Value())
 		if err != nil {
 			return "", err
@@ -162,7 +161,7 @@ func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string,
 		if err != nil {
 			return
 		}
-		value := keeper.HasStorage(ctx, path)
+		value := keeper.HasStorage(cctx.Context, path)
 		if !value {
 			return "false", nil
 		}
@@ -175,7 +174,7 @@ func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string,
 		if err != nil {
 			return
 		}
-		children := keeper.GetChildren(ctx, path)
+		children := keeper.GetChildren(cctx.Context, path)
 		if children.Children == nil {
 			return "[]", nil
 		}
@@ -191,10 +190,10 @@ func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string,
 		if err != nil {
 			return
 		}
-		children := keeper.GetChildren(ctx, path)
+		children := keeper.GetChildren(cctx.Context, path)
 		entries := make([]agoric.KVEntry, len(children.Children))
 		for i, child := range children.Children {
-			entry := keeper.GetEntry(ctx, fmt.Sprintf("%s.%s", path, child))
+			entry := keeper.GetEntry(cctx.Context, fmt.Sprintf("%s.%s", path, child))
 			if !entry.HasValue() {
 				entries[i] = agoric.NewKVEntryWithNoValue(child)
 			} else {
@@ -213,10 +212,10 @@ func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string,
 		if err != nil {
 			return
 		}
-		children := keeper.GetChildren(ctx, path)
+		children := keeper.GetChildren(cctx.Context, path)
 		vals := make([]*string, len(children.Children))
 		for i, child := range children.Children {
-			vals[i] = keeper.GetEntry(ctx, fmt.Sprintf("%s.%s", path, child)).Value()
+			vals[i] = keeper.GetEntry(cctx.Context, fmt.Sprintf("%s.%s", path, child)).Value()
 		}
 		bytes, err := json.Marshal(vals)
 		if err != nil {
@@ -230,7 +229,7 @@ func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string,
 		if err != nil {
 			return
 		}
-		children := keeper.GetChildren(ctx, path)
+		children := keeper.GetChildren(cctx.Context, path)
 		if children.Children == nil {
 			return "0", nil
 		}

package/x/vstorage/vstorage_test.go

@@ -1,7 +1,6 @@
 package vstorage
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"reflect"
@@ -15,6 +14,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	agorictypes "github.com/Agoric/agoric-sdk/golang/cosmos/types"
+	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/tendermint/tendermint/libs/log"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	dbm "github.com/tendermint/tm-db"
@@ -32,7 +32,7 @@ type testKit struct {
 	keeper  Keeper
 	handler vstorageHandler
 	ctx     sdk.Context
-	cctx    context.Context
+	cctx    *vm.ControllerContext
 }
 
 func makeTestKit() testKit {
@@ -45,14 +45,14 @@ func makeTestKit() testKit {
 		panic(err)
 	}
 	ctx := sdk.NewContext(ms, tmproto.Header{}, false, log.NewNopLogger())
-	cctx := sdk.WrapSDKContext(ctx)
+	cctx := &vm.ControllerContext{Context: ctx}
 	handler := vstorageHandler{keeper}
 	return testKit{keeper, handler, ctx, cctx}
 }
 
 func callReceive(
 	handler vstorageHandler,
-	cctx context.Context,
+	cctx *vm.ControllerContext,
 	method string,
 	args []interface{},
 ) (string, error) {

package/cmd/agd/agvm.go

@@ -1,42 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-
-	"github.com/tendermint/tendermint/libs/log"
-)
-
-// NewVMCommand creates a new OS command to run the Agoric VM.  It sets up the
-// file descriptors for the VM to communicate with agd, and passes their numbers
-// via AGVM_FROM_AGD and AGVM_TO_AGD environment variables.
-func NewVMCommand(logger log.Logger, binary string, args []string, vmFromAgd, vmToAgd *os.File) *exec.Cmd {
-	logger.Info("agd connecting to VM", "binary", binary, "args", args)
-	cmd := exec.Command(binary, args[1:]...)
-
-	// Manage the file descriptors.
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	cmd.Stdin = os.Stdin
-	numStdFiles := 3 // stdin, stdout, stderr
-
-	// We start our file descriptor allocations after the standard ones, including
-	// Node.js IPC (fd=3).
-	fdFromAgd := 4
-	fdToAgd := fdFromAgd + 1
-
-	// ExtraFiles begins at fd numStdFiles, so we need to compute the array.
-	cmd.ExtraFiles = make([]*os.File, fdToAgd - numStdFiles + 1)
-	cmd.ExtraFiles[fdFromAgd - numStdFiles] = vmFromAgd
-	cmd.ExtraFiles[fdToAgd - numStdFiles] = vmToAgd
-
-	// Pass the file descriptor numbers in the environment.
-	cmd.Env = append(
-		os.Environ(),
-		fmt.Sprintf("AGVM_FROM_AGD=%d", fdFromAgd),
-		fmt.Sprintf("AGVM_TO_AGD=%d", fdToAgd),
-	)
-
-	return cmd
-}

package/vm/client.go

@@ -1,113 +0,0 @@
-package vm
-
-import (
-	"context"
-	"fmt"
-	"net/rpc"
-)
-
-// ReceiveMessageMethod is the name of the method we call in order to have the
-// VM receive a Message.
-const ReceiveMessageMethod = "agvm.ReceiveMessage"
-
-// Message is what we send to the VM.
-type Message struct {
-	Port int
-	Data string
-	NeedsReply bool
-}
-
-// ClientCodec implements rpc.ClientCodec.
-var _ rpc.ClientCodec = (*ClientCodec)(nil)
-
-// ClientCodec implements a net/rpc ClientCodec for the "bridge" between the Go
-// runtime and the VM in the single-process dual-runtime configuration.
-//
-// We expect to call it via the legacy API with signature:
-//    sendToController func(needsReply bool, msg string) (string, error)
-// where msg and the returned string are JSON-encoded values.
-//
-// Note that the net/rpc framework cannot express a call that does not expect a
-// response, so we'll note such calls by sending with a reply port of 0 and
-// having the WriteRequest() method fabricate a Receive() call to clear the rpc
-// state.
-type ClientCodec struct {
-	ctx context.Context
-	send func(port, rPort int, msg string)
-	outbound map[int]rpc.Request
-	inbound chan *rpc.Response
-	replies map[uint64]string
-	replyToRead uint64
-}
-
-// NewClientCodec creates a new ClientCodec.
-func NewClientCodec(ctx context.Context, send func(int, int, string)) *ClientCodec {
-	return &ClientCodec{
-		ctx: ctx,
-		send: send,
-		outbound: make(map[int]rpc.Request),
-		inbound: make(chan *rpc.Response),
-		replies: make(map[uint64]string),
-	}
-}
-
-// WriteRequest sends a request to the VM.
-func (cc *ClientCodec) WriteRequest(r *rpc.Request, body interface{}) error {
-	if r.ServiceMethod != ReceiveMessageMethod {
-		return fmt.Errorf("unknown method %s", r.ServiceMethod)
-	}
-
-	msg, ok := body.(Message)
-	if !ok {
-		return fmt.Errorf("body %T is not a Message", body)
-	}
-	rPort := int(r.Seq + 1) // rPort is 1-indexed to indicate it's required
-	cc.outbound[rPort] = *r
-	var senderReplyPort int
-	if msg.NeedsReply {
-		senderReplyPort = rPort
-	}
-	cc.send(msg.Port, senderReplyPort, msg.Data)
-	if !msg.NeedsReply {
-		return cc.Receive(rPort, false, "<no-reply-requested>")
-	}
-	return nil
-}
-
-// ReadResponseHeader decodes a response header from the VM.
-func (cc *ClientCodec) ReadResponseHeader(r *rpc.Response) error {
-	resp := <-cc.inbound
-	*r = *resp
-	cc.replyToRead = r.Seq
-	return nil
-}
-
-// ReadResponseBody decodes a response body (currently just string) from the VM.
-func (cc *ClientCodec) ReadResponseBody(body interface{}) error {
-	if body != nil {
-		*body.(*string) = cc.replies[cc.replyToRead]
-	}
-	delete(cc.replies, cc.replyToRead)
-	return nil
-}
-
-// Receive is called by the VM to send a response to the client.
-func (cc *ClientCodec) Receive(rPort int, isError bool, data string) error {
-	outb := cc.outbound[rPort]
-	delete(cc.outbound, rPort)
-	resp := &rpc.Response{
-		ServiceMethod: outb.ServiceMethod,
-		Seq: outb.Seq,
-	}
-	if isError {
-		resp.Error = data
-	} else {
-		cc.replies[resp.Seq] = data
-	}
-	cc.inbound <- resp
-	return nil
-}
-
-func (cc *ClientCodec) Close() error {
-	return nil
-}

package/vm/client_test.go

@@ -1,184 +0,0 @@
-package vm_test
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/rpc"
-	"testing"
-	"time"
-
-	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
-)
-
-type Sender func(ctx context.Context, needReply bool, str string) (string, error)
-
-type errorWrapper struct {
-	Error string `json:"error"`
-}
-
-// ConnectVMClientCodec creates an RPC client codec and a sender to the
-// in-process implementation of the VM.
-func ConnectVMClientCodec(ctx context.Context, nodePort int, sendFunc func(int, int, string)) (*vm.ClientCodec, Sender) {
-	vmClientCodec := vm.NewClientCodec(context.Background(), sendFunc)
-	vmClient := rpc.NewClientWithCodec(vmClientCodec)
-
-	sendToNode := func(ctx context.Context, needReply bool, str string) (string, error) {
-		if str == "shutdown" {
-			return "", vmClientCodec.Close()
-		}
-
-		msg := vm.Message{
-			Port: nodePort,
-			NeedsReply: needReply,
-			Data: str,
-		}
-		var reply string
-		err := vmClient.Call(vm.ReceiveMessageMethod, msg, &reply)
-		return reply, err
-	}
-
-	return vmClientCodec, sendToNode
-}
-
-type Fixture struct {
-	SendToNode Sender
-	SendToGo func (port int, msgStr string) string
-	ReplyToGo func (replyPort int, isError bool, respStr string) int
-}
-
-func NewFixture(t *testing.T) (*Fixture) {
-	nodePort := 42
-
-	f := &Fixture{}
-
-	sendFunc := func(port int, reply int, str string) {
-		switch str {
-			case "ping":
-				time.AfterFunc(100*time.Millisecond, func() {
-					fmt.Printf("sendFunc: port=%d, reply=%d, str=%s\n", port, reply, str)
-					if reply != 0 {
-						f.ReplyToGo(reply, false, "pong")
-					}
-				})
-			case "wait":
-				time.AfterFunc(300*time.Millisecond, func() {
-					fmt.Printf("sendFunc: port=%d, reply=%d, str=%s\n", port, reply, str)
-					if reply != 0 {
-						f.ReplyToGo(reply, false, "done-waiting")
-					}
-				})
-			default:
-				t.Errorf("Unexpected message %s", str)
-		}
-	}
-
-	vmClientCodec, sendToNode := ConnectVMClientCodec(
-		context.Background(),
-		int(nodePort),
-		sendFunc,
-	)
-	agdServer := vm.NewAgdServer()
-
-	f.SendToNode = sendToNode
-	f.SendToGo = func (port int, msgStr string) string {
-		fmt.Println("Send to Go", msgStr)
-		var respStr string
-		message := &vm.Message{
-			Port: int(port),
-			NeedsReply: true,
-			Data: msgStr,
-		}
-		
-		err := agdServer.ReceiveMessage(message, &respStr)
-		if err == nil {
-			return respStr
-		}
-	
-		// fmt.Fprintln(os.Stderr, "Cannot receive from controller", err)
-		errResp := errorWrapper{
-			Error: err.Error(),
-		}
-		respBytes, err := json.Marshal(&errResp)
-		if err != nil {
-			panic(err)
-		}
-		return string(respBytes)
-	}
-
-	f.ReplyToGo = func (replyPort int, isError bool, respStr string) int {
-		if err := vmClientCodec.Receive(replyPort, isError, respStr); err != nil {
-			return 1
-		}
-		return 0
-	}
-
-	return f
-}
-
-func TestClient_oneOutbound(t *testing.T) {
-	f := NewFixture(t)
-
-	// Try one blocking call.
-	ret, err := f.SendToNode(context.Background(), true, "ping")
-	if err != nil {
-		t.Error(err)
-	}
-	if ret != "pong" {
-		t.Errorf("ping want pong, got %s", ret)
-	}
-}
-
-func TestClient_ShortBg(t *testing.T) {
-
-	f := NewFixture(t)
-
-	// Try a short background call with a long overlapping call.
-	done := make(chan struct{})
-	go func() {
-		defer close(done)
-		ret, err := f.SendToNode(context.Background(), true, "ping")
-		if err != nil {
-			t.Error(err)
-		}
-		if ret != "pong" {
-			t.Errorf("ping want pong, got %s", ret)
-		}
-	}()
-
-	ret, err := f.SendToNode(context.Background(), true, "wait")
-	if err != nil {
-		t.Error(err)
-	}
-	if ret != "done-waiting" {
-		t.Errorf("wait want done-waiting, got %s", ret)
-	}
-	<-done
-}
-
-func TestClient_LongBg(t *testing.T) {
-
-	f := NewFixture(t)
-
-	// Try a long background call with a short overlapping call.
-	done := make(chan struct{})
-	go func() {
-		defer close(done)
-		ret, err := f.SendToNode(context.Background(), true, "wait")
-		if err != nil {
-			t.Error(err)
-		}
-		if ret != "done-waiting" {
-			t.Errorf("ping want done-waiting, got %s", ret)
-		}
-	}()
-
-	ret, err := f.SendToNode(context.Background(), true, "ping")
-	if err != nil {
-		t.Error(err)
-	}
-	if ret != "pong" {
-		t.Errorf("wait want pong, got %s", ret)
-	}
-	<-done
-}