fix: srpc test and update deps

Signed-off-by: Christian Stewart <[email protected]>
aperturerobotics · Jan 23, 2024 · 008504f · 008504f
1 parent b149462
commit 008504f
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 19 deletions.
diff --git a/daemon/api/api.pb.ts b/daemon/api/api.pb.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
-import { Config as Config1 } from '@go/github.com/aperturerobotics/controllerbus/bus/api/api.pb.js'
 import Long from 'long'
 import _m0 from 'protobufjs/minimal.js'
+import { Config as Config1 } from '../../../controllerbus/bus/api/api.pb.js'
 
 export const protobufPackage = 'bifrost.api'
 

diff --git a/daemon/api/controller/controller.pb.ts b/daemon/api/controller/controller.pb.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
-import { Config as Config2 } from '@go/github.com/aperturerobotics/controllerbus/bus/api/api.pb.js'
 import Long from 'long'
 import _m0 from 'protobufjs/minimal.js'
+import { Config as Config2 } from '../../../../controllerbus/bus/api/api.pb.js'
 import { Config as Config1 } from '../api.pb.js'
 
 export const protobufPackage = 'bifrost.api.controller'

diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "patch-package": "^8.0.0",
     "prettier": "^3.1.1",
     "ts-poet": "6.6.0",
-    "ts-proto": "^1.166.1",
+    "ts-proto": "^1.167.0",
     "typescript": "^5.1.6"
   },
   "dependencies": {

diff --git a/peer/api/api.pb.ts b/peer/api/api.pb.ts
@@ -1,11 +1,11 @@
 /* eslint-disable */
+import Long from 'long'
+import _m0 from 'protobufjs/minimal.js'
 import {
   ControllerStatus,
   controllerStatusFromJSON,
   controllerStatusToJSON,
-} from '@go/github.com/aperturerobotics/controllerbus/controller/exec/exec.pb.js'
-import Long from 'long'
-import _m0 from 'protobufjs/minimal.js'
+} from '../../../controllerbus/controller/exec/exec.pb.js'
 import { Config } from '../controller/config.pb.js'
 
 export const protobufPackage = 'peer.api'

diff --git a/pubsub/util/pubmessage/pubmessage.pb.ts b/pubsub/util/pubmessage/pubmessage.pb.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
-import { Timestamp } from '@aperturerobotics/ts-proto-common-types/google/protobuf/timestamp.pb.js'
 import Long from 'long'
 import _m0 from 'protobufjs/minimal.js'
+import { Timestamp } from '../../../../../../google/protobuf/timestamp.pb.js'
 
 export const protobufPackage = 'pubmessage'
 

diff --git a/rpc/access/access.pb.ts b/rpc/access/access.pb.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
-import { RpcStreamPacket } from '@go/github.com/aperturerobotics/starpc/rpcstream/rpcstream.pb.js'
 import Long from 'long'
 import _m0 from 'protobufjs/minimal.js'
+import { RpcStreamPacket } from '../../../starpc/rpcstream/rpcstream.pb.js'
 
 export const protobufPackage = 'bifrost.rpc.access'
 

diff --git a/stream/api/api.pb.ts b/stream/api/api.pb.ts
@@ -1,11 +1,11 @@
 /* eslint-disable */
+import Long from 'long'
+import _m0 from 'protobufjs/minimal.js'
 import {
   ControllerStatus,
   controllerStatusFromJSON,
   controllerStatusToJSON,
-} from '@go/github.com/aperturerobotics/controllerbus/controller/exec/exec.pb.js'
-import Long from 'long'
-import _m0 from 'protobufjs/minimal.js'
+} from '../../../controllerbus/controller/exec/exec.pb.js'
 import { Config } from '../forwarding/forwarding.pb.js'
 import { Config as Config1 } from '../listening/listening.pb.js'
 import { Config as Config2 } from './accept/accept.pb.js'

diff --git a/stream/drpc/client/client.pb.ts b/stream/drpc/client/client.pb.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
-import { Backoff } from '@go/github.com/aperturerobotics/util/backoff/backoff.pb.js'
 import Long from 'long'
 import _m0 from 'protobufjs/minimal.js'
+import { Backoff } from '../../../../util/backoff/backoff.pb.js'
 import { DrpcOpts } from '../drpc.pb.js'
 
 export const protobufPackage = 'stream.drpc.client'

diff --git a/stream/srpc/client/client.pb.ts b/stream/srpc/client/client.pb.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
-import { Backoff } from '@go/github.com/aperturerobotics/util/backoff/backoff.pb.js'
 import Long from 'long'
 import _m0 from 'protobufjs/minimal.js'
+import { Backoff } from '../../../../util/backoff/backoff.pb.js'
 
 export const protobufPackage = 'stream.srpc.client'
 

diff --git a/stream/srpc/e2e/e2e_test.go b/stream/srpc/e2e/e2e_test.go
@@ -87,9 +87,10 @@ func TestStarpc(t *testing.T) {
 			semver.MustParse("0.0.1"),
 			"test of srpc server",
 		),
+		[]stream_srpc_server.RegisterFn{mockServer.Register},
 		[]protocol.ID{ProtocolID},
 		[]string{tb2PeerID.String()},
-		[]stream_srpc_server.RegisterFn{mockServer.Register},
+		false,
 	)
 	if err != nil {
 		t.Fatal(err.Error())

diff --git a/transport/common/dialer/dialer.pb.ts b/transport/common/dialer/dialer.pb.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
-import { Backoff } from '@go/github.com/aperturerobotics/util/backoff/backoff.pb.js'
 import Long from 'long'
 import _m0 from 'protobufjs/minimal.js'
+import { Backoff } from '../../../../util/backoff/backoff.pb.js'
 
 export const protobufPackage = 'dialer'
 

diff --git a/yarn.lock b/yarn.lock
@@ -2072,10 +2072,10 @@ [email protected]:
     long "^5.2.3"
     protobufjs "^7.2.4"
 
-ts-proto@^1.166.1:
-  version "1.166.4"
-  resolved "https://registry.yarnpkg.com/ts-proto/-/ts-proto-1.166.4.tgz#7ecc4e6f27ee726af62526251055ba519f9d8c0c"
-  integrity sha512-TGHYGRg8Q8NHXagdiWrRAbuV59sp4EXcWH7bTuhGook2Sc8qM2T/s66usQCb1YekzOLHJDs7p66svjlqHmOMhg==
+ts-proto@^1.167.0:
+  version "1.167.0"
+  resolved "https://registry.yarnpkg.com/ts-proto/-/ts-proto-1.167.0.tgz#3da5f1cbcdda3a1e339b266b02be40131b278a90"
+  integrity sha512-ATJ9bN0JpPhtWVymKpkf7zUYOLBZVOA7rWRRH/U+ML8A2xjcBgcM3H4Mme8T8Yn6S4rW6ttNjRAtLZmusAjIIA==
   dependencies:
     case-anything "^2.1.13"
     protobufjs "^7.2.4"