fix(cosmos): properly fail when querying missing egress/mailbox

Agoric · Aug 18, 2021 · 0c1be92 · 0c1be92
1 parent ae092a4
commit 0c1be92
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/golang/cosmos/x/swingset/keeper/grpc_query.go b/golang/cosmos/x/swingset/keeper/grpc_query.go
@@ -51,6 +51,9 @@ func (k Querier) Egress(c context.Context, req *types.QueryEgressRequest) (*type
 	ctx := sdk.UnwrapSDKContext(c)
 
 	egress := k.GetEgress(ctx, req.Peer)
+	if egress.Peer == nil {
+		return nil, status.Error(codes.NotFound, "egress not found")
+	}
 
 	return &egress, nil
 }
@@ -62,6 +65,9 @@ func (k Querier) Mailbox(c context.Context, req *types.QueryMailboxRequest) (*ty
 	ctx := sdk.UnwrapSDKContext(c)
 
 	mb := k.GetMailbox(ctx, req.Peer.String())
+	if mb.Value == "" {
+		return nil, status.Error(codes.NotFound, "mailbox not found")
+	}
 
 	return &types.QueryStorageResponse{
 		Value: mb.Value,