diff --git a/MANIFEST.in b/MANIFEST.in index 133092b36..5a409c9cc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,3 +5,4 @@ recursive-include autobahn/wamp/gen/schema * recursive-include autobahn/asset * recursive-include autobahn/xbr/templates * recursive-include autobahn/xbr/test/catalog/schema * +recursive-include autobahn/xbr/test/profile * diff --git a/autobahn/_version.py b/autobahn/_version.py index 1aa3ae87f..7022cb51f 100644 --- a/autobahn/_version.py +++ b/autobahn/_version.py @@ -24,6 +24,6 @@ # ############################################################################### -__version__ = '22.6.1.dev1' +__version__ = '22.6.1.dev2' __build__ = '00000000-0000000' diff --git a/autobahn/wamp/cryptosign.py b/autobahn/wamp/cryptosign.py index f9ecc3e26..8ab579951 100644 --- a/autobahn/wamp/cryptosign.py +++ b/autobahn/wamp/cryptosign.py @@ -518,7 +518,7 @@ def sign_challenge(self, session: ISession, challenge: Challenge, 'unexpected cryptosign challenge with method "{}"'.format(challenge.method) # get the TLS channel ID of the underlying TLS connection - if channel_id_type in session._transport.transport_details.channel_id: + if channel_id_type and channel_id_type in session._transport.transport_details.channel_id: channel_id = session._transport.transport_details.channel_id.get(channel_id_type, None) else: channel_id_type = None diff --git a/autobahn/wamp/gen/schema/auth.bfbs b/autobahn/wamp/gen/schema/auth.bfbs index 7743150a6..e8fd3d2ff 100644 Binary files a/autobahn/wamp/gen/schema/auth.bfbs and b/autobahn/wamp/gen/schema/auth.bfbs differ diff --git a/autobahn/wamp/gen/schema/pubsub.bfbs b/autobahn/wamp/gen/schema/pubsub.bfbs index 693ef0d89..0dcc375af 100644 Binary files a/autobahn/wamp/gen/schema/pubsub.bfbs and b/autobahn/wamp/gen/schema/pubsub.bfbs differ diff --git a/autobahn/wamp/gen/schema/roles.bfbs b/autobahn/wamp/gen/schema/roles.bfbs index 46d056377..cd6a28c43 100644 Binary files a/autobahn/wamp/gen/schema/roles.bfbs and b/autobahn/wamp/gen/schema/roles.bfbs differ diff --git a/autobahn/wamp/gen/schema/rpc.bfbs b/autobahn/wamp/gen/schema/rpc.bfbs index 1318c0f56..4c82f5f57 100644 Binary files a/autobahn/wamp/gen/schema/rpc.bfbs and b/autobahn/wamp/gen/schema/rpc.bfbs differ diff --git a/autobahn/wamp/gen/schema/session.bfbs b/autobahn/wamp/gen/schema/session.bfbs index 14b8420cf..3758e1f44 100644 Binary files a/autobahn/wamp/gen/schema/session.bfbs and b/autobahn/wamp/gen/schema/session.bfbs differ diff --git a/autobahn/wamp/gen/schema/types.bfbs b/autobahn/wamp/gen/schema/types.bfbs index 2c9b781fd..f3dd9c223 100644 Binary files a/autobahn/wamp/gen/schema/types.bfbs and b/autobahn/wamp/gen/schema/types.bfbs differ diff --git a/autobahn/wamp/gen/schema/wamp.bfbs b/autobahn/wamp/gen/schema/wamp.bfbs index 21b76a300..a46b1df2b 100644 Binary files a/autobahn/wamp/gen/schema/wamp.bfbs and b/autobahn/wamp/gen/schema/wamp.bfbs differ diff --git a/autobahn/wamp/gen/wamp/Map.py b/autobahn/wamp/gen/wamp/Map.py index 635301b20..ba91019cb 100644 --- a/autobahn/wamp/gen/wamp/Map.py +++ b/autobahn/wamp/gen/wamp/Map.py @@ -38,19 +38,15 @@ def Value(self): return self._tab.String(o + self._tab.Pos) return None -def Start(builder): builder.StartObject(2) -def MapStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddKey(builder, key): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(key), 0) -def MapAddKey(builder, key): - """This method is deprecated. Please switch to AddKey.""" - return AddKey(builder, key) -def AddValue(builder, value): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(value), 0) -def MapAddValue(builder, value): - """This method is deprecated. Please switch to AddValue.""" - return AddValue(builder, value) -def End(builder): return builder.EndObject() -def MapEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def MapStart(builder): builder.StartObject(2) +def Start(builder): + return MapStart(builder) +def MapAddKey(builder, key): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(key), 0) +def AddKey(builder, key): + return MapAddKey(builder, key) +def MapAddValue(builder, value): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(value), 0) +def AddValue(builder, value): + return MapAddValue(builder, value) +def MapEnd(builder): return builder.EndObject() +def End(builder): + return MapEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/Void.py b/autobahn/wamp/gen/wamp/Void.py index b79b5924f..a09dce62e 100644 --- a/autobahn/wamp/gen/wamp/Void.py +++ b/autobahn/wamp/gen/wamp/Void.py @@ -24,11 +24,9 @@ def GetRootAsVoid(cls, buf, offset=0): def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) -def Start(builder): builder.StartObject(0) -def VoidStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def End(builder): return builder.EndObject() -def VoidEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def VoidStart(builder): builder.StartObject(0) +def Start(builder): + return VoidStart(builder) +def VoidEnd(builder): return builder.EndObject() +def End(builder): + return VoidEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Abort.py b/autobahn/wamp/gen/wamp/proto/Abort.py index 51e7282d8..264735194 100644 --- a/autobahn/wamp/gen/wamp/proto/Abort.py +++ b/autobahn/wamp/gen/wamp/proto/Abort.py @@ -38,19 +38,15 @@ def Message(self): return self._tab.String(o + self._tab.Pos) return None -def Start(builder): builder.StartObject(2) -def AbortStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddReason(builder, reason): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(reason), 0) -def AbortAddReason(builder, reason): - """This method is deprecated. Please switch to AddReason.""" - return AddReason(builder, reason) -def AddMessage(builder, message): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(message), 0) -def AbortAddMessage(builder, message): - """This method is deprecated. Please switch to AddMessage.""" - return AddMessage(builder, message) -def End(builder): return builder.EndObject() -def AbortEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AbortStart(builder): builder.StartObject(2) +def Start(builder): + return AbortStart(builder) +def AbortAddReason(builder, reason): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(reason), 0) +def AddReason(builder, reason): + return AbortAddReason(builder, reason) +def AbortAddMessage(builder, message): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(message), 0) +def AddMessage(builder, message): + return AbortAddMessage(builder, message) +def AbortEnd(builder): return builder.EndObject() +def End(builder): + return AbortEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/AnyMessage.py b/autobahn/wamp/gen/wamp/proto/AnyMessage.py index a4a9138fa..6e21c57e0 100644 --- a/autobahn/wamp/gen/wamp/proto/AnyMessage.py +++ b/autobahn/wamp/gen/wamp/proto/AnyMessage.py @@ -30,4 +30,3 @@ class AnyMessage(object): Invocation = 24 Interrupt = 25 Yield = 26 - diff --git a/autobahn/wamp/gen/wamp/proto/AuthCraChallenge.py b/autobahn/wamp/gen/wamp/proto/AuthCraChallenge.py index 371729252..3addb12cb 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthCraChallenge.py +++ b/autobahn/wamp/gen/wamp/proto/AuthCraChallenge.py @@ -52,27 +52,21 @@ def Keylen(self): return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos) return 32 -def Start(builder): builder.StartObject(4) -def AuthCraChallengeStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddChallenge(builder, challenge): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(challenge), 0) -def AuthCraChallengeAddChallenge(builder, challenge): - """This method is deprecated. Please switch to AddChallenge.""" - return AddChallenge(builder, challenge) -def AddSalt(builder, salt): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(salt), 0) -def AuthCraChallengeAddSalt(builder, salt): - """This method is deprecated. Please switch to AddSalt.""" - return AddSalt(builder, salt) -def AddIterations(builder, iterations): builder.PrependUint32Slot(2, iterations, 1000) -def AuthCraChallengeAddIterations(builder, iterations): - """This method is deprecated. Please switch to AddIterations.""" - return AddIterations(builder, iterations) -def AddKeylen(builder, keylen): builder.PrependUint8Slot(3, keylen, 32) -def AuthCraChallengeAddKeylen(builder, keylen): - """This method is deprecated. Please switch to AddKeylen.""" - return AddKeylen(builder, keylen) -def End(builder): return builder.EndObject() -def AuthCraChallengeEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AuthCraChallengeStart(builder): builder.StartObject(4) +def Start(builder): + return AuthCraChallengeStart(builder) +def AuthCraChallengeAddChallenge(builder, challenge): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(challenge), 0) +def AddChallenge(builder, challenge): + return AuthCraChallengeAddChallenge(builder, challenge) +def AuthCraChallengeAddSalt(builder, salt): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(salt), 0) +def AddSalt(builder, salt): + return AuthCraChallengeAddSalt(builder, salt) +def AuthCraChallengeAddIterations(builder, iterations): builder.PrependUint32Slot(2, iterations, 1000) +def AddIterations(builder, iterations): + return AuthCraChallengeAddIterations(builder, iterations) +def AuthCraChallengeAddKeylen(builder, keylen): builder.PrependUint8Slot(3, keylen, 32) +def AddKeylen(builder, keylen): + return AuthCraChallengeAddKeylen(builder, keylen) +def AuthCraChallengeEnd(builder): return builder.EndObject() +def End(builder): + return AuthCraChallengeEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/AuthCraRequest.py b/autobahn/wamp/gen/wamp/proto/AuthCraRequest.py index 3e33a16c6..c45ca86ac 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthCraRequest.py +++ b/autobahn/wamp/gen/wamp/proto/AuthCraRequest.py @@ -24,11 +24,9 @@ def GetRootAsAuthCraRequest(cls, buf, offset=0): def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) -def Start(builder): builder.StartObject(0) -def AuthCraRequestStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def End(builder): return builder.EndObject() -def AuthCraRequestEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AuthCraRequestStart(builder): builder.StartObject(0) +def Start(builder): + return AuthCraRequestStart(builder) +def AuthCraRequestEnd(builder): return builder.EndObject() +def End(builder): + return AuthCraRequestEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/AuthCraWelcome.py b/autobahn/wamp/gen/wamp/proto/AuthCraWelcome.py index f1f405722..f6b7269fb 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthCraWelcome.py +++ b/autobahn/wamp/gen/wamp/proto/AuthCraWelcome.py @@ -24,11 +24,9 @@ def GetRootAsAuthCraWelcome(cls, buf, offset=0): def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) -def Start(builder): builder.StartObject(0) -def AuthCraWelcomeStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def End(builder): return builder.EndObject() -def AuthCraWelcomeEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AuthCraWelcomeStart(builder): builder.StartObject(0) +def Start(builder): + return AuthCraWelcomeStart(builder) +def AuthCraWelcomeEnd(builder): return builder.EndObject() +def End(builder): + return AuthCraWelcomeEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/AuthCryptosignChallenge.py b/autobahn/wamp/gen/wamp/proto/AuthCryptosignChallenge.py index 8dad18725..a1978fd73 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthCryptosignChallenge.py +++ b/autobahn/wamp/gen/wamp/proto/AuthCryptosignChallenge.py @@ -31,15 +31,12 @@ def ChannelBinding(self): return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos) return 0 -def Start(builder): builder.StartObject(1) -def AuthCryptosignChallengeStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(0, channelBinding, 0) -def AuthCryptosignChallengeAddChannelBinding(builder, channelBinding): - """This method is deprecated. Please switch to AddChannelBinding.""" - return AddChannelBinding(builder, channelBinding) -def End(builder): return builder.EndObject() -def AuthCryptosignChallengeEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AuthCryptosignChallengeStart(builder): builder.StartObject(1) +def Start(builder): + return AuthCryptosignChallengeStart(builder) +def AuthCryptosignChallengeAddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(0, channelBinding, 0) +def AddChannelBinding(builder, channelBinding): + return AuthCryptosignChallengeAddChannelBinding(builder, channelBinding) +def AuthCryptosignChallengeEnd(builder): return builder.EndObject() +def End(builder): + return AuthCryptosignChallengeEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/AuthCryptosignRequest.py b/autobahn/wamp/gen/wamp/proto/AuthCryptosignRequest.py index e20f0d3f7..0261763ee 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthCryptosignRequest.py +++ b/autobahn/wamp/gen/wamp/proto/AuthCryptosignRequest.py @@ -38,19 +38,15 @@ def ChannelBinding(self): return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos) return 0 -def Start(builder): builder.StartObject(2) -def AuthCryptosignRequestStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddPubkey(builder, pubkey): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(pubkey), 0) -def AuthCryptosignRequestAddPubkey(builder, pubkey): - """This method is deprecated. Please switch to AddPubkey.""" - return AddPubkey(builder, pubkey) -def AddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(1, channelBinding, 0) -def AuthCryptosignRequestAddChannelBinding(builder, channelBinding): - """This method is deprecated. Please switch to AddChannelBinding.""" - return AddChannelBinding(builder, channelBinding) -def End(builder): return builder.EndObject() -def AuthCryptosignRequestEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AuthCryptosignRequestStart(builder): builder.StartObject(2) +def Start(builder): + return AuthCryptosignRequestStart(builder) +def AuthCryptosignRequestAddPubkey(builder, pubkey): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(pubkey), 0) +def AddPubkey(builder, pubkey): + return AuthCryptosignRequestAddPubkey(builder, pubkey) +def AuthCryptosignRequestAddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(1, channelBinding, 0) +def AddChannelBinding(builder, channelBinding): + return AuthCryptosignRequestAddChannelBinding(builder, channelBinding) +def AuthCryptosignRequestEnd(builder): return builder.EndObject() +def End(builder): + return AuthCryptosignRequestEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/AuthCryptosignWelcome.py b/autobahn/wamp/gen/wamp/proto/AuthCryptosignWelcome.py index ccddcee7c..1e5a1b45d 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthCryptosignWelcome.py +++ b/autobahn/wamp/gen/wamp/proto/AuthCryptosignWelcome.py @@ -24,11 +24,9 @@ def GetRootAsAuthCryptosignWelcome(cls, buf, offset=0): def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) -def Start(builder): builder.StartObject(0) -def AuthCryptosignWelcomeStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def End(builder): return builder.EndObject() -def AuthCryptosignWelcomeEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AuthCryptosignWelcomeStart(builder): builder.StartObject(0) +def Start(builder): + return AuthCryptosignWelcomeStart(builder) +def AuthCryptosignWelcomeEnd(builder): return builder.EndObject() +def End(builder): + return AuthCryptosignWelcomeEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/AuthFactor.py b/autobahn/wamp/gen/wamp/proto/AuthFactor.py index b90df61ea..227ce6cd7 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthFactor.py +++ b/autobahn/wamp/gen/wamp/proto/AuthFactor.py @@ -8,4 +8,3 @@ class AuthFactor(object): AuthCraRequest = 2 AuthScramRequest = 3 AuthCryptosignRequest = 4 - diff --git a/autobahn/wamp/gen/wamp/proto/AuthMethod.py b/autobahn/wamp/gen/wamp/proto/AuthMethod.py index b7a6e23d3..9c14dc8c8 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthMethod.py +++ b/autobahn/wamp/gen/wamp/proto/AuthMethod.py @@ -10,4 +10,3 @@ class AuthMethod(object): CRA = 4 SCRAM = 5 CRYPTOSIGN = 6 - diff --git a/autobahn/wamp/gen/wamp/proto/AuthMode.py b/autobahn/wamp/gen/wamp/proto/AuthMode.py index 5515f8a2d..4eaa169df 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthMode.py +++ b/autobahn/wamp/gen/wamp/proto/AuthMode.py @@ -5,4 +5,3 @@ class AuthMode(object): FIRST = 0 MULTIFACTOR = 1 - diff --git a/autobahn/wamp/gen/wamp/proto/AuthScramChallenge.py b/autobahn/wamp/gen/wamp/proto/AuthScramChallenge.py index 502a3e6e5..7f2668976 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthScramChallenge.py +++ b/autobahn/wamp/gen/wamp/proto/AuthScramChallenge.py @@ -66,35 +66,27 @@ def ChannelBinding(self): return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos) return 0 -def Start(builder): builder.StartObject(6) -def AuthScramChallengeStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddNonce(builder, nonce): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(nonce), 0) -def AuthScramChallengeAddNonce(builder, nonce): - """This method is deprecated. Please switch to AddNonce.""" - return AddNonce(builder, nonce) -def AddSalt(builder, salt): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(salt), 0) -def AuthScramChallengeAddSalt(builder, salt): - """This method is deprecated. Please switch to AddSalt.""" - return AddSalt(builder, salt) -def AddKdf(builder, kdf): builder.PrependUint8Slot(2, kdf, 2) -def AuthScramChallengeAddKdf(builder, kdf): - """This method is deprecated. Please switch to AddKdf.""" - return AddKdf(builder, kdf) -def AddIterations(builder, iterations): builder.PrependUint32Slot(3, iterations, 0) -def AuthScramChallengeAddIterations(builder, iterations): - """This method is deprecated. Please switch to AddIterations.""" - return AddIterations(builder, iterations) -def AddMemory(builder, memory): builder.PrependUint32Slot(4, memory, 0) -def AuthScramChallengeAddMemory(builder, memory): - """This method is deprecated. Please switch to AddMemory.""" - return AddMemory(builder, memory) -def AddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(5, channelBinding, 0) -def AuthScramChallengeAddChannelBinding(builder, channelBinding): - """This method is deprecated. Please switch to AddChannelBinding.""" - return AddChannelBinding(builder, channelBinding) -def End(builder): return builder.EndObject() -def AuthScramChallengeEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AuthScramChallengeStart(builder): builder.StartObject(6) +def Start(builder): + return AuthScramChallengeStart(builder) +def AuthScramChallengeAddNonce(builder, nonce): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(nonce), 0) +def AddNonce(builder, nonce): + return AuthScramChallengeAddNonce(builder, nonce) +def AuthScramChallengeAddSalt(builder, salt): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(salt), 0) +def AddSalt(builder, salt): + return AuthScramChallengeAddSalt(builder, salt) +def AuthScramChallengeAddKdf(builder, kdf): builder.PrependUint8Slot(2, kdf, 2) +def AddKdf(builder, kdf): + return AuthScramChallengeAddKdf(builder, kdf) +def AuthScramChallengeAddIterations(builder, iterations): builder.PrependUint32Slot(3, iterations, 0) +def AddIterations(builder, iterations): + return AuthScramChallengeAddIterations(builder, iterations) +def AuthScramChallengeAddMemory(builder, memory): builder.PrependUint32Slot(4, memory, 0) +def AddMemory(builder, memory): + return AuthScramChallengeAddMemory(builder, memory) +def AuthScramChallengeAddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(5, channelBinding, 0) +def AddChannelBinding(builder, channelBinding): + return AuthScramChallengeAddChannelBinding(builder, channelBinding) +def AuthScramChallengeEnd(builder): return builder.EndObject() +def End(builder): + return AuthScramChallengeEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/AuthScramRequest.py b/autobahn/wamp/gen/wamp/proto/AuthScramRequest.py index eb29843fc..76c586238 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthScramRequest.py +++ b/autobahn/wamp/gen/wamp/proto/AuthScramRequest.py @@ -38,19 +38,15 @@ def ChannelBinding(self): return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos) return 0 -def Start(builder): builder.StartObject(2) -def AuthScramRequestStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddNonce(builder, nonce): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(nonce), 0) -def AuthScramRequestAddNonce(builder, nonce): - """This method is deprecated. Please switch to AddNonce.""" - return AddNonce(builder, nonce) -def AddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(1, channelBinding, 0) -def AuthScramRequestAddChannelBinding(builder, channelBinding): - """This method is deprecated. Please switch to AddChannelBinding.""" - return AddChannelBinding(builder, channelBinding) -def End(builder): return builder.EndObject() -def AuthScramRequestEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AuthScramRequestStart(builder): builder.StartObject(2) +def Start(builder): + return AuthScramRequestStart(builder) +def AuthScramRequestAddNonce(builder, nonce): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(nonce), 0) +def AddNonce(builder, nonce): + return AuthScramRequestAddNonce(builder, nonce) +def AuthScramRequestAddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(1, channelBinding, 0) +def AddChannelBinding(builder, channelBinding): + return AuthScramRequestAddChannelBinding(builder, channelBinding) +def AuthScramRequestEnd(builder): return builder.EndObject() +def End(builder): + return AuthScramRequestEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/AuthScramWelcome.py b/autobahn/wamp/gen/wamp/proto/AuthScramWelcome.py index 4d29a178f..24feca2a7 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthScramWelcome.py +++ b/autobahn/wamp/gen/wamp/proto/AuthScramWelcome.py @@ -31,15 +31,12 @@ def Verifier(self): return self._tab.String(o + self._tab.Pos) return None -def Start(builder): builder.StartObject(1) -def AuthScramWelcomeStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddVerifier(builder, verifier): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(verifier), 0) -def AuthScramWelcomeAddVerifier(builder, verifier): - """This method is deprecated. Please switch to AddVerifier.""" - return AddVerifier(builder, verifier) -def End(builder): return builder.EndObject() -def AuthScramWelcomeEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AuthScramWelcomeStart(builder): builder.StartObject(1) +def Start(builder): + return AuthScramWelcomeStart(builder) +def AuthScramWelcomeAddVerifier(builder, verifier): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(verifier), 0) +def AddVerifier(builder, verifier): + return AuthScramWelcomeAddVerifier(builder, verifier) +def AuthScramWelcomeEnd(builder): return builder.EndObject() +def End(builder): + return AuthScramWelcomeEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/AuthTicketChallenge.py b/autobahn/wamp/gen/wamp/proto/AuthTicketChallenge.py index 927a56d45..8d12e4fb4 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthTicketChallenge.py +++ b/autobahn/wamp/gen/wamp/proto/AuthTicketChallenge.py @@ -24,11 +24,9 @@ def GetRootAsAuthTicketChallenge(cls, buf, offset=0): def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) -def Start(builder): builder.StartObject(0) -def AuthTicketChallengeStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def End(builder): return builder.EndObject() -def AuthTicketChallengeEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AuthTicketChallengeStart(builder): builder.StartObject(0) +def Start(builder): + return AuthTicketChallengeStart(builder) +def AuthTicketChallengeEnd(builder): return builder.EndObject() +def End(builder): + return AuthTicketChallengeEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/AuthTicketRequest.py b/autobahn/wamp/gen/wamp/proto/AuthTicketRequest.py index 3b9e7589b..cb0e265af 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthTicketRequest.py +++ b/autobahn/wamp/gen/wamp/proto/AuthTicketRequest.py @@ -24,11 +24,9 @@ def GetRootAsAuthTicketRequest(cls, buf, offset=0): def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) -def Start(builder): builder.StartObject(0) -def AuthTicketRequestStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def End(builder): return builder.EndObject() -def AuthTicketRequestEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AuthTicketRequestStart(builder): builder.StartObject(0) +def Start(builder): + return AuthTicketRequestStart(builder) +def AuthTicketRequestEnd(builder): return builder.EndObject() +def End(builder): + return AuthTicketRequestEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/AuthTicketWelcome.py b/autobahn/wamp/gen/wamp/proto/AuthTicketWelcome.py index 51dfe22cf..239d4cf17 100644 --- a/autobahn/wamp/gen/wamp/proto/AuthTicketWelcome.py +++ b/autobahn/wamp/gen/wamp/proto/AuthTicketWelcome.py @@ -24,11 +24,9 @@ def GetRootAsAuthTicketWelcome(cls, buf, offset=0): def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) -def Start(builder): builder.StartObject(0) -def AuthTicketWelcomeStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def End(builder): return builder.EndObject() -def AuthTicketWelcomeEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AuthTicketWelcomeStart(builder): builder.StartObject(0) +def Start(builder): + return AuthTicketWelcomeStart(builder) +def AuthTicketWelcomeEnd(builder): return builder.EndObject() +def End(builder): + return AuthTicketWelcomeEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Authenticate.py b/autobahn/wamp/gen/wamp/proto/Authenticate.py index f2edc66db..d5642e94d 100644 --- a/autobahn/wamp/gen/wamp/proto/Authenticate.py +++ b/autobahn/wamp/gen/wamp/proto/Authenticate.py @@ -42,19 +42,15 @@ def Extra(self): return obj return None -def Start(builder): builder.StartObject(2) -def AuthenticateStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddSignature(builder, signature): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(signature), 0) -def AuthenticateAddSignature(builder, signature): - """This method is deprecated. Please switch to AddSignature.""" - return AddSignature(builder, signature) -def AddExtra(builder, extra): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(extra), 0) -def AuthenticateAddExtra(builder, extra): - """This method is deprecated. Please switch to AddExtra.""" - return AddExtra(builder, extra) -def End(builder): return builder.EndObject() -def AuthenticateEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def AuthenticateStart(builder): builder.StartObject(2) +def Start(builder): + return AuthenticateStart(builder) +def AuthenticateAddSignature(builder, signature): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(signature), 0) +def AddSignature(builder, signature): + return AuthenticateAddSignature(builder, signature) +def AuthenticateAddExtra(builder, extra): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(extra), 0) +def AddExtra(builder, extra): + return AuthenticateAddExtra(builder, extra) +def AuthenticateEnd(builder): return builder.EndObject() +def End(builder): + return AuthenticateEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/BrokerFeatures.py b/autobahn/wamp/gen/wamp/proto/BrokerFeatures.py index f91f7f136..8dcfcb83a 100644 --- a/autobahn/wamp/gen/wamp/proto/BrokerFeatures.py +++ b/autobahn/wamp/gen/wamp/proto/BrokerFeatures.py @@ -122,67 +122,51 @@ def PayloadEncryptionCryptobox(self): return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos)) return False -def Start(builder): builder.StartObject(14) -def BrokerFeaturesStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddPublisherIdentification(builder, publisherIdentification): builder.PrependBoolSlot(0, publisherIdentification, 0) -def BrokerFeaturesAddPublisherIdentification(builder, publisherIdentification): - """This method is deprecated. Please switch to AddPublisherIdentification.""" - return AddPublisherIdentification(builder, publisherIdentification) -def AddPublisherExclusion(builder, publisherExclusion): builder.PrependBoolSlot(1, publisherExclusion, 0) -def BrokerFeaturesAddPublisherExclusion(builder, publisherExclusion): - """This method is deprecated. Please switch to AddPublisherExclusion.""" - return AddPublisherExclusion(builder, publisherExclusion) -def AddSubscriberBlackwhiteListing(builder, subscriberBlackwhiteListing): builder.PrependBoolSlot(2, subscriberBlackwhiteListing, 0) -def BrokerFeaturesAddSubscriberBlackwhiteListing(builder, subscriberBlackwhiteListing): - """This method is deprecated. Please switch to AddSubscriberBlackwhiteListing.""" - return AddSubscriberBlackwhiteListing(builder, subscriberBlackwhiteListing) -def AddPatternBasedSubscription(builder, patternBasedSubscription): builder.PrependBoolSlot(3, patternBasedSubscription, 0) -def BrokerFeaturesAddPatternBasedSubscription(builder, patternBasedSubscription): - """This method is deprecated. Please switch to AddPatternBasedSubscription.""" - return AddPatternBasedSubscription(builder, patternBasedSubscription) -def AddPublicationTrustlevels(builder, publicationTrustlevels): builder.PrependBoolSlot(4, publicationTrustlevels, 0) -def BrokerFeaturesAddPublicationTrustlevels(builder, publicationTrustlevels): - """This method is deprecated. Please switch to AddPublicationTrustlevels.""" - return AddPublicationTrustlevels(builder, publicationTrustlevels) -def AddSubscriptionRevocation(builder, subscriptionRevocation): builder.PrependBoolSlot(5, subscriptionRevocation, 0) -def BrokerFeaturesAddSubscriptionRevocation(builder, subscriptionRevocation): - """This method is deprecated. Please switch to AddSubscriptionRevocation.""" - return AddSubscriptionRevocation(builder, subscriptionRevocation) -def AddSessionMetaApi(builder, sessionMetaApi): builder.PrependBoolSlot(6, sessionMetaApi, 0) -def BrokerFeaturesAddSessionMetaApi(builder, sessionMetaApi): - """This method is deprecated. Please switch to AddSessionMetaApi.""" - return AddSessionMetaApi(builder, sessionMetaApi) -def AddSubscriptionMetaApi(builder, subscriptionMetaApi): builder.PrependBoolSlot(7, subscriptionMetaApi, 0) -def BrokerFeaturesAddSubscriptionMetaApi(builder, subscriptionMetaApi): - """This method is deprecated. Please switch to AddSubscriptionMetaApi.""" - return AddSubscriptionMetaApi(builder, subscriptionMetaApi) -def AddEventRetention(builder, eventRetention): builder.PrependBoolSlot(8, eventRetention, 0) -def BrokerFeaturesAddEventRetention(builder, eventRetention): - """This method is deprecated. Please switch to AddEventRetention.""" - return AddEventRetention(builder, eventRetention) -def AddEventHistory(builder, eventHistory): builder.PrependBoolSlot(9, eventHistory, 0) -def BrokerFeaturesAddEventHistory(builder, eventHistory): - """This method is deprecated. Please switch to AddEventHistory.""" - return AddEventHistory(builder, eventHistory) -def AddAcknowledgeEventReceived(builder, acknowledgeEventReceived): builder.PrependBoolSlot(10, acknowledgeEventReceived, 0) -def BrokerFeaturesAddAcknowledgeEventReceived(builder, acknowledgeEventReceived): - """This method is deprecated. Please switch to AddAcknowledgeEventReceived.""" - return AddAcknowledgeEventReceived(builder, acknowledgeEventReceived) -def AddAcknowledgeSubscriberReceived(builder, acknowledgeSubscriberReceived): builder.PrependBoolSlot(11, acknowledgeSubscriberReceived, 0) -def BrokerFeaturesAddAcknowledgeSubscriberReceived(builder, acknowledgeSubscriberReceived): - """This method is deprecated. Please switch to AddAcknowledgeSubscriberReceived.""" - return AddAcknowledgeSubscriberReceived(builder, acknowledgeSubscriberReceived) -def AddPayloadTransparency(builder, payloadTransparency): builder.PrependBoolSlot(12, payloadTransparency, 0) -def BrokerFeaturesAddPayloadTransparency(builder, payloadTransparency): - """This method is deprecated. Please switch to AddPayloadTransparency.""" - return AddPayloadTransparency(builder, payloadTransparency) -def AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): builder.PrependBoolSlot(13, payloadEncryptionCryptobox, 0) -def BrokerFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): - """This method is deprecated. Please switch to AddPayloadEncryptionCryptobox.""" - return AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox) -def End(builder): return builder.EndObject() -def BrokerFeaturesEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def BrokerFeaturesStart(builder): builder.StartObject(14) +def Start(builder): + return BrokerFeaturesStart(builder) +def BrokerFeaturesAddPublisherIdentification(builder, publisherIdentification): builder.PrependBoolSlot(0, publisherIdentification, 0) +def AddPublisherIdentification(builder, publisherIdentification): + return BrokerFeaturesAddPublisherIdentification(builder, publisherIdentification) +def BrokerFeaturesAddPublisherExclusion(builder, publisherExclusion): builder.PrependBoolSlot(1, publisherExclusion, 0) +def AddPublisherExclusion(builder, publisherExclusion): + return BrokerFeaturesAddPublisherExclusion(builder, publisherExclusion) +def BrokerFeaturesAddSubscriberBlackwhiteListing(builder, subscriberBlackwhiteListing): builder.PrependBoolSlot(2, subscriberBlackwhiteListing, 0) +def AddSubscriberBlackwhiteListing(builder, subscriberBlackwhiteListing): + return BrokerFeaturesAddSubscriberBlackwhiteListing(builder, subscriberBlackwhiteListing) +def BrokerFeaturesAddPatternBasedSubscription(builder, patternBasedSubscription): builder.PrependBoolSlot(3, patternBasedSubscription, 0) +def AddPatternBasedSubscription(builder, patternBasedSubscription): + return BrokerFeaturesAddPatternBasedSubscription(builder, patternBasedSubscription) +def BrokerFeaturesAddPublicationTrustlevels(builder, publicationTrustlevels): builder.PrependBoolSlot(4, publicationTrustlevels, 0) +def AddPublicationTrustlevels(builder, publicationTrustlevels): + return BrokerFeaturesAddPublicationTrustlevels(builder, publicationTrustlevels) +def BrokerFeaturesAddSubscriptionRevocation(builder, subscriptionRevocation): builder.PrependBoolSlot(5, subscriptionRevocation, 0) +def AddSubscriptionRevocation(builder, subscriptionRevocation): + return BrokerFeaturesAddSubscriptionRevocation(builder, subscriptionRevocation) +def BrokerFeaturesAddSessionMetaApi(builder, sessionMetaApi): builder.PrependBoolSlot(6, sessionMetaApi, 0) +def AddSessionMetaApi(builder, sessionMetaApi): + return BrokerFeaturesAddSessionMetaApi(builder, sessionMetaApi) +def BrokerFeaturesAddSubscriptionMetaApi(builder, subscriptionMetaApi): builder.PrependBoolSlot(7, subscriptionMetaApi, 0) +def AddSubscriptionMetaApi(builder, subscriptionMetaApi): + return BrokerFeaturesAddSubscriptionMetaApi(builder, subscriptionMetaApi) +def BrokerFeaturesAddEventRetention(builder, eventRetention): builder.PrependBoolSlot(8, eventRetention, 0) +def AddEventRetention(builder, eventRetention): + return BrokerFeaturesAddEventRetention(builder, eventRetention) +def BrokerFeaturesAddEventHistory(builder, eventHistory): builder.PrependBoolSlot(9, eventHistory, 0) +def AddEventHistory(builder, eventHistory): + return BrokerFeaturesAddEventHistory(builder, eventHistory) +def BrokerFeaturesAddAcknowledgeEventReceived(builder, acknowledgeEventReceived): builder.PrependBoolSlot(10, acknowledgeEventReceived, 0) +def AddAcknowledgeEventReceived(builder, acknowledgeEventReceived): + return BrokerFeaturesAddAcknowledgeEventReceived(builder, acknowledgeEventReceived) +def BrokerFeaturesAddAcknowledgeSubscriberReceived(builder, acknowledgeSubscriberReceived): builder.PrependBoolSlot(11, acknowledgeSubscriberReceived, 0) +def AddAcknowledgeSubscriberReceived(builder, acknowledgeSubscriberReceived): + return BrokerFeaturesAddAcknowledgeSubscriberReceived(builder, acknowledgeSubscriberReceived) +def BrokerFeaturesAddPayloadTransparency(builder, payloadTransparency): builder.PrependBoolSlot(12, payloadTransparency, 0) +def AddPayloadTransparency(builder, payloadTransparency): + return BrokerFeaturesAddPayloadTransparency(builder, payloadTransparency) +def BrokerFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): builder.PrependBoolSlot(13, payloadEncryptionCryptobox, 0) +def AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): + return BrokerFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox) +def BrokerFeaturesEnd(builder): return builder.EndObject() +def End(builder): + return BrokerFeaturesEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Call.py b/autobahn/wamp/gen/wamp/proto/Call.py index 637882e40..94ae249ad 100644 --- a/autobahn/wamp/gen/wamp/proto/Call.py +++ b/autobahn/wamp/gen/wamp/proto/Call.py @@ -172,75 +172,57 @@ def ForwardForIsNone(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(28)) return o == 0 -def Start(builder): builder.StartObject(13) -def CallStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def CallAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddProcedure(builder, procedure): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(procedure), 0) -def CallAddProcedure(builder, procedure): - """This method is deprecated. Please switch to AddProcedure.""" - return AddProcedure(builder, procedure) -def AddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) -def CallAddPayload(builder, payload): - """This method is deprecated. Please switch to AddPayload.""" - return AddPayload(builder, payload) -def StartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def CallStartPayloadVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartPayloadVector(builder, numElems) -def AddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(3, encAlgo, 0) -def CallAddEncAlgo(builder, encAlgo): - """This method is deprecated. Please switch to AddEncAlgo.""" - return AddEncAlgo(builder, encAlgo) -def AddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(4, encSerializer, 0) -def CallAddEncSerializer(builder, encSerializer): - """This method is deprecated. Please switch to AddEncSerializer.""" - return AddEncSerializer(builder, encSerializer) -def AddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) -def CallAddEncKey(builder, encKey): - """This method is deprecated. Please switch to AddEncKey.""" - return AddEncKey(builder, encKey) -def StartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def CallStartEncKeyVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartEncKeyVector(builder, numElems) -def AddTimeout(builder, timeout): builder.PrependUint32Slot(6, timeout, 0) -def CallAddTimeout(builder, timeout): - """This method is deprecated. Please switch to AddTimeout.""" - return AddTimeout(builder, timeout) -def AddReceiveProgress(builder, receiveProgress): builder.PrependBoolSlot(7, receiveProgress, 0) -def CallAddReceiveProgress(builder, receiveProgress): - """This method is deprecated. Please switch to AddReceiveProgress.""" - return AddReceiveProgress(builder, receiveProgress) -def AddTransactionHash(builder, transactionHash): builder.PrependUOffsetTRelativeSlot(8, flatbuffers.number_types.UOffsetTFlags.py_type(transactionHash), 0) -def CallAddTransactionHash(builder, transactionHash): - """This method is deprecated. Please switch to AddTransactionHash.""" - return AddTransactionHash(builder, transactionHash) -def AddCaller(builder, caller): builder.PrependUint64Slot(9, caller, 0) -def CallAddCaller(builder, caller): - """This method is deprecated. Please switch to AddCaller.""" - return AddCaller(builder, caller) -def AddCallerAuthid(builder, callerAuthid): builder.PrependUOffsetTRelativeSlot(10, flatbuffers.number_types.UOffsetTFlags.py_type(callerAuthid), 0) -def CallAddCallerAuthid(builder, callerAuthid): - """This method is deprecated. Please switch to AddCallerAuthid.""" - return AddCallerAuthid(builder, callerAuthid) -def AddCallerAuthrole(builder, callerAuthrole): builder.PrependUOffsetTRelativeSlot(11, flatbuffers.number_types.UOffsetTFlags.py_type(callerAuthrole), 0) -def CallAddCallerAuthrole(builder, callerAuthrole): - """This method is deprecated. Please switch to AddCallerAuthrole.""" - return AddCallerAuthrole(builder, callerAuthrole) -def AddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(12, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) -def CallAddForwardFor(builder, forwardFor): - """This method is deprecated. Please switch to AddForwardFor.""" - return AddForwardFor(builder, forwardFor) -def StartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) -def CallStartForwardForVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartForwardForVector(builder, numElems) -def End(builder): return builder.EndObject() -def CallEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def CallStart(builder): builder.StartObject(13) +def Start(builder): + return CallStart(builder) +def CallAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return CallAddRequest(builder, request) +def CallAddProcedure(builder, procedure): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(procedure), 0) +def AddProcedure(builder, procedure): + return CallAddProcedure(builder, procedure) +def CallAddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) +def AddPayload(builder, payload): + return CallAddPayload(builder, payload) +def CallStartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartPayloadVector(builder, numElems): + return CallStartPayloadVector(builder, numElems) +def CallAddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(3, encAlgo, 0) +def AddEncAlgo(builder, encAlgo): + return CallAddEncAlgo(builder, encAlgo) +def CallAddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(4, encSerializer, 0) +def AddEncSerializer(builder, encSerializer): + return CallAddEncSerializer(builder, encSerializer) +def CallAddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) +def AddEncKey(builder, encKey): + return CallAddEncKey(builder, encKey) +def CallStartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartEncKeyVector(builder, numElems): + return CallStartEncKeyVector(builder, numElems) +def CallAddTimeout(builder, timeout): builder.PrependUint32Slot(6, timeout, 0) +def AddTimeout(builder, timeout): + return CallAddTimeout(builder, timeout) +def CallAddReceiveProgress(builder, receiveProgress): builder.PrependBoolSlot(7, receiveProgress, 0) +def AddReceiveProgress(builder, receiveProgress): + return CallAddReceiveProgress(builder, receiveProgress) +def CallAddTransactionHash(builder, transactionHash): builder.PrependUOffsetTRelativeSlot(8, flatbuffers.number_types.UOffsetTFlags.py_type(transactionHash), 0) +def AddTransactionHash(builder, transactionHash): + return CallAddTransactionHash(builder, transactionHash) +def CallAddCaller(builder, caller): builder.PrependUint64Slot(9, caller, 0) +def AddCaller(builder, caller): + return CallAddCaller(builder, caller) +def CallAddCallerAuthid(builder, callerAuthid): builder.PrependUOffsetTRelativeSlot(10, flatbuffers.number_types.UOffsetTFlags.py_type(callerAuthid), 0) +def AddCallerAuthid(builder, callerAuthid): + return CallAddCallerAuthid(builder, callerAuthid) +def CallAddCallerAuthrole(builder, callerAuthrole): builder.PrependUOffsetTRelativeSlot(11, flatbuffers.number_types.UOffsetTFlags.py_type(callerAuthrole), 0) +def AddCallerAuthrole(builder, callerAuthrole): + return CallAddCallerAuthrole(builder, callerAuthrole) +def CallAddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(12, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) +def AddForwardFor(builder, forwardFor): + return CallAddForwardFor(builder, forwardFor) +def CallStartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) +def StartForwardForVector(builder, numElems): + return CallStartForwardForVector(builder, numElems) +def CallEnd(builder): return builder.EndObject() +def End(builder): + return CallEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/CalleeFeatures.py b/autobahn/wamp/gen/wamp/proto/CalleeFeatures.py index d54713227..61bf7bc9b 100644 --- a/autobahn/wamp/gen/wamp/proto/CalleeFeatures.py +++ b/autobahn/wamp/gen/wamp/proto/CalleeFeatures.py @@ -94,51 +94,39 @@ def PayloadEncryptionCryptobox(self): return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos)) return False -def Start(builder): builder.StartObject(10) -def CalleeFeaturesStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddCallerIdentification(builder, callerIdentification): builder.PrependBoolSlot(0, callerIdentification, 0) -def CalleeFeaturesAddCallerIdentification(builder, callerIdentification): - """This method is deprecated. Please switch to AddCallerIdentification.""" - return AddCallerIdentification(builder, callerIdentification) -def AddCallTrustlevels(builder, callTrustlevels): builder.PrependBoolSlot(1, callTrustlevels, 0) -def CalleeFeaturesAddCallTrustlevels(builder, callTrustlevels): - """This method is deprecated. Please switch to AddCallTrustlevels.""" - return AddCallTrustlevels(builder, callTrustlevels) -def AddCallTimeout(builder, callTimeout): builder.PrependBoolSlot(2, callTimeout, 0) -def CalleeFeaturesAddCallTimeout(builder, callTimeout): - """This method is deprecated. Please switch to AddCallTimeout.""" - return AddCallTimeout(builder, callTimeout) -def AddCallCanceling(builder, callCanceling): builder.PrependBoolSlot(3, callCanceling, 0) -def CalleeFeaturesAddCallCanceling(builder, callCanceling): - """This method is deprecated. Please switch to AddCallCanceling.""" - return AddCallCanceling(builder, callCanceling) -def AddProgressiveCallResults(builder, progressiveCallResults): builder.PrependBoolSlot(4, progressiveCallResults, 0) -def CalleeFeaturesAddProgressiveCallResults(builder, progressiveCallResults): - """This method is deprecated. Please switch to AddProgressiveCallResults.""" - return AddProgressiveCallResults(builder, progressiveCallResults) -def AddRegistrationRevocation(builder, registrationRevocation): builder.PrependBoolSlot(5, registrationRevocation, 0) -def CalleeFeaturesAddRegistrationRevocation(builder, registrationRevocation): - """This method is deprecated. Please switch to AddRegistrationRevocation.""" - return AddRegistrationRevocation(builder, registrationRevocation) -def AddPatternBasedRegistration(builder, patternBasedRegistration): builder.PrependBoolSlot(6, patternBasedRegistration, 0) -def CalleeFeaturesAddPatternBasedRegistration(builder, patternBasedRegistration): - """This method is deprecated. Please switch to AddPatternBasedRegistration.""" - return AddPatternBasedRegistration(builder, patternBasedRegistration) -def AddSharedRegistration(builder, sharedRegistration): builder.PrependBoolSlot(7, sharedRegistration, 0) -def CalleeFeaturesAddSharedRegistration(builder, sharedRegistration): - """This method is deprecated. Please switch to AddSharedRegistration.""" - return AddSharedRegistration(builder, sharedRegistration) -def AddPayloadTransparency(builder, payloadTransparency): builder.PrependBoolSlot(8, payloadTransparency, 0) -def CalleeFeaturesAddPayloadTransparency(builder, payloadTransparency): - """This method is deprecated. Please switch to AddPayloadTransparency.""" - return AddPayloadTransparency(builder, payloadTransparency) -def AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): builder.PrependBoolSlot(9, payloadEncryptionCryptobox, 0) -def CalleeFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): - """This method is deprecated. Please switch to AddPayloadEncryptionCryptobox.""" - return AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox) -def End(builder): return builder.EndObject() -def CalleeFeaturesEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def CalleeFeaturesStart(builder): builder.StartObject(10) +def Start(builder): + return CalleeFeaturesStart(builder) +def CalleeFeaturesAddCallerIdentification(builder, callerIdentification): builder.PrependBoolSlot(0, callerIdentification, 0) +def AddCallerIdentification(builder, callerIdentification): + return CalleeFeaturesAddCallerIdentification(builder, callerIdentification) +def CalleeFeaturesAddCallTrustlevels(builder, callTrustlevels): builder.PrependBoolSlot(1, callTrustlevels, 0) +def AddCallTrustlevels(builder, callTrustlevels): + return CalleeFeaturesAddCallTrustlevels(builder, callTrustlevels) +def CalleeFeaturesAddCallTimeout(builder, callTimeout): builder.PrependBoolSlot(2, callTimeout, 0) +def AddCallTimeout(builder, callTimeout): + return CalleeFeaturesAddCallTimeout(builder, callTimeout) +def CalleeFeaturesAddCallCanceling(builder, callCanceling): builder.PrependBoolSlot(3, callCanceling, 0) +def AddCallCanceling(builder, callCanceling): + return CalleeFeaturesAddCallCanceling(builder, callCanceling) +def CalleeFeaturesAddProgressiveCallResults(builder, progressiveCallResults): builder.PrependBoolSlot(4, progressiveCallResults, 0) +def AddProgressiveCallResults(builder, progressiveCallResults): + return CalleeFeaturesAddProgressiveCallResults(builder, progressiveCallResults) +def CalleeFeaturesAddRegistrationRevocation(builder, registrationRevocation): builder.PrependBoolSlot(5, registrationRevocation, 0) +def AddRegistrationRevocation(builder, registrationRevocation): + return CalleeFeaturesAddRegistrationRevocation(builder, registrationRevocation) +def CalleeFeaturesAddPatternBasedRegistration(builder, patternBasedRegistration): builder.PrependBoolSlot(6, patternBasedRegistration, 0) +def AddPatternBasedRegistration(builder, patternBasedRegistration): + return CalleeFeaturesAddPatternBasedRegistration(builder, patternBasedRegistration) +def CalleeFeaturesAddSharedRegistration(builder, sharedRegistration): builder.PrependBoolSlot(7, sharedRegistration, 0) +def AddSharedRegistration(builder, sharedRegistration): + return CalleeFeaturesAddSharedRegistration(builder, sharedRegistration) +def CalleeFeaturesAddPayloadTransparency(builder, payloadTransparency): builder.PrependBoolSlot(8, payloadTransparency, 0) +def AddPayloadTransparency(builder, payloadTransparency): + return CalleeFeaturesAddPayloadTransparency(builder, payloadTransparency) +def CalleeFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): builder.PrependBoolSlot(9, payloadEncryptionCryptobox, 0) +def AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): + return CalleeFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox) +def CalleeFeaturesEnd(builder): return builder.EndObject() +def End(builder): + return CalleeFeaturesEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/CallerFeatures.py b/autobahn/wamp/gen/wamp/proto/CallerFeatures.py index f5c0e0a5f..f2fa1af60 100644 --- a/autobahn/wamp/gen/wamp/proto/CallerFeatures.py +++ b/autobahn/wamp/gen/wamp/proto/CallerFeatures.py @@ -66,35 +66,27 @@ def PayloadEncryptionCryptobox(self): return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos)) return False -def Start(builder): builder.StartObject(6) -def CallerFeaturesStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddCallerIdentification(builder, callerIdentification): builder.PrependBoolSlot(0, callerIdentification, 0) -def CallerFeaturesAddCallerIdentification(builder, callerIdentification): - """This method is deprecated. Please switch to AddCallerIdentification.""" - return AddCallerIdentification(builder, callerIdentification) -def AddCallTimeout(builder, callTimeout): builder.PrependBoolSlot(1, callTimeout, 0) -def CallerFeaturesAddCallTimeout(builder, callTimeout): - """This method is deprecated. Please switch to AddCallTimeout.""" - return AddCallTimeout(builder, callTimeout) -def AddCallCanceling(builder, callCanceling): builder.PrependBoolSlot(2, callCanceling, 0) -def CallerFeaturesAddCallCanceling(builder, callCanceling): - """This method is deprecated. Please switch to AddCallCanceling.""" - return AddCallCanceling(builder, callCanceling) -def AddProgressiveCallResults(builder, progressiveCallResults): builder.PrependBoolSlot(3, progressiveCallResults, 0) -def CallerFeaturesAddProgressiveCallResults(builder, progressiveCallResults): - """This method is deprecated. Please switch to AddProgressiveCallResults.""" - return AddProgressiveCallResults(builder, progressiveCallResults) -def AddPayloadTransparency(builder, payloadTransparency): builder.PrependBoolSlot(4, payloadTransparency, 0) -def CallerFeaturesAddPayloadTransparency(builder, payloadTransparency): - """This method is deprecated. Please switch to AddPayloadTransparency.""" - return AddPayloadTransparency(builder, payloadTransparency) -def AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): builder.PrependBoolSlot(5, payloadEncryptionCryptobox, 0) -def CallerFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): - """This method is deprecated. Please switch to AddPayloadEncryptionCryptobox.""" - return AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox) -def End(builder): return builder.EndObject() -def CallerFeaturesEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def CallerFeaturesStart(builder): builder.StartObject(6) +def Start(builder): + return CallerFeaturesStart(builder) +def CallerFeaturesAddCallerIdentification(builder, callerIdentification): builder.PrependBoolSlot(0, callerIdentification, 0) +def AddCallerIdentification(builder, callerIdentification): + return CallerFeaturesAddCallerIdentification(builder, callerIdentification) +def CallerFeaturesAddCallTimeout(builder, callTimeout): builder.PrependBoolSlot(1, callTimeout, 0) +def AddCallTimeout(builder, callTimeout): + return CallerFeaturesAddCallTimeout(builder, callTimeout) +def CallerFeaturesAddCallCanceling(builder, callCanceling): builder.PrependBoolSlot(2, callCanceling, 0) +def AddCallCanceling(builder, callCanceling): + return CallerFeaturesAddCallCanceling(builder, callCanceling) +def CallerFeaturesAddProgressiveCallResults(builder, progressiveCallResults): builder.PrependBoolSlot(3, progressiveCallResults, 0) +def AddProgressiveCallResults(builder, progressiveCallResults): + return CallerFeaturesAddProgressiveCallResults(builder, progressiveCallResults) +def CallerFeaturesAddPayloadTransparency(builder, payloadTransparency): builder.PrependBoolSlot(4, payloadTransparency, 0) +def AddPayloadTransparency(builder, payloadTransparency): + return CallerFeaturesAddPayloadTransparency(builder, payloadTransparency) +def CallerFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): builder.PrependBoolSlot(5, payloadEncryptionCryptobox, 0) +def AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): + return CallerFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox) +def CallerFeaturesEnd(builder): return builder.EndObject() +def End(builder): + return CallerFeaturesEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Cancel.py b/autobahn/wamp/gen/wamp/proto/Cancel.py index 8d092d6fa..42a27b0d9 100644 --- a/autobahn/wamp/gen/wamp/proto/Cancel.py +++ b/autobahn/wamp/gen/wamp/proto/Cancel.py @@ -62,27 +62,21 @@ def ForwardForIsNone(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8)) return o == 0 -def Start(builder): builder.StartObject(3) -def CancelStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def CancelAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddMode(builder, mode): builder.PrependUint8Slot(1, mode, 0) -def CancelAddMode(builder, mode): - """This method is deprecated. Please switch to AddMode.""" - return AddMode(builder, mode) -def AddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) -def CancelAddForwardFor(builder, forwardFor): - """This method is deprecated. Please switch to AddForwardFor.""" - return AddForwardFor(builder, forwardFor) -def StartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) -def CancelStartForwardForVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartForwardForVector(builder, numElems) -def End(builder): return builder.EndObject() -def CancelEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def CancelStart(builder): builder.StartObject(3) +def Start(builder): + return CancelStart(builder) +def CancelAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return CancelAddRequest(builder, request) +def CancelAddMode(builder, mode): builder.PrependUint8Slot(1, mode, 0) +def AddMode(builder, mode): + return CancelAddMode(builder, mode) +def CancelAddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) +def AddForwardFor(builder, forwardFor): + return CancelAddForwardFor(builder, forwardFor) +def CancelStartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) +def StartForwardForVector(builder, numElems): + return CancelStartForwardForVector(builder, numElems) +def CancelEnd(builder): return builder.EndObject() +def End(builder): + return CancelEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/CancelMode.py b/autobahn/wamp/gen/wamp/proto/CancelMode.py index e0a2b9067..8e3897f85 100644 --- a/autobahn/wamp/gen/wamp/proto/CancelMode.py +++ b/autobahn/wamp/gen/wamp/proto/CancelMode.py @@ -6,4 +6,3 @@ class CancelMode(object): SKIP = 0 ABORT = 1 KILL = 2 - diff --git a/autobahn/wamp/gen/wamp/proto/Challenge.py b/autobahn/wamp/gen/wamp/proto/Challenge.py index 65b78fe39..d34d322c6 100644 --- a/autobahn/wamp/gen/wamp/proto/Challenge.py +++ b/autobahn/wamp/gen/wamp/proto/Challenge.py @@ -42,19 +42,15 @@ def Extra(self): return obj return None -def Start(builder): builder.StartObject(2) -def ChallengeStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddMethod(builder, method): builder.PrependUint8Slot(0, method, 0) -def ChallengeAddMethod(builder, method): - """This method is deprecated. Please switch to AddMethod.""" - return AddMethod(builder, method) -def AddExtra(builder, extra): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(extra), 0) -def ChallengeAddExtra(builder, extra): - """This method is deprecated. Please switch to AddExtra.""" - return AddExtra(builder, extra) -def End(builder): return builder.EndObject() -def ChallengeEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def ChallengeStart(builder): builder.StartObject(2) +def Start(builder): + return ChallengeStart(builder) +def ChallengeAddMethod(builder, method): builder.PrependUint8Slot(0, method, 0) +def AddMethod(builder, method): + return ChallengeAddMethod(builder, method) +def ChallengeAddExtra(builder, extra): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(extra), 0) +def AddExtra(builder, extra): + return ChallengeAddExtra(builder, extra) +def ChallengeEnd(builder): return builder.EndObject() +def End(builder): + return ChallengeEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/ChannelBinding.py b/autobahn/wamp/gen/wamp/proto/ChannelBinding.py index 753d323fa..8e288c8e9 100644 --- a/autobahn/wamp/gen/wamp/proto/ChannelBinding.py +++ b/autobahn/wamp/gen/wamp/proto/ChannelBinding.py @@ -5,4 +5,3 @@ class ChannelBinding(object): NONE = 0 TLS_UNIQUE = 1 - diff --git a/autobahn/wamp/gen/wamp/proto/ClientRoles.py b/autobahn/wamp/gen/wamp/proto/ClientRoles.py index 14fa864a2..dc395f76c 100644 --- a/autobahn/wamp/gen/wamp/proto/ClientRoles.py +++ b/autobahn/wamp/gen/wamp/proto/ClientRoles.py @@ -68,27 +68,21 @@ def Callee(self): return obj return None -def Start(builder): builder.StartObject(4) -def ClientRolesStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddPublisher(builder, publisher): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(publisher), 0) -def ClientRolesAddPublisher(builder, publisher): - """This method is deprecated. Please switch to AddPublisher.""" - return AddPublisher(builder, publisher) -def AddSubscriber(builder, subscriber): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(subscriber), 0) -def ClientRolesAddSubscriber(builder, subscriber): - """This method is deprecated. Please switch to AddSubscriber.""" - return AddSubscriber(builder, subscriber) -def AddCaller(builder, caller): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(caller), 0) -def ClientRolesAddCaller(builder, caller): - """This method is deprecated. Please switch to AddCaller.""" - return AddCaller(builder, caller) -def AddCallee(builder, callee): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(callee), 0) -def ClientRolesAddCallee(builder, callee): - """This method is deprecated. Please switch to AddCallee.""" - return AddCallee(builder, callee) -def End(builder): return builder.EndObject() -def ClientRolesEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def ClientRolesStart(builder): builder.StartObject(4) +def Start(builder): + return ClientRolesStart(builder) +def ClientRolesAddPublisher(builder, publisher): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(publisher), 0) +def AddPublisher(builder, publisher): + return ClientRolesAddPublisher(builder, publisher) +def ClientRolesAddSubscriber(builder, subscriber): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(subscriber), 0) +def AddSubscriber(builder, subscriber): + return ClientRolesAddSubscriber(builder, subscriber) +def ClientRolesAddCaller(builder, caller): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(caller), 0) +def AddCaller(builder, caller): + return ClientRolesAddCaller(builder, caller) +def ClientRolesAddCallee(builder, callee): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(callee), 0) +def AddCallee(builder, callee): + return ClientRolesAddCallee(builder, callee) +def ClientRolesEnd(builder): return builder.EndObject() +def End(builder): + return ClientRolesEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/DealerFeatures.py b/autobahn/wamp/gen/wamp/proto/DealerFeatures.py index d589fc0b3..88a44c8f8 100644 --- a/autobahn/wamp/gen/wamp/proto/DealerFeatures.py +++ b/autobahn/wamp/gen/wamp/proto/DealerFeatures.py @@ -115,63 +115,48 @@ def PayloadEncryptionCryptobox(self): return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos)) return False -def Start(builder): builder.StartObject(13) -def DealerFeaturesStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddCallerIdentification(builder, callerIdentification): builder.PrependBoolSlot(0, callerIdentification, 0) -def DealerFeaturesAddCallerIdentification(builder, callerIdentification): - """This method is deprecated. Please switch to AddCallerIdentification.""" - return AddCallerIdentification(builder, callerIdentification) -def AddCallTrustlevels(builder, callTrustlevels): builder.PrependBoolSlot(1, callTrustlevels, 0) -def DealerFeaturesAddCallTrustlevels(builder, callTrustlevels): - """This method is deprecated. Please switch to AddCallTrustlevels.""" - return AddCallTrustlevels(builder, callTrustlevels) -def AddCallTimeout(builder, callTimeout): builder.PrependBoolSlot(2, callTimeout, 0) -def DealerFeaturesAddCallTimeout(builder, callTimeout): - """This method is deprecated. Please switch to AddCallTimeout.""" - return AddCallTimeout(builder, callTimeout) -def AddCallCanceling(builder, callCanceling): builder.PrependBoolSlot(3, callCanceling, 0) -def DealerFeaturesAddCallCanceling(builder, callCanceling): - """This method is deprecated. Please switch to AddCallCanceling.""" - return AddCallCanceling(builder, callCanceling) -def AddProgressiveCallResults(builder, progressiveCallResults): builder.PrependBoolSlot(4, progressiveCallResults, 0) -def DealerFeaturesAddProgressiveCallResults(builder, progressiveCallResults): - """This method is deprecated. Please switch to AddProgressiveCallResults.""" - return AddProgressiveCallResults(builder, progressiveCallResults) -def AddRegistrationRevocation(builder, registrationRevocation): builder.PrependBoolSlot(5, registrationRevocation, 0) -def DealerFeaturesAddRegistrationRevocation(builder, registrationRevocation): - """This method is deprecated. Please switch to AddRegistrationRevocation.""" - return AddRegistrationRevocation(builder, registrationRevocation) -def AddPatternBasedRegistration(builder, patternBasedRegistration): builder.PrependBoolSlot(6, patternBasedRegistration, 0) -def DealerFeaturesAddPatternBasedRegistration(builder, patternBasedRegistration): - """This method is deprecated. Please switch to AddPatternBasedRegistration.""" - return AddPatternBasedRegistration(builder, patternBasedRegistration) -def AddSharedRegistration(builder, sharedRegistration): builder.PrependBoolSlot(7, sharedRegistration, 0) -def DealerFeaturesAddSharedRegistration(builder, sharedRegistration): - """This method is deprecated. Please switch to AddSharedRegistration.""" - return AddSharedRegistration(builder, sharedRegistration) -def AddSessionMetaApi(builder, sessionMetaApi): builder.PrependBoolSlot(8, sessionMetaApi, 0) -def DealerFeaturesAddSessionMetaApi(builder, sessionMetaApi): - """This method is deprecated. Please switch to AddSessionMetaApi.""" - return AddSessionMetaApi(builder, sessionMetaApi) -def AddRegistrationMetaApi(builder, registrationMetaApi): builder.PrependBoolSlot(9, registrationMetaApi, 0) -def DealerFeaturesAddRegistrationMetaApi(builder, registrationMetaApi): - """This method is deprecated. Please switch to AddRegistrationMetaApi.""" - return AddRegistrationMetaApi(builder, registrationMetaApi) -def AddTestamentMetaApi(builder, testamentMetaApi): builder.PrependBoolSlot(10, testamentMetaApi, 0) -def DealerFeaturesAddTestamentMetaApi(builder, testamentMetaApi): - """This method is deprecated. Please switch to AddTestamentMetaApi.""" - return AddTestamentMetaApi(builder, testamentMetaApi) -def AddPayloadTransparency(builder, payloadTransparency): builder.PrependBoolSlot(11, payloadTransparency, 0) -def DealerFeaturesAddPayloadTransparency(builder, payloadTransparency): - """This method is deprecated. Please switch to AddPayloadTransparency.""" - return AddPayloadTransparency(builder, payloadTransparency) -def AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): builder.PrependBoolSlot(12, payloadEncryptionCryptobox, 0) -def DealerFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): - """This method is deprecated. Please switch to AddPayloadEncryptionCryptobox.""" - return AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox) -def End(builder): return builder.EndObject() -def DealerFeaturesEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def DealerFeaturesStart(builder): builder.StartObject(13) +def Start(builder): + return DealerFeaturesStart(builder) +def DealerFeaturesAddCallerIdentification(builder, callerIdentification): builder.PrependBoolSlot(0, callerIdentification, 0) +def AddCallerIdentification(builder, callerIdentification): + return DealerFeaturesAddCallerIdentification(builder, callerIdentification) +def DealerFeaturesAddCallTrustlevels(builder, callTrustlevels): builder.PrependBoolSlot(1, callTrustlevels, 0) +def AddCallTrustlevels(builder, callTrustlevels): + return DealerFeaturesAddCallTrustlevels(builder, callTrustlevels) +def DealerFeaturesAddCallTimeout(builder, callTimeout): builder.PrependBoolSlot(2, callTimeout, 0) +def AddCallTimeout(builder, callTimeout): + return DealerFeaturesAddCallTimeout(builder, callTimeout) +def DealerFeaturesAddCallCanceling(builder, callCanceling): builder.PrependBoolSlot(3, callCanceling, 0) +def AddCallCanceling(builder, callCanceling): + return DealerFeaturesAddCallCanceling(builder, callCanceling) +def DealerFeaturesAddProgressiveCallResults(builder, progressiveCallResults): builder.PrependBoolSlot(4, progressiveCallResults, 0) +def AddProgressiveCallResults(builder, progressiveCallResults): + return DealerFeaturesAddProgressiveCallResults(builder, progressiveCallResults) +def DealerFeaturesAddRegistrationRevocation(builder, registrationRevocation): builder.PrependBoolSlot(5, registrationRevocation, 0) +def AddRegistrationRevocation(builder, registrationRevocation): + return DealerFeaturesAddRegistrationRevocation(builder, registrationRevocation) +def DealerFeaturesAddPatternBasedRegistration(builder, patternBasedRegistration): builder.PrependBoolSlot(6, patternBasedRegistration, 0) +def AddPatternBasedRegistration(builder, patternBasedRegistration): + return DealerFeaturesAddPatternBasedRegistration(builder, patternBasedRegistration) +def DealerFeaturesAddSharedRegistration(builder, sharedRegistration): builder.PrependBoolSlot(7, sharedRegistration, 0) +def AddSharedRegistration(builder, sharedRegistration): + return DealerFeaturesAddSharedRegistration(builder, sharedRegistration) +def DealerFeaturesAddSessionMetaApi(builder, sessionMetaApi): builder.PrependBoolSlot(8, sessionMetaApi, 0) +def AddSessionMetaApi(builder, sessionMetaApi): + return DealerFeaturesAddSessionMetaApi(builder, sessionMetaApi) +def DealerFeaturesAddRegistrationMetaApi(builder, registrationMetaApi): builder.PrependBoolSlot(9, registrationMetaApi, 0) +def AddRegistrationMetaApi(builder, registrationMetaApi): + return DealerFeaturesAddRegistrationMetaApi(builder, registrationMetaApi) +def DealerFeaturesAddTestamentMetaApi(builder, testamentMetaApi): builder.PrependBoolSlot(10, testamentMetaApi, 0) +def AddTestamentMetaApi(builder, testamentMetaApi): + return DealerFeaturesAddTestamentMetaApi(builder, testamentMetaApi) +def DealerFeaturesAddPayloadTransparency(builder, payloadTransparency): builder.PrependBoolSlot(11, payloadTransparency, 0) +def AddPayloadTransparency(builder, payloadTransparency): + return DealerFeaturesAddPayloadTransparency(builder, payloadTransparency) +def DealerFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): builder.PrependBoolSlot(12, payloadEncryptionCryptobox, 0) +def AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): + return DealerFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox) +def DealerFeaturesEnd(builder): return builder.EndObject() +def End(builder): + return DealerFeaturesEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Error.py b/autobahn/wamp/gen/wamp/proto/Error.py index 7e03ff55a..a2af225b6 100644 --- a/autobahn/wamp/gen/wamp/proto/Error.py +++ b/autobahn/wamp/gen/wamp/proto/Error.py @@ -113,47 +113,36 @@ def EncKeyIsNone(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(16)) return o == 0 -def Start(builder): builder.StartObject(7) -def ErrorStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequestType(builder, requestType): builder.PrependUint16Slot(0, requestType, 0) -def ErrorAddRequestType(builder, requestType): - """This method is deprecated. Please switch to AddRequestType.""" - return AddRequestType(builder, requestType) -def AddRequest(builder, request): builder.PrependUint64Slot(1, request, 0) -def ErrorAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddError(builder, error): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(error), 0) -def ErrorAddError(builder, error): - """This method is deprecated. Please switch to AddError.""" - return AddError(builder, error) -def AddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) -def ErrorAddPayload(builder, payload): - """This method is deprecated. Please switch to AddPayload.""" - return AddPayload(builder, payload) -def StartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def ErrorStartPayloadVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartPayloadVector(builder, numElems) -def AddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(4, encAlgo, 0) -def ErrorAddEncAlgo(builder, encAlgo): - """This method is deprecated. Please switch to AddEncAlgo.""" - return AddEncAlgo(builder, encAlgo) -def AddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(5, encSerializer, 0) -def ErrorAddEncSerializer(builder, encSerializer): - """This method is deprecated. Please switch to AddEncSerializer.""" - return AddEncSerializer(builder, encSerializer) -def AddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(6, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) -def ErrorAddEncKey(builder, encKey): - """This method is deprecated. Please switch to AddEncKey.""" - return AddEncKey(builder, encKey) -def StartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def ErrorStartEncKeyVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartEncKeyVector(builder, numElems) -def End(builder): return builder.EndObject() -def ErrorEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def ErrorStart(builder): builder.StartObject(7) +def Start(builder): + return ErrorStart(builder) +def ErrorAddRequestType(builder, requestType): builder.PrependUint16Slot(0, requestType, 0) +def AddRequestType(builder, requestType): + return ErrorAddRequestType(builder, requestType) +def ErrorAddRequest(builder, request): builder.PrependUint64Slot(1, request, 0) +def AddRequest(builder, request): + return ErrorAddRequest(builder, request) +def ErrorAddError(builder, error): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(error), 0) +def AddError(builder, error): + return ErrorAddError(builder, error) +def ErrorAddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) +def AddPayload(builder, payload): + return ErrorAddPayload(builder, payload) +def ErrorStartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartPayloadVector(builder, numElems): + return ErrorStartPayloadVector(builder, numElems) +def ErrorAddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(4, encAlgo, 0) +def AddEncAlgo(builder, encAlgo): + return ErrorAddEncAlgo(builder, encAlgo) +def ErrorAddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(5, encSerializer, 0) +def AddEncSerializer(builder, encSerializer): + return ErrorAddEncSerializer(builder, encSerializer) +def ErrorAddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(6, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) +def AddEncKey(builder, encKey): + return ErrorAddEncKey(builder, encKey) +def ErrorStartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartEncKeyVector(builder, numElems): + return ErrorStartEncKeyVector(builder, numElems) +def ErrorEnd(builder): return builder.EndObject() +def End(builder): + return ErrorEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Event.py b/autobahn/wamp/gen/wamp/proto/Event.py index 1b877383f..12b21c258 100644 --- a/autobahn/wamp/gen/wamp/proto/Event.py +++ b/autobahn/wamp/gen/wamp/proto/Event.py @@ -236,95 +236,72 @@ def ForwardForIsNone(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(34)) return o == 0 -def Start(builder): builder.StartObject(16) -def EventStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddSubscription(builder, subscription): builder.PrependUint64Slot(0, subscription, 0) -def EventAddSubscription(builder, subscription): - """This method is deprecated. Please switch to AddSubscription.""" - return AddSubscription(builder, subscription) -def AddPublication(builder, publication): builder.PrependUint64Slot(1, publication, 0) -def EventAddPublication(builder, publication): - """This method is deprecated. Please switch to AddPublication.""" - return AddPublication(builder, publication) -def AddArgs(builder, args): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(args), 0) -def EventAddArgs(builder, args): - """This method is deprecated. Please switch to AddArgs.""" - return AddArgs(builder, args) -def StartArgsVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def EventStartArgsVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartArgsVector(builder, numElems) -def AddKwargs(builder, kwargs): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(kwargs), 0) -def EventAddKwargs(builder, kwargs): - """This method is deprecated. Please switch to AddKwargs.""" - return AddKwargs(builder, kwargs) -def StartKwargsVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def EventStartKwargsVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartKwargsVector(builder, numElems) -def AddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) -def EventAddPayload(builder, payload): - """This method is deprecated. Please switch to AddPayload.""" - return AddPayload(builder, payload) -def StartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def EventStartPayloadVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartPayloadVector(builder, numElems) -def AddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(5, encAlgo, 0) -def EventAddEncAlgo(builder, encAlgo): - """This method is deprecated. Please switch to AddEncAlgo.""" - return AddEncAlgo(builder, encAlgo) -def AddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(6, encSerializer, 0) -def EventAddEncSerializer(builder, encSerializer): - """This method is deprecated. Please switch to AddEncSerializer.""" - return AddEncSerializer(builder, encSerializer) -def AddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) -def EventAddEncKey(builder, encKey): - """This method is deprecated. Please switch to AddEncKey.""" - return AddEncKey(builder, encKey) -def StartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def EventStartEncKeyVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartEncKeyVector(builder, numElems) -def AddPublisher(builder, publisher): builder.PrependUint64Slot(8, publisher, 0) -def EventAddPublisher(builder, publisher): - """This method is deprecated. Please switch to AddPublisher.""" - return AddPublisher(builder, publisher) -def AddPublisherAuthid(builder, publisherAuthid): builder.PrependUOffsetTRelativeSlot(9, flatbuffers.number_types.UOffsetTFlags.py_type(publisherAuthid), 0) -def EventAddPublisherAuthid(builder, publisherAuthid): - """This method is deprecated. Please switch to AddPublisherAuthid.""" - return AddPublisherAuthid(builder, publisherAuthid) -def AddPublisherAuthrole(builder, publisherAuthrole): builder.PrependUOffsetTRelativeSlot(10, flatbuffers.number_types.UOffsetTFlags.py_type(publisherAuthrole), 0) -def EventAddPublisherAuthrole(builder, publisherAuthrole): - """This method is deprecated. Please switch to AddPublisherAuthrole.""" - return AddPublisherAuthrole(builder, publisherAuthrole) -def AddTopic(builder, topic): builder.PrependUOffsetTRelativeSlot(11, flatbuffers.number_types.UOffsetTFlags.py_type(topic), 0) -def EventAddTopic(builder, topic): - """This method is deprecated. Please switch to AddTopic.""" - return AddTopic(builder, topic) -def AddRetained(builder, retained): builder.PrependBoolSlot(12, retained, 0) -def EventAddRetained(builder, retained): - """This method is deprecated. Please switch to AddRetained.""" - return AddRetained(builder, retained) -def AddTransactionHash(builder, transactionHash): builder.PrependUOffsetTRelativeSlot(13, flatbuffers.number_types.UOffsetTFlags.py_type(transactionHash), 0) -def EventAddTransactionHash(builder, transactionHash): - """This method is deprecated. Please switch to AddTransactionHash.""" - return AddTransactionHash(builder, transactionHash) -def AddAcknowledge(builder, acknowledge): builder.PrependBoolSlot(14, acknowledge, 0) -def EventAddAcknowledge(builder, acknowledge): - """This method is deprecated. Please switch to AddAcknowledge.""" - return AddAcknowledge(builder, acknowledge) -def AddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(15, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) -def EventAddForwardFor(builder, forwardFor): - """This method is deprecated. Please switch to AddForwardFor.""" - return AddForwardFor(builder, forwardFor) -def StartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) -def EventStartForwardForVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartForwardForVector(builder, numElems) -def End(builder): return builder.EndObject() -def EventEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def EventStart(builder): builder.StartObject(16) +def Start(builder): + return EventStart(builder) +def EventAddSubscription(builder, subscription): builder.PrependUint64Slot(0, subscription, 0) +def AddSubscription(builder, subscription): + return EventAddSubscription(builder, subscription) +def EventAddPublication(builder, publication): builder.PrependUint64Slot(1, publication, 0) +def AddPublication(builder, publication): + return EventAddPublication(builder, publication) +def EventAddArgs(builder, args): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(args), 0) +def AddArgs(builder, args): + return EventAddArgs(builder, args) +def EventStartArgsVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartArgsVector(builder, numElems): + return EventStartArgsVector(builder, numElems) +def EventAddKwargs(builder, kwargs): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(kwargs), 0) +def AddKwargs(builder, kwargs): + return EventAddKwargs(builder, kwargs) +def EventStartKwargsVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartKwargsVector(builder, numElems): + return EventStartKwargsVector(builder, numElems) +def EventAddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) +def AddPayload(builder, payload): + return EventAddPayload(builder, payload) +def EventStartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartPayloadVector(builder, numElems): + return EventStartPayloadVector(builder, numElems) +def EventAddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(5, encAlgo, 0) +def AddEncAlgo(builder, encAlgo): + return EventAddEncAlgo(builder, encAlgo) +def EventAddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(6, encSerializer, 0) +def AddEncSerializer(builder, encSerializer): + return EventAddEncSerializer(builder, encSerializer) +def EventAddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) +def AddEncKey(builder, encKey): + return EventAddEncKey(builder, encKey) +def EventStartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartEncKeyVector(builder, numElems): + return EventStartEncKeyVector(builder, numElems) +def EventAddPublisher(builder, publisher): builder.PrependUint64Slot(8, publisher, 0) +def AddPublisher(builder, publisher): + return EventAddPublisher(builder, publisher) +def EventAddPublisherAuthid(builder, publisherAuthid): builder.PrependUOffsetTRelativeSlot(9, flatbuffers.number_types.UOffsetTFlags.py_type(publisherAuthid), 0) +def AddPublisherAuthid(builder, publisherAuthid): + return EventAddPublisherAuthid(builder, publisherAuthid) +def EventAddPublisherAuthrole(builder, publisherAuthrole): builder.PrependUOffsetTRelativeSlot(10, flatbuffers.number_types.UOffsetTFlags.py_type(publisherAuthrole), 0) +def AddPublisherAuthrole(builder, publisherAuthrole): + return EventAddPublisherAuthrole(builder, publisherAuthrole) +def EventAddTopic(builder, topic): builder.PrependUOffsetTRelativeSlot(11, flatbuffers.number_types.UOffsetTFlags.py_type(topic), 0) +def AddTopic(builder, topic): + return EventAddTopic(builder, topic) +def EventAddRetained(builder, retained): builder.PrependBoolSlot(12, retained, 0) +def AddRetained(builder, retained): + return EventAddRetained(builder, retained) +def EventAddTransactionHash(builder, transactionHash): builder.PrependUOffsetTRelativeSlot(13, flatbuffers.number_types.UOffsetTFlags.py_type(transactionHash), 0) +def AddTransactionHash(builder, transactionHash): + return EventAddTransactionHash(builder, transactionHash) +def EventAddAcknowledge(builder, acknowledge): builder.PrependBoolSlot(14, acknowledge, 0) +def AddAcknowledge(builder, acknowledge): + return EventAddAcknowledge(builder, acknowledge) +def EventAddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(15, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) +def AddForwardFor(builder, forwardFor): + return EventAddForwardFor(builder, forwardFor) +def EventStartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) +def StartForwardForVector(builder, numElems): + return EventStartForwardForVector(builder, numElems) +def EventEnd(builder): return builder.EndObject() +def End(builder): + return EventEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/EventReceived.py b/autobahn/wamp/gen/wamp/proto/EventReceived.py index e543fa4a4..a507dc63f 100644 --- a/autobahn/wamp/gen/wamp/proto/EventReceived.py +++ b/autobahn/wamp/gen/wamp/proto/EventReceived.py @@ -99,39 +99,30 @@ def EncKeyIsNone(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(12)) return o == 0 -def Start(builder): builder.StartObject(5) -def EventReceivedStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddPublication(builder, publication): builder.PrependUint64Slot(0, publication, 0) -def EventReceivedAddPublication(builder, publication): - """This method is deprecated. Please switch to AddPublication.""" - return AddPublication(builder, publication) -def AddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) -def EventReceivedAddPayload(builder, payload): - """This method is deprecated. Please switch to AddPayload.""" - return AddPayload(builder, payload) -def StartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def EventReceivedStartPayloadVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartPayloadVector(builder, numElems) -def AddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(2, encAlgo, 0) -def EventReceivedAddEncAlgo(builder, encAlgo): - """This method is deprecated. Please switch to AddEncAlgo.""" - return AddEncAlgo(builder, encAlgo) -def AddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(3, encSerializer, 0) -def EventReceivedAddEncSerializer(builder, encSerializer): - """This method is deprecated. Please switch to AddEncSerializer.""" - return AddEncSerializer(builder, encSerializer) -def AddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) -def EventReceivedAddEncKey(builder, encKey): - """This method is deprecated. Please switch to AddEncKey.""" - return AddEncKey(builder, encKey) -def StartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def EventReceivedStartEncKeyVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartEncKeyVector(builder, numElems) -def End(builder): return builder.EndObject() -def EventReceivedEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def EventReceivedStart(builder): builder.StartObject(5) +def Start(builder): + return EventReceivedStart(builder) +def EventReceivedAddPublication(builder, publication): builder.PrependUint64Slot(0, publication, 0) +def AddPublication(builder, publication): + return EventReceivedAddPublication(builder, publication) +def EventReceivedAddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) +def AddPayload(builder, payload): + return EventReceivedAddPayload(builder, payload) +def EventReceivedStartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartPayloadVector(builder, numElems): + return EventReceivedStartPayloadVector(builder, numElems) +def EventReceivedAddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(2, encAlgo, 0) +def AddEncAlgo(builder, encAlgo): + return EventReceivedAddEncAlgo(builder, encAlgo) +def EventReceivedAddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(3, encSerializer, 0) +def AddEncSerializer(builder, encSerializer): + return EventReceivedAddEncSerializer(builder, encSerializer) +def EventReceivedAddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) +def AddEncKey(builder, encKey): + return EventReceivedAddEncKey(builder, encKey) +def EventReceivedStartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartEncKeyVector(builder, numElems): + return EventReceivedStartEncKeyVector(builder, numElems) +def EventReceivedEnd(builder): return builder.EndObject() +def End(builder): + return EventReceivedEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Goodbye.py b/autobahn/wamp/gen/wamp/proto/Goodbye.py index 3d4795faf..e9de96191 100644 --- a/autobahn/wamp/gen/wamp/proto/Goodbye.py +++ b/autobahn/wamp/gen/wamp/proto/Goodbye.py @@ -45,23 +45,18 @@ def Resumable(self): return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos)) return False -def Start(builder): builder.StartObject(3) -def GoodbyeStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddReason(builder, reason): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(reason), 0) -def GoodbyeAddReason(builder, reason): - """This method is deprecated. Please switch to AddReason.""" - return AddReason(builder, reason) -def AddMessage(builder, message): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(message), 0) -def GoodbyeAddMessage(builder, message): - """This method is deprecated. Please switch to AddMessage.""" - return AddMessage(builder, message) -def AddResumable(builder, resumable): builder.PrependBoolSlot(2, resumable, 0) -def GoodbyeAddResumable(builder, resumable): - """This method is deprecated. Please switch to AddResumable.""" - return AddResumable(builder, resumable) -def End(builder): return builder.EndObject() -def GoodbyeEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def GoodbyeStart(builder): builder.StartObject(3) +def Start(builder): + return GoodbyeStart(builder) +def GoodbyeAddReason(builder, reason): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(reason), 0) +def AddReason(builder, reason): + return GoodbyeAddReason(builder, reason) +def GoodbyeAddMessage(builder, message): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(message), 0) +def AddMessage(builder, message): + return GoodbyeAddMessage(builder, message) +def GoodbyeAddResumable(builder, resumable): builder.PrependBoolSlot(2, resumable, 0) +def AddResumable(builder, resumable): + return GoodbyeAddResumable(builder, resumable) +def GoodbyeEnd(builder): return builder.EndObject() +def End(builder): + return GoodbyeEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Hello.py b/autobahn/wamp/gen/wamp/proto/Hello.py index 2428e8625..a287038f1 100644 --- a/autobahn/wamp/gen/wamp/proto/Hello.py +++ b/autobahn/wamp/gen/wamp/proto/Hello.py @@ -115,51 +115,39 @@ def ResumeToken(self): return self._tab.String(o + self._tab.Pos) return None -def Start(builder): builder.StartObject(9) -def HelloStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRoles(builder, roles): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(roles), 0) -def HelloAddRoles(builder, roles): - """This method is deprecated. Please switch to AddRoles.""" - return AddRoles(builder, roles) -def AddRealm(builder, realm): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(realm), 0) -def HelloAddRealm(builder, realm): - """This method is deprecated. Please switch to AddRealm.""" - return AddRealm(builder, realm) -def AddAuthmethods(builder, authmethods): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(authmethods), 0) -def HelloAddAuthmethods(builder, authmethods): - """This method is deprecated. Please switch to AddAuthmethods.""" - return AddAuthmethods(builder, authmethods) -def StartAuthmethodsVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def HelloStartAuthmethodsVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartAuthmethodsVector(builder, numElems) -def AddAuthid(builder, authid): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(authid), 0) -def HelloAddAuthid(builder, authid): - """This method is deprecated. Please switch to AddAuthid.""" - return AddAuthid(builder, authid) -def AddAuthrole(builder, authrole): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(authrole), 0) -def HelloAddAuthrole(builder, authrole): - """This method is deprecated. Please switch to AddAuthrole.""" - return AddAuthrole(builder, authrole) -def AddAuthextra(builder, authextra): builder.PrependUOffsetTRelativeSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(authextra), 0) -def HelloAddAuthextra(builder, authextra): - """This method is deprecated. Please switch to AddAuthextra.""" - return AddAuthextra(builder, authextra) -def AddResumable(builder, resumable): builder.PrependBoolSlot(6, resumable, 0) -def HelloAddResumable(builder, resumable): - """This method is deprecated. Please switch to AddResumable.""" - return AddResumable(builder, resumable) -def AddResumeSession(builder, resumeSession): builder.PrependUint64Slot(7, resumeSession, 0) -def HelloAddResumeSession(builder, resumeSession): - """This method is deprecated. Please switch to AddResumeSession.""" - return AddResumeSession(builder, resumeSession) -def AddResumeToken(builder, resumeToken): builder.PrependUOffsetTRelativeSlot(8, flatbuffers.number_types.UOffsetTFlags.py_type(resumeToken), 0) -def HelloAddResumeToken(builder, resumeToken): - """This method is deprecated. Please switch to AddResumeToken.""" - return AddResumeToken(builder, resumeToken) -def End(builder): return builder.EndObject() -def HelloEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def HelloStart(builder): builder.StartObject(9) +def Start(builder): + return HelloStart(builder) +def HelloAddRoles(builder, roles): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(roles), 0) +def AddRoles(builder, roles): + return HelloAddRoles(builder, roles) +def HelloAddRealm(builder, realm): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(realm), 0) +def AddRealm(builder, realm): + return HelloAddRealm(builder, realm) +def HelloAddAuthmethods(builder, authmethods): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(authmethods), 0) +def AddAuthmethods(builder, authmethods): + return HelloAddAuthmethods(builder, authmethods) +def HelloStartAuthmethodsVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartAuthmethodsVector(builder, numElems): + return HelloStartAuthmethodsVector(builder, numElems) +def HelloAddAuthid(builder, authid): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(authid), 0) +def AddAuthid(builder, authid): + return HelloAddAuthid(builder, authid) +def HelloAddAuthrole(builder, authrole): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(authrole), 0) +def AddAuthrole(builder, authrole): + return HelloAddAuthrole(builder, authrole) +def HelloAddAuthextra(builder, authextra): builder.PrependUOffsetTRelativeSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(authextra), 0) +def AddAuthextra(builder, authextra): + return HelloAddAuthextra(builder, authextra) +def HelloAddResumable(builder, resumable): builder.PrependBoolSlot(6, resumable, 0) +def AddResumable(builder, resumable): + return HelloAddResumable(builder, resumable) +def HelloAddResumeSession(builder, resumeSession): builder.PrependUint64Slot(7, resumeSession, 0) +def AddResumeSession(builder, resumeSession): + return HelloAddResumeSession(builder, resumeSession) +def HelloAddResumeToken(builder, resumeToken): builder.PrependUOffsetTRelativeSlot(8, flatbuffers.number_types.UOffsetTFlags.py_type(resumeToken), 0) +def AddResumeToken(builder, resumeToken): + return HelloAddResumeToken(builder, resumeToken) +def HelloEnd(builder): return builder.EndObject() +def End(builder): + return HelloEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/HelloNew.py b/autobahn/wamp/gen/wamp/proto/HelloNew.py index 0c731f2f9..c79dc3c4d 100644 --- a/autobahn/wamp/gen/wamp/proto/HelloNew.py +++ b/autobahn/wamp/gen/wamp/proto/HelloNew.py @@ -135,67 +135,51 @@ def ResumeToken(self): return self._tab.String(o + self._tab.Pos) return None -def Start(builder): builder.StartObject(14) -def HelloNewStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRoles(builder, roles): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(roles), 0) -def HelloNewAddRoles(builder, roles): - """This method is deprecated. Please switch to AddRoles.""" - return AddRoles(builder, roles) -def AddRealm(builder, realm): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(realm), 0) -def HelloNewAddRealm(builder, realm): - """This method is deprecated. Please switch to AddRealm.""" - return AddRealm(builder, realm) -def AddAuthid(builder, authid): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(authid), 0) -def HelloNewAddAuthid(builder, authid): - """This method is deprecated. Please switch to AddAuthid.""" - return AddAuthid(builder, authid) -def AddAuthrole(builder, authrole): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(authrole), 0) -def HelloNewAddAuthrole(builder, authrole): - """This method is deprecated. Please switch to AddAuthrole.""" - return AddAuthrole(builder, authrole) -def AddAuthmode(builder, authmode): builder.PrependUint8Slot(4, authmode, 0) -def HelloNewAddAuthmode(builder, authmode): - """This method is deprecated. Please switch to AddAuthmode.""" - return AddAuthmode(builder, authmode) -def AddAuthfactor1Type(builder, authfactor1Type): builder.PrependUint8Slot(5, authfactor1Type, 0) -def HelloNewAddAuthfactor1Type(builder, authfactor1Type): - """This method is deprecated. Please switch to AddAuthfactor1Type.""" - return AddAuthfactor1Type(builder, authfactor1Type) -def AddAuthfactor1(builder, authfactor1): builder.PrependUOffsetTRelativeSlot(6, flatbuffers.number_types.UOffsetTFlags.py_type(authfactor1), 0) -def HelloNewAddAuthfactor1(builder, authfactor1): - """This method is deprecated. Please switch to AddAuthfactor1.""" - return AddAuthfactor1(builder, authfactor1) -def AddAuthfactor2Type(builder, authfactor2Type): builder.PrependUint8Slot(7, authfactor2Type, 0) -def HelloNewAddAuthfactor2Type(builder, authfactor2Type): - """This method is deprecated. Please switch to AddAuthfactor2Type.""" - return AddAuthfactor2Type(builder, authfactor2Type) -def AddAuthfactor2(builder, authfactor2): builder.PrependUOffsetTRelativeSlot(8, flatbuffers.number_types.UOffsetTFlags.py_type(authfactor2), 0) -def HelloNewAddAuthfactor2(builder, authfactor2): - """This method is deprecated. Please switch to AddAuthfactor2.""" - return AddAuthfactor2(builder, authfactor2) -def AddAuthfactor3Type(builder, authfactor3Type): builder.PrependUint8Slot(9, authfactor3Type, 0) -def HelloNewAddAuthfactor3Type(builder, authfactor3Type): - """This method is deprecated. Please switch to AddAuthfactor3Type.""" - return AddAuthfactor3Type(builder, authfactor3Type) -def AddAuthfactor3(builder, authfactor3): builder.PrependUOffsetTRelativeSlot(10, flatbuffers.number_types.UOffsetTFlags.py_type(authfactor3), 0) -def HelloNewAddAuthfactor3(builder, authfactor3): - """This method is deprecated. Please switch to AddAuthfactor3.""" - return AddAuthfactor3(builder, authfactor3) -def AddResumable(builder, resumable): builder.PrependBoolSlot(11, resumable, 0) -def HelloNewAddResumable(builder, resumable): - """This method is deprecated. Please switch to AddResumable.""" - return AddResumable(builder, resumable) -def AddResumeSession(builder, resumeSession): builder.PrependUint64Slot(12, resumeSession, 0) -def HelloNewAddResumeSession(builder, resumeSession): - """This method is deprecated. Please switch to AddResumeSession.""" - return AddResumeSession(builder, resumeSession) -def AddResumeToken(builder, resumeToken): builder.PrependUOffsetTRelativeSlot(13, flatbuffers.number_types.UOffsetTFlags.py_type(resumeToken), 0) -def HelloNewAddResumeToken(builder, resumeToken): - """This method is deprecated. Please switch to AddResumeToken.""" - return AddResumeToken(builder, resumeToken) -def End(builder): return builder.EndObject() -def HelloNewEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def HelloNewStart(builder): builder.StartObject(14) +def Start(builder): + return HelloNewStart(builder) +def HelloNewAddRoles(builder, roles): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(roles), 0) +def AddRoles(builder, roles): + return HelloNewAddRoles(builder, roles) +def HelloNewAddRealm(builder, realm): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(realm), 0) +def AddRealm(builder, realm): + return HelloNewAddRealm(builder, realm) +def HelloNewAddAuthid(builder, authid): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(authid), 0) +def AddAuthid(builder, authid): + return HelloNewAddAuthid(builder, authid) +def HelloNewAddAuthrole(builder, authrole): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(authrole), 0) +def AddAuthrole(builder, authrole): + return HelloNewAddAuthrole(builder, authrole) +def HelloNewAddAuthmode(builder, authmode): builder.PrependUint8Slot(4, authmode, 0) +def AddAuthmode(builder, authmode): + return HelloNewAddAuthmode(builder, authmode) +def HelloNewAddAuthfactor1Type(builder, authfactor1Type): builder.PrependUint8Slot(5, authfactor1Type, 0) +def AddAuthfactor1Type(builder, authfactor1Type): + return HelloNewAddAuthfactor1Type(builder, authfactor1Type) +def HelloNewAddAuthfactor1(builder, authfactor1): builder.PrependUOffsetTRelativeSlot(6, flatbuffers.number_types.UOffsetTFlags.py_type(authfactor1), 0) +def AddAuthfactor1(builder, authfactor1): + return HelloNewAddAuthfactor1(builder, authfactor1) +def HelloNewAddAuthfactor2Type(builder, authfactor2Type): builder.PrependUint8Slot(7, authfactor2Type, 0) +def AddAuthfactor2Type(builder, authfactor2Type): + return HelloNewAddAuthfactor2Type(builder, authfactor2Type) +def HelloNewAddAuthfactor2(builder, authfactor2): builder.PrependUOffsetTRelativeSlot(8, flatbuffers.number_types.UOffsetTFlags.py_type(authfactor2), 0) +def AddAuthfactor2(builder, authfactor2): + return HelloNewAddAuthfactor2(builder, authfactor2) +def HelloNewAddAuthfactor3Type(builder, authfactor3Type): builder.PrependUint8Slot(9, authfactor3Type, 0) +def AddAuthfactor3Type(builder, authfactor3Type): + return HelloNewAddAuthfactor3Type(builder, authfactor3Type) +def HelloNewAddAuthfactor3(builder, authfactor3): builder.PrependUOffsetTRelativeSlot(10, flatbuffers.number_types.UOffsetTFlags.py_type(authfactor3), 0) +def AddAuthfactor3(builder, authfactor3): + return HelloNewAddAuthfactor3(builder, authfactor3) +def HelloNewAddResumable(builder, resumable): builder.PrependBoolSlot(11, resumable, 0) +def AddResumable(builder, resumable): + return HelloNewAddResumable(builder, resumable) +def HelloNewAddResumeSession(builder, resumeSession): builder.PrependUint64Slot(12, resumeSession, 0) +def AddResumeSession(builder, resumeSession): + return HelloNewAddResumeSession(builder, resumeSession) +def HelloNewAddResumeToken(builder, resumeToken): builder.PrependUOffsetTRelativeSlot(13, flatbuffers.number_types.UOffsetTFlags.py_type(resumeToken), 0) +def AddResumeToken(builder, resumeToken): + return HelloNewAddResumeToken(builder, resumeToken) +def HelloNewEnd(builder): return builder.EndObject() +def End(builder): + return HelloNewEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Interrupt.py b/autobahn/wamp/gen/wamp/proto/Interrupt.py index d9c3a5164..7136188fe 100644 --- a/autobahn/wamp/gen/wamp/proto/Interrupt.py +++ b/autobahn/wamp/gen/wamp/proto/Interrupt.py @@ -69,31 +69,24 @@ def ForwardForIsNone(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10)) return o == 0 -def Start(builder): builder.StartObject(4) -def InterruptStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def InterruptAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddMode(builder, mode): builder.PrependUint8Slot(1, mode, 1) -def InterruptAddMode(builder, mode): - """This method is deprecated. Please switch to AddMode.""" - return AddMode(builder, mode) -def AddReason(builder, reason): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(reason), 0) -def InterruptAddReason(builder, reason): - """This method is deprecated. Please switch to AddReason.""" - return AddReason(builder, reason) -def AddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) -def InterruptAddForwardFor(builder, forwardFor): - """This method is deprecated. Please switch to AddForwardFor.""" - return AddForwardFor(builder, forwardFor) -def StartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) -def InterruptStartForwardForVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartForwardForVector(builder, numElems) -def End(builder): return builder.EndObject() -def InterruptEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def InterruptStart(builder): builder.StartObject(4) +def Start(builder): + return InterruptStart(builder) +def InterruptAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return InterruptAddRequest(builder, request) +def InterruptAddMode(builder, mode): builder.PrependUint8Slot(1, mode, 1) +def AddMode(builder, mode): + return InterruptAddMode(builder, mode) +def InterruptAddReason(builder, reason): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(reason), 0) +def AddReason(builder, reason): + return InterruptAddReason(builder, reason) +def InterruptAddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) +def AddForwardFor(builder, forwardFor): + return InterruptAddForwardFor(builder, forwardFor) +def InterruptStartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) +def StartForwardForVector(builder, numElems): + return InterruptStartForwardForVector(builder, numElems) +def InterruptEnd(builder): return builder.EndObject() +def End(builder): + return InterruptEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Invocation.py b/autobahn/wamp/gen/wamp/proto/Invocation.py index 1885a32a7..1b4646fcd 100644 --- a/autobahn/wamp/gen/wamp/proto/Invocation.py +++ b/autobahn/wamp/gen/wamp/proto/Invocation.py @@ -179,79 +179,60 @@ def ForwardForIsNone(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(30)) return o == 0 -def Start(builder): builder.StartObject(14) -def InvocationStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def InvocationAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddRegistration(builder, registration): builder.PrependUint64Slot(1, registration, 0) -def InvocationAddRegistration(builder, registration): - """This method is deprecated. Please switch to AddRegistration.""" - return AddRegistration(builder, registration) -def AddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) -def InvocationAddPayload(builder, payload): - """This method is deprecated. Please switch to AddPayload.""" - return AddPayload(builder, payload) -def StartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def InvocationStartPayloadVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartPayloadVector(builder, numElems) -def AddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(3, encAlgo, 0) -def InvocationAddEncAlgo(builder, encAlgo): - """This method is deprecated. Please switch to AddEncAlgo.""" - return AddEncAlgo(builder, encAlgo) -def AddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(4, encSerializer, 0) -def InvocationAddEncSerializer(builder, encSerializer): - """This method is deprecated. Please switch to AddEncSerializer.""" - return AddEncSerializer(builder, encSerializer) -def AddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) -def InvocationAddEncKey(builder, encKey): - """This method is deprecated. Please switch to AddEncKey.""" - return AddEncKey(builder, encKey) -def StartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def InvocationStartEncKeyVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartEncKeyVector(builder, numElems) -def AddProcedure(builder, procedure): builder.PrependUOffsetTRelativeSlot(6, flatbuffers.number_types.UOffsetTFlags.py_type(procedure), 0) -def InvocationAddProcedure(builder, procedure): - """This method is deprecated. Please switch to AddProcedure.""" - return AddProcedure(builder, procedure) -def AddTimeout(builder, timeout): builder.PrependUint32Slot(7, timeout, 0) -def InvocationAddTimeout(builder, timeout): - """This method is deprecated. Please switch to AddTimeout.""" - return AddTimeout(builder, timeout) -def AddReceiveProgress(builder, receiveProgress): builder.PrependBoolSlot(8, receiveProgress, 0) -def InvocationAddReceiveProgress(builder, receiveProgress): - """This method is deprecated. Please switch to AddReceiveProgress.""" - return AddReceiveProgress(builder, receiveProgress) -def AddTransactionHash(builder, transactionHash): builder.PrependUOffsetTRelativeSlot(9, flatbuffers.number_types.UOffsetTFlags.py_type(transactionHash), 0) -def InvocationAddTransactionHash(builder, transactionHash): - """This method is deprecated. Please switch to AddTransactionHash.""" - return AddTransactionHash(builder, transactionHash) -def AddCaller(builder, caller): builder.PrependUint64Slot(10, caller, 0) -def InvocationAddCaller(builder, caller): - """This method is deprecated. Please switch to AddCaller.""" - return AddCaller(builder, caller) -def AddCallerAuthid(builder, callerAuthid): builder.PrependUOffsetTRelativeSlot(11, flatbuffers.number_types.UOffsetTFlags.py_type(callerAuthid), 0) -def InvocationAddCallerAuthid(builder, callerAuthid): - """This method is deprecated. Please switch to AddCallerAuthid.""" - return AddCallerAuthid(builder, callerAuthid) -def AddCallerAuthrole(builder, callerAuthrole): builder.PrependUOffsetTRelativeSlot(12, flatbuffers.number_types.UOffsetTFlags.py_type(callerAuthrole), 0) -def InvocationAddCallerAuthrole(builder, callerAuthrole): - """This method is deprecated. Please switch to AddCallerAuthrole.""" - return AddCallerAuthrole(builder, callerAuthrole) -def AddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(13, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) -def InvocationAddForwardFor(builder, forwardFor): - """This method is deprecated. Please switch to AddForwardFor.""" - return AddForwardFor(builder, forwardFor) -def StartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) -def InvocationStartForwardForVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartForwardForVector(builder, numElems) -def End(builder): return builder.EndObject() -def InvocationEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def InvocationStart(builder): builder.StartObject(14) +def Start(builder): + return InvocationStart(builder) +def InvocationAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return InvocationAddRequest(builder, request) +def InvocationAddRegistration(builder, registration): builder.PrependUint64Slot(1, registration, 0) +def AddRegistration(builder, registration): + return InvocationAddRegistration(builder, registration) +def InvocationAddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) +def AddPayload(builder, payload): + return InvocationAddPayload(builder, payload) +def InvocationStartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartPayloadVector(builder, numElems): + return InvocationStartPayloadVector(builder, numElems) +def InvocationAddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(3, encAlgo, 0) +def AddEncAlgo(builder, encAlgo): + return InvocationAddEncAlgo(builder, encAlgo) +def InvocationAddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(4, encSerializer, 0) +def AddEncSerializer(builder, encSerializer): + return InvocationAddEncSerializer(builder, encSerializer) +def InvocationAddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) +def AddEncKey(builder, encKey): + return InvocationAddEncKey(builder, encKey) +def InvocationStartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartEncKeyVector(builder, numElems): + return InvocationStartEncKeyVector(builder, numElems) +def InvocationAddProcedure(builder, procedure): builder.PrependUOffsetTRelativeSlot(6, flatbuffers.number_types.UOffsetTFlags.py_type(procedure), 0) +def AddProcedure(builder, procedure): + return InvocationAddProcedure(builder, procedure) +def InvocationAddTimeout(builder, timeout): builder.PrependUint32Slot(7, timeout, 0) +def AddTimeout(builder, timeout): + return InvocationAddTimeout(builder, timeout) +def InvocationAddReceiveProgress(builder, receiveProgress): builder.PrependBoolSlot(8, receiveProgress, 0) +def AddReceiveProgress(builder, receiveProgress): + return InvocationAddReceiveProgress(builder, receiveProgress) +def InvocationAddTransactionHash(builder, transactionHash): builder.PrependUOffsetTRelativeSlot(9, flatbuffers.number_types.UOffsetTFlags.py_type(transactionHash), 0) +def AddTransactionHash(builder, transactionHash): + return InvocationAddTransactionHash(builder, transactionHash) +def InvocationAddCaller(builder, caller): builder.PrependUint64Slot(10, caller, 0) +def AddCaller(builder, caller): + return InvocationAddCaller(builder, caller) +def InvocationAddCallerAuthid(builder, callerAuthid): builder.PrependUOffsetTRelativeSlot(11, flatbuffers.number_types.UOffsetTFlags.py_type(callerAuthid), 0) +def AddCallerAuthid(builder, callerAuthid): + return InvocationAddCallerAuthid(builder, callerAuthid) +def InvocationAddCallerAuthrole(builder, callerAuthrole): builder.PrependUOffsetTRelativeSlot(12, flatbuffers.number_types.UOffsetTFlags.py_type(callerAuthrole), 0) +def AddCallerAuthrole(builder, callerAuthrole): + return InvocationAddCallerAuthrole(builder, callerAuthrole) +def InvocationAddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(13, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) +def AddForwardFor(builder, forwardFor): + return InvocationAddForwardFor(builder, forwardFor) +def InvocationStartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) +def StartForwardForVector(builder, numElems): + return InvocationStartForwardForVector(builder, numElems) +def InvocationEnd(builder): return builder.EndObject() +def End(builder): + return InvocationEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/InvocationPolicy.py b/autobahn/wamp/gen/wamp/proto/InvocationPolicy.py index 1855d97af..1de22728d 100644 --- a/autobahn/wamp/gen/wamp/proto/InvocationPolicy.py +++ b/autobahn/wamp/gen/wamp/proto/InvocationPolicy.py @@ -8,4 +8,3 @@ class InvocationPolicy(object): LAST = 2 ROUNDROBIN = 3 RANDOM = 4 - diff --git a/autobahn/wamp/gen/wamp/proto/Kdf.py b/autobahn/wamp/gen/wamp/proto/Kdf.py index da420a1c7..32a5dcb7b 100644 --- a/autobahn/wamp/gen/wamp/proto/Kdf.py +++ b/autobahn/wamp/gen/wamp/proto/Kdf.py @@ -6,4 +6,3 @@ class Kdf(object): NONE = 0 PBKDF2 = 1 ARGON2 = 2 - diff --git a/autobahn/wamp/gen/wamp/proto/Match.py b/autobahn/wamp/gen/wamp/proto/Match.py index cbe3d69d7..7b4cf4c37 100644 --- a/autobahn/wamp/gen/wamp/proto/Match.py +++ b/autobahn/wamp/gen/wamp/proto/Match.py @@ -6,4 +6,3 @@ class Match(object): EXACT = 0 PREFIX = 1 WILDCARD = 2 - diff --git a/autobahn/wamp/gen/wamp/proto/Message.py b/autobahn/wamp/gen/wamp/proto/Message.py index 5dca1193d..0fb3afb30 100644 --- a/autobahn/wamp/gen/wamp/proto/Message.py +++ b/autobahn/wamp/gen/wamp/proto/Message.py @@ -41,19 +41,15 @@ def Msg(self): return obj return None -def Start(builder): builder.StartObject(2) -def MessageStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddMsgType(builder, msgType): builder.PrependUint8Slot(0, msgType, 0) -def MessageAddMsgType(builder, msgType): - """This method is deprecated. Please switch to AddMsgType.""" - return AddMsgType(builder, msgType) -def AddMsg(builder, msg): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(msg), 0) -def MessageAddMsg(builder, msg): - """This method is deprecated. Please switch to AddMsg.""" - return AddMsg(builder, msg) -def End(builder): return builder.EndObject() -def MessageEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def MessageStart(builder): builder.StartObject(2) +def Start(builder): + return MessageStart(builder) +def MessageAddMsgType(builder, msgType): builder.PrependUint8Slot(0, msgType, 0) +def AddMsgType(builder, msgType): + return MessageAddMsgType(builder, msgType) +def MessageAddMsg(builder, msg): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(msg), 0) +def AddMsg(builder, msg): + return MessageAddMsg(builder, msg) +def MessageEnd(builder): return builder.EndObject() +def End(builder): + return MessageEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/MessageType.py b/autobahn/wamp/gen/wamp/proto/MessageType.py index 3f8ebf95d..401399823 100644 --- a/autobahn/wamp/gen/wamp/proto/MessageType.py +++ b/autobahn/wamp/gen/wamp/proto/MessageType.py @@ -30,4 +30,3 @@ class MessageType(object): INVOCATION = 68 INTERRUPT = 69 YIELD = 70 - diff --git a/autobahn/wamp/gen/wamp/proto/Payload.py b/autobahn/wamp/gen/wamp/proto/Payload.py index ef50a9e08..ddf96f120 100644 --- a/autobahn/wamp/gen/wamp/proto/Payload.py +++ b/autobahn/wamp/gen/wamp/proto/Payload.py @@ -6,4 +6,3 @@ class Payload(object): PLAIN = 0 CRYPTOBOX = 1 OPAQUE = 2 - diff --git a/autobahn/wamp/gen/wamp/proto/Publish.py b/autobahn/wamp/gen/wamp/proto/Publish.py index f18548591..1434c4bc0 100644 --- a/autobahn/wamp/gen/wamp/proto/Publish.py +++ b/autobahn/wamp/gen/wamp/proto/Publish.py @@ -349,131 +349,99 @@ def ForwardForIsNone(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(40)) return o == 0 -def Start(builder): builder.StartObject(19) -def PublishStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def PublishAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddTopic(builder, topic): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(topic), 0) -def PublishAddTopic(builder, topic): - """This method is deprecated. Please switch to AddTopic.""" - return AddTopic(builder, topic) -def AddArgs(builder, args): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(args), 0) -def PublishAddArgs(builder, args): - """This method is deprecated. Please switch to AddArgs.""" - return AddArgs(builder, args) -def StartArgsVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def PublishStartArgsVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartArgsVector(builder, numElems) -def AddKwargs(builder, kwargs): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(kwargs), 0) -def PublishAddKwargs(builder, kwargs): - """This method is deprecated. Please switch to AddKwargs.""" - return AddKwargs(builder, kwargs) -def StartKwargsVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def PublishStartKwargsVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartKwargsVector(builder, numElems) -def AddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) -def PublishAddPayload(builder, payload): - """This method is deprecated. Please switch to AddPayload.""" - return AddPayload(builder, payload) -def StartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def PublishStartPayloadVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartPayloadVector(builder, numElems) -def AddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(5, encAlgo, 0) -def PublishAddEncAlgo(builder, encAlgo): - """This method is deprecated. Please switch to AddEncAlgo.""" - return AddEncAlgo(builder, encAlgo) -def AddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(6, encSerializer, 0) -def PublishAddEncSerializer(builder, encSerializer): - """This method is deprecated. Please switch to AddEncSerializer.""" - return AddEncSerializer(builder, encSerializer) -def AddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) -def PublishAddEncKey(builder, encKey): - """This method is deprecated. Please switch to AddEncKey.""" - return AddEncKey(builder, encKey) -def StartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def PublishStartEncKeyVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartEncKeyVector(builder, numElems) -def AddAcknowledge(builder, acknowledge): builder.PrependBoolSlot(8, acknowledge, 0) -def PublishAddAcknowledge(builder, acknowledge): - """This method is deprecated. Please switch to AddAcknowledge.""" - return AddAcknowledge(builder, acknowledge) -def AddExcludeMe(builder, excludeMe): builder.PrependBoolSlot(9, excludeMe, 1) -def PublishAddExcludeMe(builder, excludeMe): - """This method is deprecated. Please switch to AddExcludeMe.""" - return AddExcludeMe(builder, excludeMe) -def AddExclude(builder, exclude): builder.PrependUOffsetTRelativeSlot(10, flatbuffers.number_types.UOffsetTFlags.py_type(exclude), 0) -def PublishAddExclude(builder, exclude): - """This method is deprecated. Please switch to AddExclude.""" - return AddExclude(builder, exclude) -def StartExcludeVector(builder, numElems): return builder.StartVector(8, numElems, 8) -def PublishStartExcludeVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartExcludeVector(builder, numElems) -def AddExcludeAuthid(builder, excludeAuthid): builder.PrependUOffsetTRelativeSlot(11, flatbuffers.number_types.UOffsetTFlags.py_type(excludeAuthid), 0) -def PublishAddExcludeAuthid(builder, excludeAuthid): - """This method is deprecated. Please switch to AddExcludeAuthid.""" - return AddExcludeAuthid(builder, excludeAuthid) -def StartExcludeAuthidVector(builder, numElems): return builder.StartVector(4, numElems, 4) -def PublishStartExcludeAuthidVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartExcludeAuthidVector(builder, numElems) -def AddExcludeAuthrole(builder, excludeAuthrole): builder.PrependUOffsetTRelativeSlot(12, flatbuffers.number_types.UOffsetTFlags.py_type(excludeAuthrole), 0) -def PublishAddExcludeAuthrole(builder, excludeAuthrole): - """This method is deprecated. Please switch to AddExcludeAuthrole.""" - return AddExcludeAuthrole(builder, excludeAuthrole) -def StartExcludeAuthroleVector(builder, numElems): return builder.StartVector(4, numElems, 4) -def PublishStartExcludeAuthroleVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartExcludeAuthroleVector(builder, numElems) -def AddEligible(builder, eligible): builder.PrependUOffsetTRelativeSlot(13, flatbuffers.number_types.UOffsetTFlags.py_type(eligible), 0) -def PublishAddEligible(builder, eligible): - """This method is deprecated. Please switch to AddEligible.""" - return AddEligible(builder, eligible) -def StartEligibleVector(builder, numElems): return builder.StartVector(8, numElems, 8) -def PublishStartEligibleVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartEligibleVector(builder, numElems) -def AddEligibleAuthid(builder, eligibleAuthid): builder.PrependUOffsetTRelativeSlot(14, flatbuffers.number_types.UOffsetTFlags.py_type(eligibleAuthid), 0) -def PublishAddEligibleAuthid(builder, eligibleAuthid): - """This method is deprecated. Please switch to AddEligibleAuthid.""" - return AddEligibleAuthid(builder, eligibleAuthid) -def StartEligibleAuthidVector(builder, numElems): return builder.StartVector(4, numElems, 4) -def PublishStartEligibleAuthidVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartEligibleAuthidVector(builder, numElems) -def AddEligibleAuthrole(builder, eligibleAuthrole): builder.PrependUOffsetTRelativeSlot(15, flatbuffers.number_types.UOffsetTFlags.py_type(eligibleAuthrole), 0) -def PublishAddEligibleAuthrole(builder, eligibleAuthrole): - """This method is deprecated. Please switch to AddEligibleAuthrole.""" - return AddEligibleAuthrole(builder, eligibleAuthrole) -def StartEligibleAuthroleVector(builder, numElems): return builder.StartVector(4, numElems, 4) -def PublishStartEligibleAuthroleVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartEligibleAuthroleVector(builder, numElems) -def AddRetain(builder, retain): builder.PrependBoolSlot(16, retain, 0) -def PublishAddRetain(builder, retain): - """This method is deprecated. Please switch to AddRetain.""" - return AddRetain(builder, retain) -def AddTransactionHash(builder, transactionHash): builder.PrependUOffsetTRelativeSlot(17, flatbuffers.number_types.UOffsetTFlags.py_type(transactionHash), 0) -def PublishAddTransactionHash(builder, transactionHash): - """This method is deprecated. Please switch to AddTransactionHash.""" - return AddTransactionHash(builder, transactionHash) -def AddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(18, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) -def PublishAddForwardFor(builder, forwardFor): - """This method is deprecated. Please switch to AddForwardFor.""" - return AddForwardFor(builder, forwardFor) -def StartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) -def PublishStartForwardForVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartForwardForVector(builder, numElems) -def End(builder): return builder.EndObject() -def PublishEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def PublishStart(builder): builder.StartObject(19) +def Start(builder): + return PublishStart(builder) +def PublishAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return PublishAddRequest(builder, request) +def PublishAddTopic(builder, topic): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(topic), 0) +def AddTopic(builder, topic): + return PublishAddTopic(builder, topic) +def PublishAddArgs(builder, args): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(args), 0) +def AddArgs(builder, args): + return PublishAddArgs(builder, args) +def PublishStartArgsVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartArgsVector(builder, numElems): + return PublishStartArgsVector(builder, numElems) +def PublishAddKwargs(builder, kwargs): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(kwargs), 0) +def AddKwargs(builder, kwargs): + return PublishAddKwargs(builder, kwargs) +def PublishStartKwargsVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartKwargsVector(builder, numElems): + return PublishStartKwargsVector(builder, numElems) +def PublishAddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) +def AddPayload(builder, payload): + return PublishAddPayload(builder, payload) +def PublishStartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartPayloadVector(builder, numElems): + return PublishStartPayloadVector(builder, numElems) +def PublishAddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(5, encAlgo, 0) +def AddEncAlgo(builder, encAlgo): + return PublishAddEncAlgo(builder, encAlgo) +def PublishAddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(6, encSerializer, 0) +def AddEncSerializer(builder, encSerializer): + return PublishAddEncSerializer(builder, encSerializer) +def PublishAddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) +def AddEncKey(builder, encKey): + return PublishAddEncKey(builder, encKey) +def PublishStartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartEncKeyVector(builder, numElems): + return PublishStartEncKeyVector(builder, numElems) +def PublishAddAcknowledge(builder, acknowledge): builder.PrependBoolSlot(8, acknowledge, 0) +def AddAcknowledge(builder, acknowledge): + return PublishAddAcknowledge(builder, acknowledge) +def PublishAddExcludeMe(builder, excludeMe): builder.PrependBoolSlot(9, excludeMe, 1) +def AddExcludeMe(builder, excludeMe): + return PublishAddExcludeMe(builder, excludeMe) +def PublishAddExclude(builder, exclude): builder.PrependUOffsetTRelativeSlot(10, flatbuffers.number_types.UOffsetTFlags.py_type(exclude), 0) +def AddExclude(builder, exclude): + return PublishAddExclude(builder, exclude) +def PublishStartExcludeVector(builder, numElems): return builder.StartVector(8, numElems, 8) +def StartExcludeVector(builder, numElems): + return PublishStartExcludeVector(builder, numElems) +def PublishAddExcludeAuthid(builder, excludeAuthid): builder.PrependUOffsetTRelativeSlot(11, flatbuffers.number_types.UOffsetTFlags.py_type(excludeAuthid), 0) +def AddExcludeAuthid(builder, excludeAuthid): + return PublishAddExcludeAuthid(builder, excludeAuthid) +def PublishStartExcludeAuthidVector(builder, numElems): return builder.StartVector(4, numElems, 4) +def StartExcludeAuthidVector(builder, numElems): + return PublishStartExcludeAuthidVector(builder, numElems) +def PublishAddExcludeAuthrole(builder, excludeAuthrole): builder.PrependUOffsetTRelativeSlot(12, flatbuffers.number_types.UOffsetTFlags.py_type(excludeAuthrole), 0) +def AddExcludeAuthrole(builder, excludeAuthrole): + return PublishAddExcludeAuthrole(builder, excludeAuthrole) +def PublishStartExcludeAuthroleVector(builder, numElems): return builder.StartVector(4, numElems, 4) +def StartExcludeAuthroleVector(builder, numElems): + return PublishStartExcludeAuthroleVector(builder, numElems) +def PublishAddEligible(builder, eligible): builder.PrependUOffsetTRelativeSlot(13, flatbuffers.number_types.UOffsetTFlags.py_type(eligible), 0) +def AddEligible(builder, eligible): + return PublishAddEligible(builder, eligible) +def PublishStartEligibleVector(builder, numElems): return builder.StartVector(8, numElems, 8) +def StartEligibleVector(builder, numElems): + return PublishStartEligibleVector(builder, numElems) +def PublishAddEligibleAuthid(builder, eligibleAuthid): builder.PrependUOffsetTRelativeSlot(14, flatbuffers.number_types.UOffsetTFlags.py_type(eligibleAuthid), 0) +def AddEligibleAuthid(builder, eligibleAuthid): + return PublishAddEligibleAuthid(builder, eligibleAuthid) +def PublishStartEligibleAuthidVector(builder, numElems): return builder.StartVector(4, numElems, 4) +def StartEligibleAuthidVector(builder, numElems): + return PublishStartEligibleAuthidVector(builder, numElems) +def PublishAddEligibleAuthrole(builder, eligibleAuthrole): builder.PrependUOffsetTRelativeSlot(15, flatbuffers.number_types.UOffsetTFlags.py_type(eligibleAuthrole), 0) +def AddEligibleAuthrole(builder, eligibleAuthrole): + return PublishAddEligibleAuthrole(builder, eligibleAuthrole) +def PublishStartEligibleAuthroleVector(builder, numElems): return builder.StartVector(4, numElems, 4) +def StartEligibleAuthroleVector(builder, numElems): + return PublishStartEligibleAuthroleVector(builder, numElems) +def PublishAddRetain(builder, retain): builder.PrependBoolSlot(16, retain, 0) +def AddRetain(builder, retain): + return PublishAddRetain(builder, retain) +def PublishAddTransactionHash(builder, transactionHash): builder.PrependUOffsetTRelativeSlot(17, flatbuffers.number_types.UOffsetTFlags.py_type(transactionHash), 0) +def AddTransactionHash(builder, transactionHash): + return PublishAddTransactionHash(builder, transactionHash) +def PublishAddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(18, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) +def AddForwardFor(builder, forwardFor): + return PublishAddForwardFor(builder, forwardFor) +def PublishStartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) +def StartForwardForVector(builder, numElems): + return PublishStartForwardForVector(builder, numElems) +def PublishEnd(builder): return builder.EndObject() +def End(builder): + return PublishEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Published.py b/autobahn/wamp/gen/wamp/proto/Published.py index 53c475710..a8678c868 100644 --- a/autobahn/wamp/gen/wamp/proto/Published.py +++ b/autobahn/wamp/gen/wamp/proto/Published.py @@ -38,19 +38,15 @@ def Publication(self): return self._tab.Get(flatbuffers.number_types.Uint64Flags, o + self._tab.Pos) return 0 -def Start(builder): builder.StartObject(2) -def PublishedStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def PublishedAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddPublication(builder, publication): builder.PrependUint64Slot(1, publication, 0) -def PublishedAddPublication(builder, publication): - """This method is deprecated. Please switch to AddPublication.""" - return AddPublication(builder, publication) -def End(builder): return builder.EndObject() -def PublishedEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def PublishedStart(builder): builder.StartObject(2) +def Start(builder): + return PublishedStart(builder) +def PublishedAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return PublishedAddRequest(builder, request) +def PublishedAddPublication(builder, publication): builder.PrependUint64Slot(1, publication, 0) +def AddPublication(builder, publication): + return PublishedAddPublication(builder, publication) +def PublishedEnd(builder): return builder.EndObject() +def End(builder): + return PublishedEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/PublisherFeatures.py b/autobahn/wamp/gen/wamp/proto/PublisherFeatures.py index 0ac12fbe8..e6e277a17 100644 --- a/autobahn/wamp/gen/wamp/proto/PublisherFeatures.py +++ b/autobahn/wamp/gen/wamp/proto/PublisherFeatures.py @@ -66,35 +66,27 @@ def PayloadEncryptionCryptobox(self): return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos)) return False -def Start(builder): builder.StartObject(6) -def PublisherFeaturesStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddPublisherIdentification(builder, publisherIdentification): builder.PrependBoolSlot(0, publisherIdentification, 0) -def PublisherFeaturesAddPublisherIdentification(builder, publisherIdentification): - """This method is deprecated. Please switch to AddPublisherIdentification.""" - return AddPublisherIdentification(builder, publisherIdentification) -def AddPublisherExclusion(builder, publisherExclusion): builder.PrependBoolSlot(1, publisherExclusion, 0) -def PublisherFeaturesAddPublisherExclusion(builder, publisherExclusion): - """This method is deprecated. Please switch to AddPublisherExclusion.""" - return AddPublisherExclusion(builder, publisherExclusion) -def AddSubscriberBlackwhiteListing(builder, subscriberBlackwhiteListing): builder.PrependBoolSlot(2, subscriberBlackwhiteListing, 0) -def PublisherFeaturesAddSubscriberBlackwhiteListing(builder, subscriberBlackwhiteListing): - """This method is deprecated. Please switch to AddSubscriberBlackwhiteListing.""" - return AddSubscriberBlackwhiteListing(builder, subscriberBlackwhiteListing) -def AddAcknowledgeEventReceived(builder, acknowledgeEventReceived): builder.PrependBoolSlot(3, acknowledgeEventReceived, 0) -def PublisherFeaturesAddAcknowledgeEventReceived(builder, acknowledgeEventReceived): - """This method is deprecated. Please switch to AddAcknowledgeEventReceived.""" - return AddAcknowledgeEventReceived(builder, acknowledgeEventReceived) -def AddPayloadTransparency(builder, payloadTransparency): builder.PrependBoolSlot(4, payloadTransparency, 0) -def PublisherFeaturesAddPayloadTransparency(builder, payloadTransparency): - """This method is deprecated. Please switch to AddPayloadTransparency.""" - return AddPayloadTransparency(builder, payloadTransparency) -def AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): builder.PrependBoolSlot(5, payloadEncryptionCryptobox, 0) -def PublisherFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): - """This method is deprecated. Please switch to AddPayloadEncryptionCryptobox.""" - return AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox) -def End(builder): return builder.EndObject() -def PublisherFeaturesEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def PublisherFeaturesStart(builder): builder.StartObject(6) +def Start(builder): + return PublisherFeaturesStart(builder) +def PublisherFeaturesAddPublisherIdentification(builder, publisherIdentification): builder.PrependBoolSlot(0, publisherIdentification, 0) +def AddPublisherIdentification(builder, publisherIdentification): + return PublisherFeaturesAddPublisherIdentification(builder, publisherIdentification) +def PublisherFeaturesAddPublisherExclusion(builder, publisherExclusion): builder.PrependBoolSlot(1, publisherExclusion, 0) +def AddPublisherExclusion(builder, publisherExclusion): + return PublisherFeaturesAddPublisherExclusion(builder, publisherExclusion) +def PublisherFeaturesAddSubscriberBlackwhiteListing(builder, subscriberBlackwhiteListing): builder.PrependBoolSlot(2, subscriberBlackwhiteListing, 0) +def AddSubscriberBlackwhiteListing(builder, subscriberBlackwhiteListing): + return PublisherFeaturesAddSubscriberBlackwhiteListing(builder, subscriberBlackwhiteListing) +def PublisherFeaturesAddAcknowledgeEventReceived(builder, acknowledgeEventReceived): builder.PrependBoolSlot(3, acknowledgeEventReceived, 0) +def AddAcknowledgeEventReceived(builder, acknowledgeEventReceived): + return PublisherFeaturesAddAcknowledgeEventReceived(builder, acknowledgeEventReceived) +def PublisherFeaturesAddPayloadTransparency(builder, payloadTransparency): builder.PrependBoolSlot(4, payloadTransparency, 0) +def AddPayloadTransparency(builder, payloadTransparency): + return PublisherFeaturesAddPayloadTransparency(builder, payloadTransparency) +def PublisherFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): builder.PrependBoolSlot(5, payloadEncryptionCryptobox, 0) +def AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): + return PublisherFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox) +def PublisherFeaturesEnd(builder): return builder.EndObject() +def End(builder): + return PublisherFeaturesEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Register.py b/autobahn/wamp/gen/wamp/proto/Register.py index e155c2800..55c27cbe7 100644 --- a/autobahn/wamp/gen/wamp/proto/Register.py +++ b/autobahn/wamp/gen/wamp/proto/Register.py @@ -66,35 +66,27 @@ def ForceReregister(self): return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos)) return False -def Start(builder): builder.StartObject(6) -def RegisterStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def RegisterAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddProcedure(builder, procedure): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(procedure), 0) -def RegisterAddProcedure(builder, procedure): - """This method is deprecated. Please switch to AddProcedure.""" - return AddProcedure(builder, procedure) -def AddMatch(builder, match): builder.PrependUint8Slot(2, match, 0) -def RegisterAddMatch(builder, match): - """This method is deprecated. Please switch to AddMatch.""" - return AddMatch(builder, match) -def AddInvoke(builder, invoke): builder.PrependUint8Slot(3, invoke, 0) -def RegisterAddInvoke(builder, invoke): - """This method is deprecated. Please switch to AddInvoke.""" - return AddInvoke(builder, invoke) -def AddConcurrency(builder, concurrency): builder.PrependUint16Slot(4, concurrency, 0) -def RegisterAddConcurrency(builder, concurrency): - """This method is deprecated. Please switch to AddConcurrency.""" - return AddConcurrency(builder, concurrency) -def AddForceReregister(builder, forceReregister): builder.PrependBoolSlot(5, forceReregister, 0) -def RegisterAddForceReregister(builder, forceReregister): - """This method is deprecated. Please switch to AddForceReregister.""" - return AddForceReregister(builder, forceReregister) -def End(builder): return builder.EndObject() -def RegisterEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def RegisterStart(builder): builder.StartObject(6) +def Start(builder): + return RegisterStart(builder) +def RegisterAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return RegisterAddRequest(builder, request) +def RegisterAddProcedure(builder, procedure): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(procedure), 0) +def AddProcedure(builder, procedure): + return RegisterAddProcedure(builder, procedure) +def RegisterAddMatch(builder, match): builder.PrependUint8Slot(2, match, 0) +def AddMatch(builder, match): + return RegisterAddMatch(builder, match) +def RegisterAddInvoke(builder, invoke): builder.PrependUint8Slot(3, invoke, 0) +def AddInvoke(builder, invoke): + return RegisterAddInvoke(builder, invoke) +def RegisterAddConcurrency(builder, concurrency): builder.PrependUint16Slot(4, concurrency, 0) +def AddConcurrency(builder, concurrency): + return RegisterAddConcurrency(builder, concurrency) +def RegisterAddForceReregister(builder, forceReregister): builder.PrependBoolSlot(5, forceReregister, 0) +def AddForceReregister(builder, forceReregister): + return RegisterAddForceReregister(builder, forceReregister) +def RegisterEnd(builder): return builder.EndObject() +def End(builder): + return RegisterEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Registered.py b/autobahn/wamp/gen/wamp/proto/Registered.py index df23400f9..064995f87 100644 --- a/autobahn/wamp/gen/wamp/proto/Registered.py +++ b/autobahn/wamp/gen/wamp/proto/Registered.py @@ -38,19 +38,15 @@ def Registration(self): return self._tab.Get(flatbuffers.number_types.Uint64Flags, o + self._tab.Pos) return 0 -def Start(builder): builder.StartObject(2) -def RegisteredStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def RegisteredAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddRegistration(builder, registration): builder.PrependUint64Slot(1, registration, 0) -def RegisteredAddRegistration(builder, registration): - """This method is deprecated. Please switch to AddRegistration.""" - return AddRegistration(builder, registration) -def End(builder): return builder.EndObject() -def RegisteredEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def RegisteredStart(builder): builder.StartObject(2) +def Start(builder): + return RegisteredStart(builder) +def RegisteredAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return RegisteredAddRequest(builder, request) +def RegisteredAddRegistration(builder, registration): builder.PrependUint64Slot(1, registration, 0) +def AddRegistration(builder, registration): + return RegisteredAddRegistration(builder, registration) +def RegisteredEnd(builder): return builder.EndObject() +def End(builder): + return RegisteredEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Result.py b/autobahn/wamp/gen/wamp/proto/Result.py index a8cfd286a..09e441fbe 100644 --- a/autobahn/wamp/gen/wamp/proto/Result.py +++ b/autobahn/wamp/gen/wamp/proto/Result.py @@ -151,63 +151,48 @@ def ForwardForIsNone(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(22)) return o == 0 -def Start(builder): builder.StartObject(10) -def ResultStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def ResultAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) -def ResultAddPayload(builder, payload): - """This method is deprecated. Please switch to AddPayload.""" - return AddPayload(builder, payload) -def StartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def ResultStartPayloadVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartPayloadVector(builder, numElems) -def AddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(2, encAlgo, 0) -def ResultAddEncAlgo(builder, encAlgo): - """This method is deprecated. Please switch to AddEncAlgo.""" - return AddEncAlgo(builder, encAlgo) -def AddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(3, encSerializer, 0) -def ResultAddEncSerializer(builder, encSerializer): - """This method is deprecated. Please switch to AddEncSerializer.""" - return AddEncSerializer(builder, encSerializer) -def AddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) -def ResultAddEncKey(builder, encKey): - """This method is deprecated. Please switch to AddEncKey.""" - return AddEncKey(builder, encKey) -def StartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def ResultStartEncKeyVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartEncKeyVector(builder, numElems) -def AddProgress(builder, progress): builder.PrependBoolSlot(5, progress, 0) -def ResultAddProgress(builder, progress): - """This method is deprecated. Please switch to AddProgress.""" - return AddProgress(builder, progress) -def AddCallee(builder, callee): builder.PrependUint64Slot(6, callee, 0) -def ResultAddCallee(builder, callee): - """This method is deprecated. Please switch to AddCallee.""" - return AddCallee(builder, callee) -def AddCalleeAuthid(builder, calleeAuthid): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(calleeAuthid), 0) -def ResultAddCalleeAuthid(builder, calleeAuthid): - """This method is deprecated. Please switch to AddCalleeAuthid.""" - return AddCalleeAuthid(builder, calleeAuthid) -def AddCalleeAuthrole(builder, calleeAuthrole): builder.PrependUOffsetTRelativeSlot(8, flatbuffers.number_types.UOffsetTFlags.py_type(calleeAuthrole), 0) -def ResultAddCalleeAuthrole(builder, calleeAuthrole): - """This method is deprecated. Please switch to AddCalleeAuthrole.""" - return AddCalleeAuthrole(builder, calleeAuthrole) -def AddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(9, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) -def ResultAddForwardFor(builder, forwardFor): - """This method is deprecated. Please switch to AddForwardFor.""" - return AddForwardFor(builder, forwardFor) -def StartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) -def ResultStartForwardForVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartForwardForVector(builder, numElems) -def End(builder): return builder.EndObject() -def ResultEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def ResultStart(builder): builder.StartObject(10) +def Start(builder): + return ResultStart(builder) +def ResultAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return ResultAddRequest(builder, request) +def ResultAddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) +def AddPayload(builder, payload): + return ResultAddPayload(builder, payload) +def ResultStartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartPayloadVector(builder, numElems): + return ResultStartPayloadVector(builder, numElems) +def ResultAddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(2, encAlgo, 0) +def AddEncAlgo(builder, encAlgo): + return ResultAddEncAlgo(builder, encAlgo) +def ResultAddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(3, encSerializer, 0) +def AddEncSerializer(builder, encSerializer): + return ResultAddEncSerializer(builder, encSerializer) +def ResultAddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) +def AddEncKey(builder, encKey): + return ResultAddEncKey(builder, encKey) +def ResultStartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartEncKeyVector(builder, numElems): + return ResultStartEncKeyVector(builder, numElems) +def ResultAddProgress(builder, progress): builder.PrependBoolSlot(5, progress, 0) +def AddProgress(builder, progress): + return ResultAddProgress(builder, progress) +def ResultAddCallee(builder, callee): builder.PrependUint64Slot(6, callee, 0) +def AddCallee(builder, callee): + return ResultAddCallee(builder, callee) +def ResultAddCalleeAuthid(builder, calleeAuthid): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(calleeAuthid), 0) +def AddCalleeAuthid(builder, calleeAuthid): + return ResultAddCalleeAuthid(builder, calleeAuthid) +def ResultAddCalleeAuthrole(builder, calleeAuthrole): builder.PrependUOffsetTRelativeSlot(8, flatbuffers.number_types.UOffsetTFlags.py_type(calleeAuthrole), 0) +def AddCalleeAuthrole(builder, calleeAuthrole): + return ResultAddCalleeAuthrole(builder, calleeAuthrole) +def ResultAddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(9, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) +def AddForwardFor(builder, forwardFor): + return ResultAddForwardFor(builder, forwardFor) +def ResultStartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) +def StartForwardForVector(builder, numElems): + return ResultStartForwardForVector(builder, numElems) +def ResultEnd(builder): return builder.EndObject() +def End(builder): + return ResultEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/RouterRoles.py b/autobahn/wamp/gen/wamp/proto/RouterRoles.py index 8c390ebb4..eba7aaab7 100644 --- a/autobahn/wamp/gen/wamp/proto/RouterRoles.py +++ b/autobahn/wamp/gen/wamp/proto/RouterRoles.py @@ -46,19 +46,15 @@ def Dealer(self): return obj return None -def Start(builder): builder.StartObject(2) -def RouterRolesStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddBroker(builder, broker): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(broker), 0) -def RouterRolesAddBroker(builder, broker): - """This method is deprecated. Please switch to AddBroker.""" - return AddBroker(builder, broker) -def AddDealer(builder, dealer): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(dealer), 0) -def RouterRolesAddDealer(builder, dealer): - """This method is deprecated. Please switch to AddDealer.""" - return AddDealer(builder, dealer) -def End(builder): return builder.EndObject() -def RouterRolesEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def RouterRolesStart(builder): builder.StartObject(2) +def Start(builder): + return RouterRolesStart(builder) +def RouterRolesAddBroker(builder, broker): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(broker), 0) +def AddBroker(builder, broker): + return RouterRolesAddBroker(builder, broker) +def RouterRolesAddDealer(builder, dealer): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(dealer), 0) +def AddDealer(builder, dealer): + return RouterRolesAddDealer(builder, dealer) +def RouterRolesEnd(builder): return builder.EndObject() +def End(builder): + return RouterRolesEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Serializer.py b/autobahn/wamp/gen/wamp/proto/Serializer.py index c3c5b9dd1..9c651e887 100644 --- a/autobahn/wamp/gen/wamp/proto/Serializer.py +++ b/autobahn/wamp/gen/wamp/proto/Serializer.py @@ -10,4 +10,3 @@ class Serializer(object): UBJSON = 4 OPAQUE = 5 FLATBUFFERS = 6 - diff --git a/autobahn/wamp/gen/wamp/proto/Subscribe.py b/autobahn/wamp/gen/wamp/proto/Subscribe.py index cfab0334d..60dfca8db 100644 --- a/autobahn/wamp/gen/wamp/proto/Subscribe.py +++ b/autobahn/wamp/gen/wamp/proto/Subscribe.py @@ -52,27 +52,21 @@ def GetRetained(self): return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos)) return False -def Start(builder): builder.StartObject(4) -def SubscribeStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def SubscribeAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddTopic(builder, topic): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(topic), 0) -def SubscribeAddTopic(builder, topic): - """This method is deprecated. Please switch to AddTopic.""" - return AddTopic(builder, topic) -def AddMatch(builder, match): builder.PrependUint8Slot(2, match, 0) -def SubscribeAddMatch(builder, match): - """This method is deprecated. Please switch to AddMatch.""" - return AddMatch(builder, match) -def AddGetRetained(builder, getRetained): builder.PrependBoolSlot(3, getRetained, 0) -def SubscribeAddGetRetained(builder, getRetained): - """This method is deprecated. Please switch to AddGetRetained.""" - return AddGetRetained(builder, getRetained) -def End(builder): return builder.EndObject() -def SubscribeEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def SubscribeStart(builder): builder.StartObject(4) +def Start(builder): + return SubscribeStart(builder) +def SubscribeAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return SubscribeAddRequest(builder, request) +def SubscribeAddTopic(builder, topic): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(topic), 0) +def AddTopic(builder, topic): + return SubscribeAddTopic(builder, topic) +def SubscribeAddMatch(builder, match): builder.PrependUint8Slot(2, match, 0) +def AddMatch(builder, match): + return SubscribeAddMatch(builder, match) +def SubscribeAddGetRetained(builder, getRetained): builder.PrependBoolSlot(3, getRetained, 0) +def AddGetRetained(builder, getRetained): + return SubscribeAddGetRetained(builder, getRetained) +def SubscribeEnd(builder): return builder.EndObject() +def End(builder): + return SubscribeEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Subscribed.py b/autobahn/wamp/gen/wamp/proto/Subscribed.py index 8ddc53142..3ddd6f92e 100644 --- a/autobahn/wamp/gen/wamp/proto/Subscribed.py +++ b/autobahn/wamp/gen/wamp/proto/Subscribed.py @@ -38,19 +38,15 @@ def Subscription(self): return self._tab.Get(flatbuffers.number_types.Uint64Flags, o + self._tab.Pos) return 0 -def Start(builder): builder.StartObject(2) -def SubscribedStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def SubscribedAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddSubscription(builder, subscription): builder.PrependUint64Slot(1, subscription, 0) -def SubscribedAddSubscription(builder, subscription): - """This method is deprecated. Please switch to AddSubscription.""" - return AddSubscription(builder, subscription) -def End(builder): return builder.EndObject() -def SubscribedEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def SubscribedStart(builder): builder.StartObject(2) +def Start(builder): + return SubscribedStart(builder) +def SubscribedAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return SubscribedAddRequest(builder, request) +def SubscribedAddSubscription(builder, subscription): builder.PrependUint64Slot(1, subscription, 0) +def AddSubscription(builder, subscription): + return SubscribedAddSubscription(builder, subscription) +def SubscribedEnd(builder): return builder.EndObject() +def End(builder): + return SubscribedEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/SubscriberFeatures.py b/autobahn/wamp/gen/wamp/proto/SubscriberFeatures.py index 6e42d69e5..963e208fb 100644 --- a/autobahn/wamp/gen/wamp/proto/SubscriberFeatures.py +++ b/autobahn/wamp/gen/wamp/proto/SubscriberFeatures.py @@ -80,43 +80,33 @@ def PayloadEncryptionCryptobox(self): return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos)) return False -def Start(builder): builder.StartObject(8) -def SubscriberFeaturesStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddPublisherIdentification(builder, publisherIdentification): builder.PrependBoolSlot(0, publisherIdentification, 0) -def SubscriberFeaturesAddPublisherIdentification(builder, publisherIdentification): - """This method is deprecated. Please switch to AddPublisherIdentification.""" - return AddPublisherIdentification(builder, publisherIdentification) -def AddPatternBasedSubscription(builder, patternBasedSubscription): builder.PrependBoolSlot(1, patternBasedSubscription, 0) -def SubscriberFeaturesAddPatternBasedSubscription(builder, patternBasedSubscription): - """This method is deprecated. Please switch to AddPatternBasedSubscription.""" - return AddPatternBasedSubscription(builder, patternBasedSubscription) -def AddPublicationTrustlevels(builder, publicationTrustlevels): builder.PrependBoolSlot(2, publicationTrustlevels, 0) -def SubscriberFeaturesAddPublicationTrustlevels(builder, publicationTrustlevels): - """This method is deprecated. Please switch to AddPublicationTrustlevels.""" - return AddPublicationTrustlevels(builder, publicationTrustlevels) -def AddSubscriptionRevocation(builder, subscriptionRevocation): builder.PrependBoolSlot(3, subscriptionRevocation, 0) -def SubscriberFeaturesAddSubscriptionRevocation(builder, subscriptionRevocation): - """This method is deprecated. Please switch to AddSubscriptionRevocation.""" - return AddSubscriptionRevocation(builder, subscriptionRevocation) -def AddEventHistory(builder, eventHistory): builder.PrependBoolSlot(4, eventHistory, 0) -def SubscriberFeaturesAddEventHistory(builder, eventHistory): - """This method is deprecated. Please switch to AddEventHistory.""" - return AddEventHistory(builder, eventHistory) -def AddAcknowledgeSubscriberReceived(builder, acknowledgeSubscriberReceived): builder.PrependBoolSlot(5, acknowledgeSubscriberReceived, 0) -def SubscriberFeaturesAddAcknowledgeSubscriberReceived(builder, acknowledgeSubscriberReceived): - """This method is deprecated. Please switch to AddAcknowledgeSubscriberReceived.""" - return AddAcknowledgeSubscriberReceived(builder, acknowledgeSubscriberReceived) -def AddPayloadTransparency(builder, payloadTransparency): builder.PrependBoolSlot(6, payloadTransparency, 0) -def SubscriberFeaturesAddPayloadTransparency(builder, payloadTransparency): - """This method is deprecated. Please switch to AddPayloadTransparency.""" - return AddPayloadTransparency(builder, payloadTransparency) -def AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): builder.PrependBoolSlot(7, payloadEncryptionCryptobox, 0) -def SubscriberFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): - """This method is deprecated. Please switch to AddPayloadEncryptionCryptobox.""" - return AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox) -def End(builder): return builder.EndObject() -def SubscriberFeaturesEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def SubscriberFeaturesStart(builder): builder.StartObject(8) +def Start(builder): + return SubscriberFeaturesStart(builder) +def SubscriberFeaturesAddPublisherIdentification(builder, publisherIdentification): builder.PrependBoolSlot(0, publisherIdentification, 0) +def AddPublisherIdentification(builder, publisherIdentification): + return SubscriberFeaturesAddPublisherIdentification(builder, publisherIdentification) +def SubscriberFeaturesAddPatternBasedSubscription(builder, patternBasedSubscription): builder.PrependBoolSlot(1, patternBasedSubscription, 0) +def AddPatternBasedSubscription(builder, patternBasedSubscription): + return SubscriberFeaturesAddPatternBasedSubscription(builder, patternBasedSubscription) +def SubscriberFeaturesAddPublicationTrustlevels(builder, publicationTrustlevels): builder.PrependBoolSlot(2, publicationTrustlevels, 0) +def AddPublicationTrustlevels(builder, publicationTrustlevels): + return SubscriberFeaturesAddPublicationTrustlevels(builder, publicationTrustlevels) +def SubscriberFeaturesAddSubscriptionRevocation(builder, subscriptionRevocation): builder.PrependBoolSlot(3, subscriptionRevocation, 0) +def AddSubscriptionRevocation(builder, subscriptionRevocation): + return SubscriberFeaturesAddSubscriptionRevocation(builder, subscriptionRevocation) +def SubscriberFeaturesAddEventHistory(builder, eventHistory): builder.PrependBoolSlot(4, eventHistory, 0) +def AddEventHistory(builder, eventHistory): + return SubscriberFeaturesAddEventHistory(builder, eventHistory) +def SubscriberFeaturesAddAcknowledgeSubscriberReceived(builder, acknowledgeSubscriberReceived): builder.PrependBoolSlot(5, acknowledgeSubscriberReceived, 0) +def AddAcknowledgeSubscriberReceived(builder, acknowledgeSubscriberReceived): + return SubscriberFeaturesAddAcknowledgeSubscriberReceived(builder, acknowledgeSubscriberReceived) +def SubscriberFeaturesAddPayloadTransparency(builder, payloadTransparency): builder.PrependBoolSlot(6, payloadTransparency, 0) +def AddPayloadTransparency(builder, payloadTransparency): + return SubscriberFeaturesAddPayloadTransparency(builder, payloadTransparency) +def SubscriberFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): builder.PrependBoolSlot(7, payloadEncryptionCryptobox, 0) +def AddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox): + return SubscriberFeaturesAddPayloadEncryptionCryptobox(builder, payloadEncryptionCryptobox) +def SubscriberFeaturesEnd(builder): return builder.EndObject() +def End(builder): + return SubscriberFeaturesEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/SubscriberReceived.py b/autobahn/wamp/gen/wamp/proto/SubscriberReceived.py index a4d07c33a..bc0027db9 100644 --- a/autobahn/wamp/gen/wamp/proto/SubscriberReceived.py +++ b/autobahn/wamp/gen/wamp/proto/SubscriberReceived.py @@ -120,51 +120,39 @@ def EncKeyIsNone(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(18)) return o == 0 -def Start(builder): builder.StartObject(8) -def SubscriberReceivedStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddPublication(builder, publication): builder.PrependUint64Slot(0, publication, 0) -def SubscriberReceivedAddPublication(builder, publication): - """This method is deprecated. Please switch to AddPublication.""" - return AddPublication(builder, publication) -def AddSubscriber(builder, subscriber): builder.PrependUint64Slot(1, subscriber, 0) -def SubscriberReceivedAddSubscriber(builder, subscriber): - """This method is deprecated. Please switch to AddSubscriber.""" - return AddSubscriber(builder, subscriber) -def AddSubscriberAuthid(builder, subscriberAuthid): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(subscriberAuthid), 0) -def SubscriberReceivedAddSubscriberAuthid(builder, subscriberAuthid): - """This method is deprecated. Please switch to AddSubscriberAuthid.""" - return AddSubscriberAuthid(builder, subscriberAuthid) -def AddSubscriberAuthrole(builder, subscriberAuthrole): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(subscriberAuthrole), 0) -def SubscriberReceivedAddSubscriberAuthrole(builder, subscriberAuthrole): - """This method is deprecated. Please switch to AddSubscriberAuthrole.""" - return AddSubscriberAuthrole(builder, subscriberAuthrole) -def AddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) -def SubscriberReceivedAddPayload(builder, payload): - """This method is deprecated. Please switch to AddPayload.""" - return AddPayload(builder, payload) -def StartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def SubscriberReceivedStartPayloadVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartPayloadVector(builder, numElems) -def AddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(5, encAlgo, 0) -def SubscriberReceivedAddEncAlgo(builder, encAlgo): - """This method is deprecated. Please switch to AddEncAlgo.""" - return AddEncAlgo(builder, encAlgo) -def AddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(6, encSerializer, 0) -def SubscriberReceivedAddEncSerializer(builder, encSerializer): - """This method is deprecated. Please switch to AddEncSerializer.""" - return AddEncSerializer(builder, encSerializer) -def AddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) -def SubscriberReceivedAddEncKey(builder, encKey): - """This method is deprecated. Please switch to AddEncKey.""" - return AddEncKey(builder, encKey) -def StartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def SubscriberReceivedStartEncKeyVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartEncKeyVector(builder, numElems) -def End(builder): return builder.EndObject() -def SubscriberReceivedEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def SubscriberReceivedStart(builder): builder.StartObject(8) +def Start(builder): + return SubscriberReceivedStart(builder) +def SubscriberReceivedAddPublication(builder, publication): builder.PrependUint64Slot(0, publication, 0) +def AddPublication(builder, publication): + return SubscriberReceivedAddPublication(builder, publication) +def SubscriberReceivedAddSubscriber(builder, subscriber): builder.PrependUint64Slot(1, subscriber, 0) +def AddSubscriber(builder, subscriber): + return SubscriberReceivedAddSubscriber(builder, subscriber) +def SubscriberReceivedAddSubscriberAuthid(builder, subscriberAuthid): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(subscriberAuthid), 0) +def AddSubscriberAuthid(builder, subscriberAuthid): + return SubscriberReceivedAddSubscriberAuthid(builder, subscriberAuthid) +def SubscriberReceivedAddSubscriberAuthrole(builder, subscriberAuthrole): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(subscriberAuthrole), 0) +def AddSubscriberAuthrole(builder, subscriberAuthrole): + return SubscriberReceivedAddSubscriberAuthrole(builder, subscriberAuthrole) +def SubscriberReceivedAddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) +def AddPayload(builder, payload): + return SubscriberReceivedAddPayload(builder, payload) +def SubscriberReceivedStartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartPayloadVector(builder, numElems): + return SubscriberReceivedStartPayloadVector(builder, numElems) +def SubscriberReceivedAddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(5, encAlgo, 0) +def AddEncAlgo(builder, encAlgo): + return SubscriberReceivedAddEncAlgo(builder, encAlgo) +def SubscriberReceivedAddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(6, encSerializer, 0) +def AddEncSerializer(builder, encSerializer): + return SubscriberReceivedAddEncSerializer(builder, encSerializer) +def SubscriberReceivedAddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) +def AddEncKey(builder, encKey): + return SubscriberReceivedAddEncKey(builder, encKey) +def SubscriberReceivedStartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartEncKeyVector(builder, numElems): + return SubscriberReceivedStartEncKeyVector(builder, numElems) +def SubscriberReceivedEnd(builder): return builder.EndObject() +def End(builder): + return SubscriberReceivedEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Unregister.py b/autobahn/wamp/gen/wamp/proto/Unregister.py index c69f40956..21ffb8cd5 100644 --- a/autobahn/wamp/gen/wamp/proto/Unregister.py +++ b/autobahn/wamp/gen/wamp/proto/Unregister.py @@ -38,19 +38,15 @@ def Registration(self): return self._tab.Get(flatbuffers.number_types.Uint64Flags, o + self._tab.Pos) return 0 -def Start(builder): builder.StartObject(2) -def UnregisterStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def UnregisterAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddRegistration(builder, registration): builder.PrependUint64Slot(1, registration, 0) -def UnregisterAddRegistration(builder, registration): - """This method is deprecated. Please switch to AddRegistration.""" - return AddRegistration(builder, registration) -def End(builder): return builder.EndObject() -def UnregisterEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def UnregisterStart(builder): builder.StartObject(2) +def Start(builder): + return UnregisterStart(builder) +def UnregisterAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return UnregisterAddRequest(builder, request) +def UnregisterAddRegistration(builder, registration): builder.PrependUint64Slot(1, registration, 0) +def AddRegistration(builder, registration): + return UnregisterAddRegistration(builder, registration) +def UnregisterEnd(builder): return builder.EndObject() +def End(builder): + return UnregisterEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Unregistered.py b/autobahn/wamp/gen/wamp/proto/Unregistered.py index d9adaf50e..64015f217 100644 --- a/autobahn/wamp/gen/wamp/proto/Unregistered.py +++ b/autobahn/wamp/gen/wamp/proto/Unregistered.py @@ -45,23 +45,18 @@ def Reason(self): return self._tab.String(o + self._tab.Pos) return None -def Start(builder): builder.StartObject(3) -def UnregisteredStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def UnregisteredAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddRegistration(builder, registration): builder.PrependUint64Slot(1, registration, 0) -def UnregisteredAddRegistration(builder, registration): - """This method is deprecated. Please switch to AddRegistration.""" - return AddRegistration(builder, registration) -def AddReason(builder, reason): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(reason), 0) -def UnregisteredAddReason(builder, reason): - """This method is deprecated. Please switch to AddReason.""" - return AddReason(builder, reason) -def End(builder): return builder.EndObject() -def UnregisteredEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def UnregisteredStart(builder): builder.StartObject(3) +def Start(builder): + return UnregisteredStart(builder) +def UnregisteredAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return UnregisteredAddRequest(builder, request) +def UnregisteredAddRegistration(builder, registration): builder.PrependUint64Slot(1, registration, 0) +def AddRegistration(builder, registration): + return UnregisteredAddRegistration(builder, registration) +def UnregisteredAddReason(builder, reason): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(reason), 0) +def AddReason(builder, reason): + return UnregisteredAddReason(builder, reason) +def UnregisteredEnd(builder): return builder.EndObject() +def End(builder): + return UnregisteredEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Unsubscribe.py b/autobahn/wamp/gen/wamp/proto/Unsubscribe.py index c7c6910fc..e5f02e9a0 100644 --- a/autobahn/wamp/gen/wamp/proto/Unsubscribe.py +++ b/autobahn/wamp/gen/wamp/proto/Unsubscribe.py @@ -38,19 +38,15 @@ def Subscription(self): return self._tab.Get(flatbuffers.number_types.Uint64Flags, o + self._tab.Pos) return 0 -def Start(builder): builder.StartObject(2) -def UnsubscribeStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def UnsubscribeAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddSubscription(builder, subscription): builder.PrependUint64Slot(1, subscription, 0) -def UnsubscribeAddSubscription(builder, subscription): - """This method is deprecated. Please switch to AddSubscription.""" - return AddSubscription(builder, subscription) -def End(builder): return builder.EndObject() -def UnsubscribeEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def UnsubscribeStart(builder): builder.StartObject(2) +def Start(builder): + return UnsubscribeStart(builder) +def UnsubscribeAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return UnsubscribeAddRequest(builder, request) +def UnsubscribeAddSubscription(builder, subscription): builder.PrependUint64Slot(1, subscription, 0) +def AddSubscription(builder, subscription): + return UnsubscribeAddSubscription(builder, subscription) +def UnsubscribeEnd(builder): return builder.EndObject() +def End(builder): + return UnsubscribeEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Unsubscribed.py b/autobahn/wamp/gen/wamp/proto/Unsubscribed.py index 9fa6efb07..cc4c361f7 100644 --- a/autobahn/wamp/gen/wamp/proto/Unsubscribed.py +++ b/autobahn/wamp/gen/wamp/proto/Unsubscribed.py @@ -45,23 +45,18 @@ def Reason(self): return self._tab.String(o + self._tab.Pos) return None -def Start(builder): builder.StartObject(3) -def UnsubscribedStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def UnsubscribedAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddSubscription(builder, subscription): builder.PrependUint64Slot(1, subscription, 0) -def UnsubscribedAddSubscription(builder, subscription): - """This method is deprecated. Please switch to AddSubscription.""" - return AddSubscription(builder, subscription) -def AddReason(builder, reason): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(reason), 0) -def UnsubscribedAddReason(builder, reason): - """This method is deprecated. Please switch to AddReason.""" - return AddReason(builder, reason) -def End(builder): return builder.EndObject() -def UnsubscribedEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def UnsubscribedStart(builder): builder.StartObject(3) +def Start(builder): + return UnsubscribedStart(builder) +def UnsubscribedAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return UnsubscribedAddRequest(builder, request) +def UnsubscribedAddSubscription(builder, subscription): builder.PrependUint64Slot(1, subscription, 0) +def AddSubscription(builder, subscription): + return UnsubscribedAddSubscription(builder, subscription) +def UnsubscribedAddReason(builder, reason): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(reason), 0) +def AddReason(builder, reason): + return UnsubscribedAddReason(builder, reason) +def UnsubscribedEnd(builder): return builder.EndObject() +def End(builder): + return UnsubscribedEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Welcome.py b/autobahn/wamp/gen/wamp/proto/Welcome.py index 6bbfa84b6..1c6a0e68d 100644 --- a/autobahn/wamp/gen/wamp/proto/Welcome.py +++ b/autobahn/wamp/gen/wamp/proto/Welcome.py @@ -109,55 +109,42 @@ def ResumeToken(self): return self._tab.String(o + self._tab.Pos) return None -def Start(builder): builder.StartObject(11) -def WelcomeStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRoles(builder, roles): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(roles), 0) -def WelcomeAddRoles(builder, roles): - """This method is deprecated. Please switch to AddRoles.""" - return AddRoles(builder, roles) -def AddSession(builder, session): builder.PrependUint64Slot(1, session, 0) -def WelcomeAddSession(builder, session): - """This method is deprecated. Please switch to AddSession.""" - return AddSession(builder, session) -def AddRealm(builder, realm): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(realm), 0) -def WelcomeAddRealm(builder, realm): - """This method is deprecated. Please switch to AddRealm.""" - return AddRealm(builder, realm) -def AddAuthid(builder, authid): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(authid), 0) -def WelcomeAddAuthid(builder, authid): - """This method is deprecated. Please switch to AddAuthid.""" - return AddAuthid(builder, authid) -def AddAuthrole(builder, authrole): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(authrole), 0) -def WelcomeAddAuthrole(builder, authrole): - """This method is deprecated. Please switch to AddAuthrole.""" - return AddAuthrole(builder, authrole) -def AddAuthmethod(builder, authmethod): builder.PrependUint8Slot(5, authmethod, 0) -def WelcomeAddAuthmethod(builder, authmethod): - """This method is deprecated. Please switch to AddAuthmethod.""" - return AddAuthmethod(builder, authmethod) -def AddAuthprovider(builder, authprovider): builder.PrependUOffsetTRelativeSlot(6, flatbuffers.number_types.UOffsetTFlags.py_type(authprovider), 0) -def WelcomeAddAuthprovider(builder, authprovider): - """This method is deprecated. Please switch to AddAuthprovider.""" - return AddAuthprovider(builder, authprovider) -def AddAuthextra(builder, authextra): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(authextra), 0) -def WelcomeAddAuthextra(builder, authextra): - """This method is deprecated. Please switch to AddAuthextra.""" - return AddAuthextra(builder, authextra) -def AddResumed(builder, resumed): builder.PrependBoolSlot(8, resumed, 0) -def WelcomeAddResumed(builder, resumed): - """This method is deprecated. Please switch to AddResumed.""" - return AddResumed(builder, resumed) -def AddResumable(builder, resumable): builder.PrependBoolSlot(9, resumable, 0) -def WelcomeAddResumable(builder, resumable): - """This method is deprecated. Please switch to AddResumable.""" - return AddResumable(builder, resumable) -def AddResumeToken(builder, resumeToken): builder.PrependUOffsetTRelativeSlot(10, flatbuffers.number_types.UOffsetTFlags.py_type(resumeToken), 0) -def WelcomeAddResumeToken(builder, resumeToken): - """This method is deprecated. Please switch to AddResumeToken.""" - return AddResumeToken(builder, resumeToken) -def End(builder): return builder.EndObject() -def WelcomeEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def WelcomeStart(builder): builder.StartObject(11) +def Start(builder): + return WelcomeStart(builder) +def WelcomeAddRoles(builder, roles): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(roles), 0) +def AddRoles(builder, roles): + return WelcomeAddRoles(builder, roles) +def WelcomeAddSession(builder, session): builder.PrependUint64Slot(1, session, 0) +def AddSession(builder, session): + return WelcomeAddSession(builder, session) +def WelcomeAddRealm(builder, realm): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(realm), 0) +def AddRealm(builder, realm): + return WelcomeAddRealm(builder, realm) +def WelcomeAddAuthid(builder, authid): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(authid), 0) +def AddAuthid(builder, authid): + return WelcomeAddAuthid(builder, authid) +def WelcomeAddAuthrole(builder, authrole): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(authrole), 0) +def AddAuthrole(builder, authrole): + return WelcomeAddAuthrole(builder, authrole) +def WelcomeAddAuthmethod(builder, authmethod): builder.PrependUint8Slot(5, authmethod, 0) +def AddAuthmethod(builder, authmethod): + return WelcomeAddAuthmethod(builder, authmethod) +def WelcomeAddAuthprovider(builder, authprovider): builder.PrependUOffsetTRelativeSlot(6, flatbuffers.number_types.UOffsetTFlags.py_type(authprovider), 0) +def AddAuthprovider(builder, authprovider): + return WelcomeAddAuthprovider(builder, authprovider) +def WelcomeAddAuthextra(builder, authextra): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(authextra), 0) +def AddAuthextra(builder, authextra): + return WelcomeAddAuthextra(builder, authextra) +def WelcomeAddResumed(builder, resumed): builder.PrependBoolSlot(8, resumed, 0) +def AddResumed(builder, resumed): + return WelcomeAddResumed(builder, resumed) +def WelcomeAddResumable(builder, resumable): builder.PrependBoolSlot(9, resumable, 0) +def AddResumable(builder, resumable): + return WelcomeAddResumable(builder, resumable) +def WelcomeAddResumeToken(builder, resumeToken): builder.PrependUOffsetTRelativeSlot(10, flatbuffers.number_types.UOffsetTFlags.py_type(resumeToken), 0) +def AddResumeToken(builder, resumeToken): + return WelcomeAddResumeToken(builder, resumeToken) +def WelcomeEnd(builder): return builder.EndObject() +def End(builder): + return WelcomeEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/gen/wamp/proto/Yield.py b/autobahn/wamp/gen/wamp/proto/Yield.py index 758cf9c4b..775f1cf73 100644 --- a/autobahn/wamp/gen/wamp/proto/Yield.py +++ b/autobahn/wamp/gen/wamp/proto/Yield.py @@ -151,63 +151,48 @@ def ForwardForIsNone(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(22)) return o == 0 -def Start(builder): builder.StartObject(10) -def YieldStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) -def YieldAddRequest(builder, request): - """This method is deprecated. Please switch to AddRequest.""" - return AddRequest(builder, request) -def AddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) -def YieldAddPayload(builder, payload): - """This method is deprecated. Please switch to AddPayload.""" - return AddPayload(builder, payload) -def StartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def YieldStartPayloadVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartPayloadVector(builder, numElems) -def AddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(2, encAlgo, 0) -def YieldAddEncAlgo(builder, encAlgo): - """This method is deprecated. Please switch to AddEncAlgo.""" - return AddEncAlgo(builder, encAlgo) -def AddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(3, encSerializer, 0) -def YieldAddEncSerializer(builder, encSerializer): - """This method is deprecated. Please switch to AddEncSerializer.""" - return AddEncSerializer(builder, encSerializer) -def AddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) -def YieldAddEncKey(builder, encKey): - """This method is deprecated. Please switch to AddEncKey.""" - return AddEncKey(builder, encKey) -def StartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def YieldStartEncKeyVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartEncKeyVector(builder, numElems) -def AddProgress(builder, progress): builder.PrependBoolSlot(5, progress, 0) -def YieldAddProgress(builder, progress): - """This method is deprecated. Please switch to AddProgress.""" - return AddProgress(builder, progress) -def AddCallee(builder, callee): builder.PrependUint64Slot(6, callee, 0) -def YieldAddCallee(builder, callee): - """This method is deprecated. Please switch to AddCallee.""" - return AddCallee(builder, callee) -def AddCalleeAuthid(builder, calleeAuthid): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(calleeAuthid), 0) -def YieldAddCalleeAuthid(builder, calleeAuthid): - """This method is deprecated. Please switch to AddCalleeAuthid.""" - return AddCalleeAuthid(builder, calleeAuthid) -def AddCalleeAuthrole(builder, calleeAuthrole): builder.PrependUOffsetTRelativeSlot(8, flatbuffers.number_types.UOffsetTFlags.py_type(calleeAuthrole), 0) -def YieldAddCalleeAuthrole(builder, calleeAuthrole): - """This method is deprecated. Please switch to AddCalleeAuthrole.""" - return AddCalleeAuthrole(builder, calleeAuthrole) -def AddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(9, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) -def YieldAddForwardFor(builder, forwardFor): - """This method is deprecated. Please switch to AddForwardFor.""" - return AddForwardFor(builder, forwardFor) -def StartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) -def YieldStartForwardForVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartForwardForVector(builder, numElems) -def End(builder): return builder.EndObject() -def YieldEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def YieldStart(builder): builder.StartObject(10) +def Start(builder): + return YieldStart(builder) +def YieldAddRequest(builder, request): builder.PrependUint64Slot(0, request, 0) +def AddRequest(builder, request): + return YieldAddRequest(builder, request) +def YieldAddPayload(builder, payload): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(payload), 0) +def AddPayload(builder, payload): + return YieldAddPayload(builder, payload) +def YieldStartPayloadVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartPayloadVector(builder, numElems): + return YieldStartPayloadVector(builder, numElems) +def YieldAddEncAlgo(builder, encAlgo): builder.PrependUint8Slot(2, encAlgo, 0) +def AddEncAlgo(builder, encAlgo): + return YieldAddEncAlgo(builder, encAlgo) +def YieldAddEncSerializer(builder, encSerializer): builder.PrependUint8Slot(3, encSerializer, 0) +def AddEncSerializer(builder, encSerializer): + return YieldAddEncSerializer(builder, encSerializer) +def YieldAddEncKey(builder, encKey): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(encKey), 0) +def AddEncKey(builder, encKey): + return YieldAddEncKey(builder, encKey) +def YieldStartEncKeyVector(builder, numElems): return builder.StartVector(1, numElems, 1) +def StartEncKeyVector(builder, numElems): + return YieldStartEncKeyVector(builder, numElems) +def YieldAddProgress(builder, progress): builder.PrependBoolSlot(5, progress, 0) +def AddProgress(builder, progress): + return YieldAddProgress(builder, progress) +def YieldAddCallee(builder, callee): builder.PrependUint64Slot(6, callee, 0) +def AddCallee(builder, callee): + return YieldAddCallee(builder, callee) +def YieldAddCalleeAuthid(builder, calleeAuthid): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(calleeAuthid), 0) +def AddCalleeAuthid(builder, calleeAuthid): + return YieldAddCalleeAuthid(builder, calleeAuthid) +def YieldAddCalleeAuthrole(builder, calleeAuthrole): builder.PrependUOffsetTRelativeSlot(8, flatbuffers.number_types.UOffsetTFlags.py_type(calleeAuthrole), 0) +def AddCalleeAuthrole(builder, calleeAuthrole): + return YieldAddCalleeAuthrole(builder, calleeAuthrole) +def YieldAddForwardFor(builder, forwardFor): builder.PrependUOffsetTRelativeSlot(9, flatbuffers.number_types.UOffsetTFlags.py_type(forwardFor), 0) +def AddForwardFor(builder, forwardFor): + return YieldAddForwardFor(builder, forwardFor) +def YieldStartForwardForVector(builder, numElems): return builder.StartVector(8, numElems, 8) +def StartForwardForVector(builder, numElems): + return YieldStartForwardForVector(builder, numElems) +def YieldEnd(builder): return builder.EndObject() +def End(builder): + return YieldEnd(builder) \ No newline at end of file diff --git a/autobahn/wamp/test/test_wamp_cryptosign.py b/autobahn/wamp/test/test_wamp_cryptosign.py index ccc3cda51..fff168a4d 100644 --- a/autobahn/wamp/test/test_wamp_cryptosign.py +++ b/autobahn/wamp/test/test_wamp_cryptosign.py @@ -62,26 +62,97 @@ pubkey = '''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJVp3hjHwIQyEladzd8mFcf0YSXcmyKS3qMLB7VqTQKm someuser@example.com ''' -# test valid vectors for WAMP-cryptosign signature testing -testvectors = [ +# valid test vectors for WAMP-cryptosign signature testing +test_vectors_1 = [ + # _WITHOUT_ channel_id { - 'priv_key': '4d57d97a68f555696620a6d849c0ce582568518d729eb753dc7c732de2804510', - 'challenge': 'ff' * 32, + 'channel_id': None, + 'private_key': '4d57d97a68f555696620a6d849c0ce582568518d729eb753dc7c732de2804510', + 'challenge': 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', + 'signature': 'b32675b221f08593213737bef8240e7c15228b07028e19595294678c90d11c0cae80a357331bfc5cc9fb71081464e6e75013517c2cf067ad566a6b7b728e5d03ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff' + }, + { + 'channel_id': None, + 'private_key': 'd511fe78e23934b3dadb52fcd022974b80bd92bccc7c5cf404e46cc0a8a2f5cd', + 'challenge': 'b26c1f87c13fc1da14997f1b5a71995dff8fbe0a62fae8473c7bdbd05bfb607d', + 'signature': 'd4209ad10d5aff6bfbc009d7e924795de138a63515efc7afc6b01b7fe5201372190374886a70207b042294af5bd64ce725cd8dceb344e6d11c09d1aaaf4d660fb26c1f87c13fc1da14997f1b5a71995dff8fbe0a62fae8473c7bdbd05bfb607d' + }, + { + 'channel_id': None, + 'private_key': '6e1fde9cf9e2359a87420b65a87dc0c66136e66945196ba2475990d8a0c3a25b', + 'challenge': 'b05e6b8ad4d69abf74aa3be3c0ee40ae07d66e1895b9ab09285a2f1192d562d2', + 'signature': '7beb282184baadd08f166f16dd683b39cab53816ed81e6955def951cb2ddad1ec184e206746fd82bda075af03711d3d5658fc84a76196b0fa8d1ebc92ef9f30bb05e6b8ad4d69abf74aa3be3c0ee40ae07d66e1895b9ab09285a2f1192d562d2' + }, + + # _WITH_ channel_id + { + 'channel_id': '62e935ae755f3d48f80d4d59f6121358c435722a67e859cc0caa8b539027f2ff', + 'private_key': '4d57d97a68f555696620a6d849c0ce582568518d729eb753dc7c732de2804510', + 'challenge': 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 'signature': '9b6f41540c9b95b4b7b281c3042fa9c54cef43c842d62ea3fd6030fcb66e70b3e80d49d44c29d1635da9348d02ec93f3ed1ef227dfb59a07b580095c2b82f80f9d16ca518aa0c2b707f2b2a609edeca73bca8dd59817a633f35574ac6fd80d00' }, { - 'priv_key': 'd511fe78e23934b3dadb52fcd022974b80bd92bccc7c5cf404e46cc0a8a2f5cd', + 'channel_id': '62e935ae755f3d48f80d4d59f6121358c435722a67e859cc0caa8b539027f2ff', + 'private_key': 'd511fe78e23934b3dadb52fcd022974b80bd92bccc7c5cf404e46cc0a8a2f5cd', 'challenge': 'b26c1f87c13fc1da14997f1b5a71995dff8fbe0a62fae8473c7bdbd05bfb607d', 'signature': '305aaa3ac25e98f651427688b3fc43fe7d8a68a7ec1d7d61c61517c519bd4a427c3015599d83ca28b4c652333920223844ef0725eb5dc2febfd6af7677b73f01d0852a29b460fc92ec943242ac638a053bbacc200512b18b30d15083cbdc9282' }, { - 'priv_key': '6e1fde9cf9e2359a87420b65a87dc0c66136e66945196ba2475990d8a0c3a25b', + 'channel_id': '62e935ae755f3d48f80d4d59f6121358c435722a67e859cc0caa8b539027f2ff', + 'private_key': '6e1fde9cf9e2359a87420b65a87dc0c66136e66945196ba2475990d8a0c3a25b', 'challenge': 'b05e6b8ad4d69abf74aa3be3c0ee40ae07d66e1895b9ab09285a2f1192d562d2', 'signature': 'ee3c7644fd8070532bc1fde3d70d742267da545d8c8f03e63bda63f1ad4214f4d2c4bfdb4eb9526def42deeb7e31602a6ff99eba893e0a4ad4d45892ca75e608d2b75e24a189a7f78ca776ba36fc53f6c3e31c32f251f2c524f0a44202f2902d' - } + }, ] +class TestSigVectors(unittest.TestCase): + + def test_vectors(self): + session = Mock() + + for testvec in test_vectors_1: + # setup fake transport details including fake channel_id + if testvec['channel_id']: + channel_id = binascii.a2b_hex(testvec['channel_id']) + channel_id_type = 'tls-unique' + session._transport.transport_details = types.TransportDetails(channel_id={'tls-unique': channel_id}) + else: + channel_id = None + channel_id_type = None + session._transport.transport_details = types.TransportDetails(channel_id=None) + + # private signing key (the seed for it) + private_key = CryptosignKey.from_bytes(binascii.a2b_hex(testvec['private_key'])) + + # the fake challenge we've received + challenge = types.Challenge("cryptosign", dict(challenge=testvec['challenge'])) + + # ok, now sign the challenge + f_signed = private_key.sign_challenge(session, challenge, channel_id_type=channel_id_type) + + def success(signed): + # the signature returned is a Hex encoded string + self.assertTrue(type(signed) == str) + + # we return the concatenation of the signature and the message signed (96 bytes) + self.assertEqual( + 192, + len(signed), + ) + + # must match the expected value in our test vector + self.assertEqual( + testvec['signature'], + signed, + ) + + def failed(err): + self.fail(str(err)) + + txaio.add_callbacks(f_signed, success, failed) + + class TestAuth(unittest.TestCase): def setUp(self): @@ -91,7 +162,10 @@ def setUp(self): # all tests here fake the use of channel_id_type='tls-unique' with the following channel_id m = hashlib.sha256() m.update("some TLS message".encode()) + + # 62e935ae755f3d48f80d4d59f6121358c435722a67e859cc0caa8b539027f2ff channel_id = m.digest() + self.transport_details = types.TransportDetails(channel_id={'tls-unique': channel_id}) def test_public_key(self): @@ -119,30 +193,6 @@ def failed(err): txaio.add_callbacks(f_signed, success, failed) - def test_testvectors(self): - session = Mock() - session._transport.transport_details = self.transport_details - - for testvec in testvectors: - priv_key = CryptosignKey.from_bytes(binascii.a2b_hex(testvec['priv_key'])) - challenge = types.Challenge("cryptosign", dict(challenge=testvec['challenge'])) - f_signed = priv_key.sign_challenge(session, challenge, channel_id_type='tls-unique') - - def success(signed): - self.assertEqual( - 192, - len(signed), - ) - self.assertEqual( - testvec['signature'], - signed, - ) - - def failed(err): - self.fail(str(err)) - - txaio.add_callbacks(f_signed, success, failed) - def test_authenticator(self): authenticator = create_authenticator( "cryptosign", diff --git a/autobahn/xbr/__init__.py b/autobahn/xbr/__init__.py index 76a126f24..a6bd36d45 100644 --- a/autobahn/xbr/__init__.py +++ b/autobahn/xbr/__init__.py @@ -75,6 +75,7 @@ from autobahn.xbr._frealm import FederatedRealm, Seeder # noqa from autobahn.xbr._secmod import EthereumKey # noqa + from autobahn.xbr._userkey import UserKey # noqa if not hasattr(abi, 'collapse_type'): @@ -359,6 +360,7 @@ def account_from_ethkey(ethkey: bytes) -> eth_account.account.Account: 'load_or_create_profile', 'UserConfig', 'Profile', + 'UserKey', 'MemberLevel', 'ActorType', diff --git a/autobahn/xbr/_schema.py b/autobahn/xbr/_schema.py index 13938ff6e..0f9be5126 100644 --- a/autobahn/xbr/_schema.py +++ b/autobahn/xbr/_schema.py @@ -1658,8 +1658,8 @@ def print_summary(self): # print('>>', len(type_text_str), len(type_text)) - print(' {:<30} {} {}'.format(hlval(field.name), - type_text + ' ' * (34 - len(type_text_str)), + print(' {:<36} {} {}'.format(hlval(field.name), + type_text + ' ' * (28 - len(type_text_str)), docs[0] if docs else '')) for line in docs[1:]: print(' ' * 57 + line) @@ -2026,7 +2026,7 @@ def validate_obj(self, validation_type: Optional[str], value: Optional[Any]): else: raise InvalidPayload('invalid type {} for value of validation type "{}"'.format(type(value), vt.name)) - def validate(self, validation_type: str, args: List[Any], kwargs: Dict[str, Any]): + def validate(self, validation_type: str, args: List[Any], kwargs: Dict[str, Any]) -> Optional[FbsObject]: """ Validate the WAMP application payload provided in positional argument in ``args`` and in keyword-based arguments in ``kwargs`` against the FlatBuffers table @@ -2038,9 +2038,13 @@ def validate(self, validation_type: str, args: List[Any], kwargs: Dict[str, Any] :param validation_type: Flatbuffers type (fully qualified) against to validate application payload. :param args: The application payload WAMP positional arguments. :param kwargs: The application payload WAMP keyword-based arguments. + :return: The validation type object from this repository (reference in ``validation_type``) + which has been used for validation. """ + # any value validates against the None validation type if validation_type is None: - return + return None + if validation_type not in self.objs: raise RuntimeError('validation type "{}" not found in inventory (among {} types)'.format(validation_type, len(self.objs))) @@ -2103,3 +2107,5 @@ def validate(self, validation_type: str, args: List[Any], kwargs: Dict[str, Any] if kwargs_keys: raise InvalidPayload('{} unexpected keyword arguments {} in type "{}"'.format(len(kwargs_keys), list(kwargs_keys), vt.name)) + + return vt diff --git a/autobahn/xbr/_secmod.py b/autobahn/xbr/_secmod.py index 875d64068..a2d5dcfe6 100644 --- a/autobahn/xbr/_secmod.py +++ b/autobahn/xbr/_secmod.py @@ -23,8 +23,9 @@ # THE SOFTWARE. # ############################################################################### - +import binascii import os +import configparser from collections.abc import MutableMapping from typing import Optional, Union, Dict, Any, List, Iterator from threading import Lock @@ -41,6 +42,7 @@ from autobahn.wamp.interfaces import ISecurityModule, IEthereumKey from autobahn.xbr._mnemonic import mnemonic_to_private_key +from autobahn.xbr._userkey import _parse_user_key_file from autobahn.wamp.cryptosign import CryptosignKey __all__ = ('EthereumKey', 'SecurityModuleMemory', ) @@ -432,5 +434,47 @@ def from_seedphrase(cls, seedphrase: str, num_eth_keys: int = 1, sm = SecurityModuleMemory(keys=keys) return sm + @classmethod + def from_config(cls, config: str, profile: str = 'default') -> 'SecurityModuleMemory': + """ + Create a new memory-backed security module with keys referred from a profile in + the given configuration file. + + :param config: Path (relative or absolute) to an INI configuration file. + :param profile: Name of the profile within the given INI configuration file. + :return: New memory-backed security module instance. + """ + keys: List[Union[EthereumKey, CryptosignKey]] = [] + + cfg = configparser.ConfigParser() + cfg.read(config) + + if not cfg.has_section(profile): + raise RuntimeError('profile "{}" not found in configuration file "{}"'.format(profile, config)) + + if not cfg.has_option(profile, 'privkey'): + raise RuntimeError('missing option "privkey" in profile "{}" of configuration file "{}"'.format(profile, config)) + + privkey = os.path.join(os.path.dirname(config), cfg.get(profile, 'privkey')) + if not os.path.exists(privkey) or not os.path.isfile(privkey): + raise RuntimeError('privkey "{}" is not a file in profile "{}" of configuration file "{}"'.format(privkey, profile, config)) + + # now load the private key file - this returns a dict which should include: + # private-key-eth: 6b08b6e186bd2a3b9b2f36e6ece3f8031fe788ab3dc4a1cfd3a489ea387c496b + # private-key-ed25519: 20e8c05d0ede9506462bb049c4843032b18e8e75b314583d0c8d8a4942f9be40 + data = _parse_user_key_file(privkey) + + # first, add Ethereum key + privkey_eth_hex = data.get('private-key-eth', None) + keys.append(EthereumKey.from_bytes(binascii.a2b_hex(privkey_eth_hex))) + + # second, add Cryptosign key + privkey_ed25519_hex = data.get('private-key-ed25519', None) + keys.append(CryptosignKey.from_bytes(binascii.a2b_hex(privkey_ed25519_hex))) + + # initialize security module from collected keys + sm = SecurityModuleMemory(keys=keys) + return sm + ISecurityModule.register(SecurityModuleMemory) diff --git a/autobahn/xbr/_userkey.py b/autobahn/xbr/_userkey.py new file mode 100644 index 000000000..6eab20941 --- /dev/null +++ b/autobahn/xbr/_userkey.py @@ -0,0 +1,285 @@ +############################################################################### +# +# The MIT License (MIT) +# +# Copyright (c) Crossbar.io Technologies GmbH +# +# 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. +# +############################################################################### + +import re +import os +import binascii +import socket +from collections import OrderedDict + +import getpass +import click + +from nacl.signing import SigningKey +from nacl.encoding import HexEncoder + +from eth_keys import KeyAPI +from eth_keys.backends import NativeECCBackend + +from autobahn.util import utcnow +from autobahn.wamp import cryptosign + +if 'USER' in os.environ: + _DEFAULT_EMAIL_ADDRESS = '{}@{}'.format(os.environ['USER'], socket.getfqdn()) +else: + _DEFAULT_EMAIL_ADDRESS = 'unknown' + + +class EmailAddress(click.ParamType): + """ + Email address validator. + """ + + name = 'Email address' + + def __init__(self): + click.ParamType.__init__(self) + + def convert(self, value, param, ctx): + if re.match(r"^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$", value): + return value + self.fail('invalid email address "{}"'.format(value)) + + +def _user_id(yes_to_all=False): + if yes_to_all: + return _DEFAULT_EMAIL_ADDRESS + while True: + value = click.prompt('Please enter your email address', type=EmailAddress(), default=_DEFAULT_EMAIL_ADDRESS) + if click.confirm('We will send an activation code to "{}", ok?'.format(value), default=True): + break + return value + + +def _creator(yes_to_all=False): + """ + for informational purposes, try to identify the creator (user@hostname) + """ + if yes_to_all: + return _DEFAULT_EMAIL_ADDRESS + else: + try: + user = getpass.getuser() + except BaseException: + user = 'unknown' + + try: + hostname = socket.gethostname() + except BaseException: + hostname = 'unknown' + + return '{}@{}'.format(user, hostname) + + +def _write_user_key(filepath, tags, msg): + """ + Internal helper, write the given tags to the given file- + """ + with open(filepath, 'w') as f: + f.write(msg) + for (tag, value) in tags.items(): + if value: + f.write('{}: {}\n'.format(tag, value)) + + +def _parse_user_key_file(key_path: str, private: bool = True) -> OrderedDict: + """ + Internal helper. This parses a node.pub or node.priv file and + returns a dict mapping tags -> values. + """ + if os.path.exists(key_path) and not os.path.isfile(key_path): + raise Exception("Key file '{}' exists, but isn't a file".format(key_path)) + + allowed_tags = ['public-key-ed25519', 'public-adr-eth', 'user-id', 'created-at', 'creator'] + if private: + allowed_tags.extend(['private-key-ed25519', 'private-key-eth']) + + tags = OrderedDict() # type: ignore + with open(key_path, 'r') as key_file: + got_blankline = False + for line in key_file.readlines(): + if line.strip() == '': + got_blankline = True + elif got_blankline: + tag, value = line.split(':', 1) + tag = tag.strip().lower() + value = value.strip() + if tag not in allowed_tags: + raise Exception("Invalid tag '{}' in key file {}".format(tag, key_path)) + if tag in tags: + raise Exception("Duplicate tag '{}' in key file {}".format(tag, key_path)) + tags[tag] = value + return tags + + +class UserKey(object): + def __init__(self, privkey, pubkey, yes_to_all=True): + + self._privkey_path = privkey + self._pubkey_path = pubkey + + self.key = None + self._creator = None + self._created_at = None + self.user_id = None + self._privkey = None + self._privkey_hex = None + self._pubkey = None + self._pubkey_hex = None + self._load_and_maybe_generate(self._privkey_path, self._pubkey_path, yes_to_all) + + def __str__(self): + return 'UserKey(privkey="{}", pubkey="{}" [{}])'.format(self._privkey_path, self._pubkey_path, + self._pubkey_hex) + + def _load_and_maybe_generate(self, privkey_path, pubkey_path, yes_to_all=False): + + if os.path.exists(privkey_path): + + # node private key seems to exist already .. check! + + priv_tags = _parse_user_key_file(privkey_path, private=True) + for tag in ['creator', 'created-at', 'user-id', 'public-key-ed25519', 'private-key-ed25519']: + if tag not in priv_tags: + raise Exception("Corrupt user private key file {} - {} tag not found".format(privkey_path, tag)) + + creator = priv_tags['creator'] + created_at = priv_tags['created-at'] + user_id = priv_tags['user-id'] + + privkey_hex = priv_tags['private-key-ed25519'] + privkey = SigningKey(privkey_hex, encoder=HexEncoder) + pubkey = privkey.verify_key + pubkey_hex = pubkey.encode(encoder=HexEncoder).decode('ascii') + + if priv_tags['public-key-ed25519'] != pubkey_hex: + raise Exception(("Inconsistent user private key file {} - public-key-ed25519 doesn't" + " correspond to private-key-ed25519").format(pubkey_path)) + + eth_pubadr = None + eth_privkey = None + eth_privkey_seed_hex = priv_tags.get('private-key-eth', None) + if eth_privkey_seed_hex: + eth_privkey_seed = binascii.a2b_hex(eth_privkey_seed_hex) + eth_privkey = KeyAPI(NativeECCBackend).PrivateKey(eth_privkey_seed) + eth_pubadr = eth_privkey.public_key.to_checksum_address() + if 'public-adr-eth' in priv_tags: + if priv_tags['public-adr-eth'] != eth_pubadr: + raise Exception(("Inconsistent node private key file {} - public-adr-eth doesn't" + " correspond to private-key-eth").format(privkey_path)) + + if os.path.exists(pubkey_path): + pub_tags = _parse_user_key_file(pubkey_path, private=False) + for tag in ['creator', 'created-at', 'user-id', 'public-key-ed25519']: + if tag not in pub_tags: + raise Exception("Corrupt user public key file {} - {} tag not found".format(pubkey_path, tag)) + + if pub_tags['public-key-ed25519'] != pubkey_hex: + raise Exception(("Inconsistent user public key file {} - public-key-ed25519 doesn't" + " correspond to private-key-ed25519").format(pubkey_path)) + + if pub_tags.get('public-adr-eth', None) != eth_pubadr: + raise Exception( + ("Inconsistent user public key file {} - public-adr-eth doesn't" + " correspond to private-key-eth in private key file {}").format(pubkey_path, privkey_path)) + + else: + # public key is missing! recreate it + pub_tags = OrderedDict([ + ('creator', priv_tags['creator']), + ('created-at', priv_tags['created-at']), + ('user-id', priv_tags['user-id']), + ('public-key-ed25519', pubkey_hex), + ('public-adr-eth', eth_pubadr), + ]) + msg = 'Crossbar.io user public key\n\n' + _write_user_key(pubkey_path, pub_tags, msg) + + click.echo('Re-created user public key from private key: {}'.format(pubkey_path)) + + else: + # user private key does not yet exist: generate one + creator = _creator(yes_to_all) + created_at = utcnow() + user_id = _user_id(yes_to_all) + + privkey = SigningKey.generate() + privkey_hex = privkey.encode(encoder=HexEncoder).decode('ascii') + pubkey = privkey.verify_key + pubkey_hex = pubkey.encode(encoder=HexEncoder).decode('ascii') + + eth_privkey_seed = os.urandom(32) + eth_privkey_seed_hex = binascii.b2a_hex(eth_privkey_seed).decode() + eth_privkey = KeyAPI(NativeECCBackend).PrivateKey(eth_privkey_seed) + eth_pubadr = eth_privkey.public_key.to_checksum_address() + + # first, write the public file + tags = OrderedDict([ + ('creator', creator), + ('created-at', created_at), + ('user-id', user_id), + ('public-key-ed25519', pubkey_hex), + ('public-adr-eth', eth_pubadr), + ]) + msg = 'Crossbar.io user public key\n\n' + _write_user_key(pubkey_path, tags, msg) + os.chmod(pubkey_path, 420) + + # now, add the private key and write the private file + tags['private-key-ed25519'] = privkey_hex + tags['private-key-eth'] = eth_privkey_seed_hex + msg = 'Crossbar.io user private key - KEEP THIS SAFE!\n\n' + _write_user_key(privkey_path, tags, msg) + os.chmod(privkey_path, 384) + + click.echo('New user public key generated: {}'.format(pubkey_path)) + click.echo('New user private key generated ({}): {}'.format('keep this safe!', privkey_path)) + + # fix file permissions on node public/private key files + # note: we use decimals instead of octals as octal literals have changed between Py2/3 + if os.stat(pubkey_path).st_mode & 511 != 420: # 420 (decimal) == 0644 (octal) + os.chmod(pubkey_path, 420) + click.echo('File permissions on user public key fixed!') + + if os.stat(privkey_path).st_mode & 511 != 384: # 384 (decimal) == 0600 (octal) + os.chmod(privkey_path, 384) + click.echo('File permissions on user private key fixed!') + + # load keys into object + self._creator = creator + self._created_at = created_at + + self._privkey = privkey + self._privkey_hex = privkey_hex + self._pubkey = pubkey + self._pubkey_hex = pubkey_hex + + self._eth_pubadr = eth_pubadr + self._eth_privkey_seed_hex = eth_privkey_seed_hex + self._eth_privkey = eth_privkey + + self.user_id = user_id + self.key = cryptosign.CryptosignKey(privkey, can_sign=True) diff --git a/autobahn/xbr/test/catalog/src/wamp-auth.fbs b/autobahn/xbr/test/catalog/src/wamp-auth.fbs index b2decbedf..eddb4afb1 100644 --- a/autobahn/xbr/test/catalog/src/wamp-auth.fbs +++ b/autobahn/xbr/test/catalog/src/wamp-auth.fbs @@ -22,29 +22,116 @@ table SessionRolesFilter reason: string (wampuri); } -attribute uri; +table SessionDetails +{ + /// The WAMP session ID of the session to authorize. + session_id: uint64 (arg, wampid); +} + +table AuthenticationRequest +{ + realm: string (wampname); + authid: string (wampname); + details: SessionDetails; +} + +table AuthenticationResponse +{ + realm: string (wampname); + authid: string (wampname); + role: string (wampname); + extra: [KeyValue]; + cache: bool; +} + +table AuthorizationRequest +{ + /// The WAMP session to authorize. + session: SessionDetails; + + /// Fully qualified WAMP URI for which to authorize session. + uri: string (wampuri); + + /// WAMP action to authorize, e.g. one of `["call", "subscribe", "register", "publish"]` + action: string; +} + +struct Allow +{ + call: bool; + register: bool; + publish: bool; + subscribe: bool; +} + +struct Disclose +{ + caller: bool; + publisher: bool; +} + +table Validate +{ + /// WAMP call, the (only or the initial) caller request + call: string; + + /// WAMP call, any call updates sent by the caller subsequently and while the call + /// is still active. + call_progress: string; + + /// WAMP call result, the (only or the initial) callee response + call_result: string; + + /// WAMP call progressive result, any call result updates sent by the callee subsequently + /// and while the call is still active. + call_result_progress: string; + + /// WAMP call error result, the callee error response payload + call_error: string; + + /// WAMP event published either using normal or router-acknowledged publications + event: string; + + /// WAMP event confirmation sent by subscribers for subscribed-confirmed publications + event_confirmation: string; + + /// meta arguments parsed from URI + extra: [KeyValue]; +} + +table AuthorizationResponse +{ + allow: Allow; + disclose: Disclose; + cache: bool; + validate: Validate; +} /// WAMP dynamic authentication API. rpc_service IWampAuthenticate(type: "interface", uuid: "85da09ef-d3be-467a-acbc-0647a617ef98", - wampuri: "wamp", uri: "wamp") + wampuri: "wamp") { /// Authenticate a WAMP session to join a realm. - authenticate (SessionRolesFilter): WampIds (type: "procedure", uri: "wamp.session.authenticate"); + authenticate (AuthenticationRequest): AuthenticationResponse (type: "procedure", + wampuri: "wamp.session.authenticate"); /// Fired when an authentication of a WAMP session joining a realm was denied. - on_authentication_denied (Void): Void (type: "topic", uri: "wamp.session.on_authentication_denied"); + on_authentication_denied (AuthenticationRequest): Void (type: "topic", + wampuri: "wamp.session.on_authentication_denied"); } /// WAMP dynamic authorization API. rpc_service IWampAuthorize(type: "interface", uuid: "58c79d59-4b0c-4d1c-9c85-cf80236bd6ad", - wampuri: "wamp", uri: "wamp") + wampuri: "wamp") { /// Authorize a WAMP session for a WAMP action on a URI on a realm. - authorize (SessionRolesFilter): WampIds (type: "procedure", uri: "wamp.session.authorize"); + authorize (AuthorizationRequest): AuthorizationResponse (type: "procedure", + wampuri: "wamp.session.authorize"); /// Fired when an authorization of a WAMP action on an URI was denied. - on_authorization_denied (Void): Void (type: "topic", uri: "wamp.session.on_authorization_denied"); + on_authorization_denied (AuthorizationRequest): Void (type: "topic", + wampuri: "wamp.session.on_authorization_denied"); } diff --git a/autobahn/xbr/test/catalog/src/wamp-control.fbs b/autobahn/xbr/test/catalog/src/wamp-control.fbs index 1f84a0d33..5e61f6e2f 100644 --- a/autobahn/xbr/test/catalog/src/wamp-control.fbs +++ b/autobahn/xbr/test/catalog/src/wamp-control.fbs @@ -33,6 +33,13 @@ table RolePermission cache: bool; } +table AuthorizationResponse +{ + allow: PermissionAllow; + disclose: PermissionDisclose; + cache: bool; +} + table RoleConfig { // FIXME: add "id: string (wampname);" diff --git a/autobahn/xbr/test/catalog/src/wamp-exchange.fbs b/autobahn/xbr/test/catalog/src/wamp-exchange.fbs new file mode 100644 index 000000000..c42ca228d --- /dev/null +++ b/autobahn/xbr/test/catalog/src/wamp-exchange.fbs @@ -0,0 +1,35 @@ +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) typedef int GmbH and contributors. +// All rights reserved. Licensed under the MIT open-source license. +// +/////////////////////////////////////////////////////////////////////////////// + +include "wamp.fbs"; + +namespace wamp; + + +/// WAMP key exchange interface. A key exchange facilitates secure encryption +/// key exchanges between WAMP service providers and consumers in a private +/// and non-custodiary way. +rpc_service IWampExchange(type: "interface", + uuid: "d3254a5d-1307-4f13-9976-94617498db44", + wampuri: "wamp") +{ + fixme (Void): Void; +} + +rpc_service IWampProvider(type: "interface", + uuid: "e751ae3d-33ee-4f89-ad43-fa82db925274", + wampuri: "wamp") +{ + fixme (Void): Void; +} + +rpc_service IWampConsumer(type: "interface", + uuid: "a1a314e9-7a5c-485c-87e7-b1bd4e1b1e0c", + wampuri: "wamp") +{ + fixme (Void): Void; +} diff --git a/autobahn/xbr/test/catalog/src/wamp-meta.fbs b/autobahn/xbr/test/catalog/src/wamp-meta.fbs index a27cb58e3..b3f872bba 100644 --- a/autobahn/xbr/test/catalog/src/wamp-meta.fbs +++ b/autobahn/xbr/test/catalog/src/wamp-meta.fbs @@ -65,7 +65,7 @@ table SessionKill table SessionKillByAuthid { /// The WAMP authid of the sessions to kill. - authid: uint64 (arg, wampid); + authid: string (wampuri); /// A reason URI provided to the killed session(s). reason: string (kwarg, wampuri); @@ -221,4 +221,17 @@ rpc_service IWampMeta(type: "interface", /// Return history of events for given subscription. subscription_get_events (Void): Void (type: "procedure", wampuri: "wamp.subscription.get_events"); + + /// Reflection API. + interface_list (Void): Void (type: "procedure", wampuri: "wamp.interface.list"); + + interface_get (Void): Void (type: "procedure", wampuri: "wamp.interface.get"); + + interface_match_procedure (Void): Void (type: "procedure", wampuri: "wamp.interface.match_procedure"); + + interface_match_topic (Void): Void (type: "procedure", wampuri: "wamp.interface.match_topic"); + + type_list (Void): Void (type: "procedure", wampuri: "wamp.type.list"); + + type_get (Void): Void (type: "procedure", wampuri: "wamp.type.get"); } diff --git a/autobahn/xbr/test/profile/config.ini b/autobahn/xbr/test/profile/config.ini new file mode 100644 index 000000000..d54429de7 --- /dev/null +++ b/autobahn/xbr/test/profile/config.ini @@ -0,0 +1,5 @@ +[default] + +url=ws://localhost:9000/ws +privkey=default.priv +pubkey=default.pub diff --git a/autobahn/xbr/test/profile/default.priv b/autobahn/xbr/test/profile/default.priv new file mode 100644 index 000000000..9445d26e3 --- /dev/null +++ b/autobahn/xbr/test/profile/default.priv @@ -0,0 +1,9 @@ +Crossbar.io user private key - KEEP THIS SAFE! + +creator: oberstet@intel-nuci7 +created-at: 2022-05-06T14:40:09.639Z +user-id: oberstet@intel-nuci7 +public-key-ed25519: 15cfa4acef5cc312e0b9ba77634849d0a8c6222a546f90eb5123667935d2f561 +public-adr-eth: 0xe59C7418403CF1D973485B36660728a5f4A8fF9c +private-key-ed25519: 20e8c05d0ede9506462bb049c4843032b18e8e75b314583d0c8d8a4942f9be40 +private-key-eth: 6b08b6e186bd2a3b9b2f36e6ece3f8031fe788ab3dc4a1cfd3a489ea387c496b diff --git a/autobahn/xbr/test/profile/default.pub b/autobahn/xbr/test/profile/default.pub new file mode 100644 index 000000000..3e13baa0d --- /dev/null +++ b/autobahn/xbr/test/profile/default.pub @@ -0,0 +1,7 @@ +Crossbar.io user public key + +creator: oberstet@intel-nuci7 +created-at: 2022-05-06T14:40:09.639Z +user-id: oberstet@intel-nuci7 +public-key-ed25519: 15cfa4acef5cc312e0b9ba77634849d0a8c6222a546f90eb5123667935d2f561 +public-adr-eth: 0xe59C7418403CF1D973485B36660728a5f4A8fF9c diff --git a/autobahn/xbr/test/test_xbr_secmod.py b/autobahn/xbr/test/test_xbr_secmod.py index 5eab10082..74c519670 100644 --- a/autobahn/xbr/test/test_xbr_secmod.py +++ b/autobahn/xbr/test/test_xbr_secmod.py @@ -26,6 +26,7 @@ import os import sys +import pkg_resources from random import randint, random from binascii import a2b_hex from typing import List @@ -414,3 +415,24 @@ def test_secmod_from_seedphrase(self): for i in range(5, 10): self.assertTrue(isinstance(sm[i], CryptosignKey)) yield sm.close() + + @inlineCallbacks + def test_secmod_from_config(self): + config = pkg_resources.resource_filename('autobahn', 'xbr/test/profile/config.ini') + + sm = SecurityModuleMemory.from_config(config) + yield sm.open() + self.assertEqual(len(sm), 2) + + self.assertTrue(isinstance(sm[0], EthereumKey), 'unexpected type {} at index 0'.format(type(sm[0]))) + self.assertTrue(isinstance(sm[1], CryptosignKey), 'unexpected type {} at index 1'.format(type(sm[1]))) + + key1: EthereumKey = sm[0] + key2: CryptosignKey = sm[1] + + # public-key-ed25519: 15cfa4acef5cc312e0b9ba77634849d0a8c6222a546f90eb5123667935d2f561 + # public-adr-eth: 0xe59C7418403CF1D973485B36660728a5f4A8fF9c + self.assertEqual(key1.address(binary=False), '0xe59C7418403CF1D973485B36660728a5f4A8fF9c') + self.assertEqual(key2.public_key(binary=False), '15cfa4acef5cc312e0b9ba77634849d0a8c6222a546f90eb5123667935d2f561') + + yield sm.close() diff --git a/docs/changelog.rst b/docs/changelog.rst index bb6694afb..ff589ba5d 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,18 @@ Changelog ========= +22.6.1 +------ + +* new: add SecurityModuleMemory.from_config +* new: moved UserKey from crossbar to autobahn +* fix: more WAMP-Cryptosign unit tests +* new: experimental WAMP API catalog support +* new: regenerate FlatBuffers WAMP messages +* fix: allow tests to pass without XBR dependencies (#1580) +* new: Flatbuffers IDL based WAMP payload validation (#1576) +* fix: restore autobahn.twisted.testing to distribution (#1578) + 22.5.1 ------