Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
client
Commits
49119bef
Commit
49119bef
authored
2 years ago
by
Jake Taylor
Browse files
Options
Downloads
Patches
Plain Diff
fix pipeline
parent
9c4f2ebe
No related branches found
No related tags found
4 merge requests
!510
Release
,
!419
rewrote the health tracker to both consider if there are waiting rounds and...
,
!372
implemented the send tracker
,
!340
Project/channels
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bindings/channels.go
+14
-14
14 additions, 14 deletions
bindings/channels.go
with
14 additions
and
14 deletions
bindings/channels.go
+
14
−
14
View file @
49119bef
...
@@ -339,7 +339,7 @@ func (cm *ChannelsManager) SendGeneric(marshalledChanId []byte,
...
@@ -339,7 +339,7 @@ func (cm *ChannelsManager) SendGeneric(marshalledChanId []byte,
}
}
// Send message
// Send message
chanMsgId
,
rnd
Id
,
ephId
,
err
:=
cm
.
api
.
SendGeneric
(
chanId
,
chanMsgId
,
rnd
,
ephId
,
err
:=
cm
.
api
.
SendGeneric
(
chanId
,
channels
.
MessageType
(
messageType
),
message
,
channels
.
MessageType
(
messageType
),
message
,
time
.
Duration
(
leaseTimeMS
),
params
.
CMIX
)
time
.
Duration
(
leaseTimeMS
),
params
.
CMIX
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -347,7 +347,7 @@ func (cm *ChannelsManager) SendGeneric(marshalledChanId []byte,
...
@@ -347,7 +347,7 @@ func (cm *ChannelsManager) SendGeneric(marshalledChanId []byte,
}
}
// Construct send report
// Construct send report
return
constructChannelSendReport
(
chanMsgId
,
rnd
Id
,
ephId
)
return
constructChannelSendReport
(
chanMsgId
,
rnd
.
ID
,
ephId
)
}
}
// SendAdminGeneric is used to send a raw message over a channel encrypted with
// SendAdminGeneric is used to send a raw message over a channel encrypted with
...
@@ -394,12 +394,12 @@ func (cm *ChannelsManager) SendAdminGeneric(adminPrivateKey,
...
@@ -394,12 +394,12 @@ func (cm *ChannelsManager) SendAdminGeneric(adminPrivateKey,
}
}
// Send admin message
// Send admin message
chanMsgId
,
rnd
Id
,
ephId
,
err
:=
cm
.
api
.
SendAdminGeneric
(
rsaPrivKey
,
chanMsgId
,
rnd
,
ephId
,
err
:=
cm
.
api
.
SendAdminGeneric
(
rsaPrivKey
,
chanId
,
channels
.
MessageType
(
messageType
),
message
,
chanId
,
channels
.
MessageType
(
messageType
),
message
,
time
.
Duration
(
leaseTimeMS
),
params
.
CMIX
)
time
.
Duration
(
leaseTimeMS
),
params
.
CMIX
)
// Construct send report
// Construct send report
return
constructChannelSendReport
(
chanMsgId
,
rnd
Id
,
ephId
)
return
constructChannelSendReport
(
chanMsgId
,
rnd
.
ID
,
ephId
)
}
}
// SendMessage is used to send a formatted message over a channel.
// SendMessage is used to send a formatted message over a channel.
...
@@ -437,14 +437,14 @@ func (cm *ChannelsManager) SendMessage(marshalledChanId []byte,
...
@@ -437,14 +437,14 @@ func (cm *ChannelsManager) SendMessage(marshalledChanId []byte,
}
}
// Send message
// Send message
chanMsgId
,
rnd
Id
,
ephId
,
err
:=
cm
.
api
.
SendMessage
(
chanId
,
message
,
chanMsgId
,
rnd
,
ephId
,
err
:=
cm
.
api
.
SendMessage
(
chanId
,
message
,
time
.
Duration
(
leaseTimeMS
),
params
.
CMIX
)
time
.
Duration
(
leaseTimeMS
),
params
.
CMIX
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
// Construct send report
// Construct send report
return
constructChannelSendReport
(
chanMsgId
,
rnd
Id
,
ephId
)
return
constructChannelSendReport
(
chanMsgId
,
rnd
.
ID
,
ephId
)
}
}
// SendReply is used to send a formatted message over a channel.
// SendReply is used to send a formatted message over a channel.
...
@@ -494,14 +494,14 @@ func (cm *ChannelsManager) SendReply(marshalledChanId []byte,
...
@@ -494,14 +494,14 @@ func (cm *ChannelsManager) SendReply(marshalledChanId []byte,
copy
(
msgId
[
:
],
messageToReactTo
)
copy
(
msgId
[
:
],
messageToReactTo
)
// Send Reply
// Send Reply
chanMsgId
,
rnd
Id
,
ephId
,
err
:=
cm
.
api
.
SendReply
(
chanId
,
message
,
chanMsgId
,
rnd
,
ephId
,
err
:=
cm
.
api
.
SendReply
(
chanId
,
message
,
msgId
,
time
.
Duration
(
leaseTimeMS
),
params
.
CMIX
)
msgId
,
time
.
Duration
(
leaseTimeMS
),
params
.
CMIX
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
// Construct send report
// Construct send report
return
constructChannelSendReport
(
chanMsgId
,
rnd
Id
,
ephId
)
return
constructChannelSendReport
(
chanMsgId
,
rnd
.
ID
,
ephId
)
}
}
// SendReaction is used to send a reaction to a message over a channel.
// SendReaction is used to send a reaction to a message over a channel.
...
@@ -540,14 +540,14 @@ func (cm *ChannelsManager) SendReaction(marshalledChanId []byte,
...
@@ -540,14 +540,14 @@ func (cm *ChannelsManager) SendReaction(marshalledChanId []byte,
copy
(
msgId
[
:
],
messageToReactTo
)
copy
(
msgId
[
:
],
messageToReactTo
)
// Send reaction
// Send reaction
chanMsgId
,
rnd
Id
,
ephId
,
err
:=
cm
.
api
.
SendReaction
(
chanId
,
chanMsgId
,
rnd
,
ephId
,
err
:=
cm
.
api
.
SendReaction
(
chanId
,
reaction
,
msgId
,
params
.
CMIX
)
reaction
,
msgId
,
params
.
CMIX
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
// Construct send report
// Construct send report
return
constructChannelSendReport
(
chanMsgId
,
rnd
Id
,
ephId
)
return
constructChannelSendReport
(
chanMsgId
,
rnd
.
ID
,
ephId
)
}
}
// parseChannelsParameters is a helper function for the Send functions. It
// parseChannelsParameters is a helper function for the Send functions. It
...
@@ -641,10 +641,10 @@ func (cm *ChannelsManager) RegisterReceiveHandler(messageType int,
...
@@ -641,10 +641,10 @@ func (cm *ChannelsManager) RegisterReceiveHandler(messageType int,
// Wrap callback around backend interface
// Wrap callback around backend interface
cb
:=
channels
.
MessageTypeReceiveMessage
(
cb
:=
channels
.
MessageTypeReceiveMessage
(
func
(
channelID
*
id
.
ID
,
messageID
cryptoChannel
.
MessageID
,
func
(
channelID
*
id
.
ID
,
message
Type
c
hannel
s
.
Message
Type
,
senderUsername
string
,
message
ID
cryptoC
hannel
.
Message
ID
,
messageType
channels
.
MessageType
,
content
[]
byte
,
timestamp
time
.
Time
,
lease
time
.
Duration
,
senderUsername
string
,
content
[]
byte
,
timestamp
time
.
Time
,
round
rounds
.
Round
)
{
lease
time
.
Duration
,
round
rounds
.
Round
,
status
channels
.
SentStatus
)
{
rcm
:=
ReceivedChannelMessageReport
{
rcm
:=
ReceivedChannelMessageReport
{
ChannelId
:
channelID
.
Marshal
(),
ChannelId
:
channelID
.
Marshal
(),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment