From f774953011cb3ad85914bc9f5f66aa121f00528d Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Wed, 3 Oct 2018 21:12:23 -0400
Subject: Rename flatbuffer base.msg to base.inner

This better disambiguates with the msg_generated.ts module, which in JS
we call "fbs", but would be better called "msg".
---
 js/dispatch.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'js/dispatch.ts')

diff --git a/js/dispatch.ts b/js/dispatch.ts
index 56d280ff9..3f5d1453a 100644
--- a/js/dispatch.ts
+++ b/js/dispatch.ts
@@ -39,12 +39,12 @@ export function handleAsyncMsgFromRust(ui8: Uint8Array) {
 // @internal
 export function sendAsync(
   builder: flatbuffers.Builder,
-  msgType: fbs.Any,
-  msg: flatbuffers.Offset,
+  innerType: fbs.Any,
+  inner: flatbuffers.Offset,
   data?: ArrayBufferView
 ): Promise<fbs.Base> {
-  maybePushTrace(msgType, false); // add to trace if tracing
-  const [cmdId, resBuf] = sendInternal(builder, msgType, msg, data, false);
+  maybePushTrace(innerType, false); // add to trace if tracing
+  const [cmdId, resBuf] = sendInternal(builder, innerType, inner, data, false);
   util.assert(resBuf == null);
   const promise = util.createResolvable<fbs.Base>();
   promiseTable.set(cmdId, promise);
@@ -54,12 +54,12 @@ export function sendAsync(
 // @internal
 export function sendSync(
   builder: flatbuffers.Builder,
-  msgType: fbs.Any,
-  msg: flatbuffers.Offset,
+  innerType: fbs.Any,
+  inner: flatbuffers.Offset,
   data?: ArrayBufferView
 ): null | fbs.Base {
-  maybePushTrace(msgType, true); // add to trace if tracing
-  const [cmdId, resBuf] = sendInternal(builder, msgType, msg, data, true);
+  maybePushTrace(innerType, true); // add to trace if tracing
+  const [cmdId, resBuf] = sendInternal(builder, innerType, inner, data, true);
   util.assert(cmdId >= 0);
   if (resBuf == null) {
     return null;
@@ -74,15 +74,15 @@ export function sendSync(
 
 function sendInternal(
   builder: flatbuffers.Builder,
-  msgType: fbs.Any,
-  msg: flatbuffers.Offset,
+  innerType: fbs.Any,
+  inner: flatbuffers.Offset,
   data: undefined | ArrayBufferView,
   sync = true
 ): [number, null | Uint8Array] {
   const cmdId = nextCmdId++;
   fbs.Base.startBase(builder);
-  fbs.Base.addMsg(builder, msg);
-  fbs.Base.addMsgType(builder, msgType);
+  fbs.Base.addInner(builder, inner);
+  fbs.Base.addInnerType(builder, innerType);
   fbs.Base.addSync(builder, sync);
   fbs.Base.addCmdId(builder, cmdId);
   builder.finish(fbs.Base.endBase(builder));
-- 
cgit v1.2.3