status-im/status-go
2
0
Fork 0
mirror of https://github.com/status-im/status-go.git synced 2025-02-16 16:56:53 +00:00
Code Issues Projects Releases Wiki Activity

Run gofmt -s -w

Browse Source
This commit is contained in:
Pedro Pombeiro 2019-12-19 16:40:44 +01:00 committed by Pedro Pombeiro
parent ea0f12b920
commit f494576ca2
7 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eth-node/bridge/nimbus/node.go
View File

@ -33,12 +33,12 @@ import (
type nimbusNodeWrapper struct { type nimbusNodeWrapper struct {
mu sync.Mutex mu sync.Mutex
routineQueue *RoutineQueue routineQueue *RoutineQueue
tid int tid int
nodeStarted bool nodeStarted bool
cancelPollingChan chan struct{} cancelPollingChan chan struct{}
w types.Whisper w types.Whisper
} }
type Node interface { type Node interface {
@ -122,7 +122,7 @@ func (n *nimbusNodeWrapper) poll() {
panic("poll called from wrong thread") panic("poll called from wrong thread")
} }
if (n.nodeStarted) { if n.nodeStarted {
C.nimbus_poll() C.nimbus_poll()
} }

2
protocol/message_processor_test.go
View File

@ -190,7 +190,7 @@ func (s *MessageProcessorSuite) TestHandleDecodedMessagesDatasyncEncrypted() {
dataSyncMessage := datasyncproto.Payload{ dataSyncMessage := datasyncproto.Payload{
Messages: []*datasyncproto.Message{ Messages: []*datasyncproto.Message{
&datasyncproto.Message{Body: wrappedPayload}, {Body: wrappedPayload},
}, },
} }
marshalledDataSyncMessage, err := proto.Marshal(&dataSyncMessage) marshalledDataSyncMessage, err := proto.Marshal(&dataSyncMessage)

4
protocol/messenger.go
View File

@ -1468,11 +1468,11 @@ func (m *Messenger) handleRetrievedMessages(chatWithMessages map[transport.Filte
} }
} }
for id, _ := range modifiedChats { for id := range modifiedChats {
response.Chats = append(response.Chats, m.allChats[id]) response.Chats = append(response.Chats, m.allChats[id])
} }
for id, _ := range modifiedContacts { for id := range modifiedContacts {
response.Contacts = append(response.Contacts, m.allContacts[id]) response.Contacts = append(response.Contacts, m.allContacts[id])
} }

38
protocol/messenger_test.go
View File

@ -1097,17 +1097,17 @@ func (s *MessengerSuite) TestChatPersistencePrivateGroupChat() {
ChatType: ChatTypePrivateGroupChat, ChatType: ChatTypePrivateGroupChat,
Timestamp: 10, Timestamp: 10,
Members: []ChatMember{ Members: []ChatMember{
ChatMember{ {
ID: "1", ID: "1",
Admin: false, Admin: false,
Joined: true, Joined: true,
}, },
ChatMember{ {
ID: "2", ID: "2",
Admin: true, Admin: true,
Joined: false, Joined: false,
}, },
ChatMember{ {
ID: "3", ID: "3",
Admin: true, Admin: true,
Joined: true, Joined: true,
@ -1157,12 +1157,12 @@ func (s *MessengerSuite) TestBlockContact() {
LastUpdated: 20, LastUpdated: 20,
SystemTags: []string{"1", "2"}, SystemTags: []string{"1", "2"},
DeviceInfo: []ContactDeviceInfo{ DeviceInfo: []ContactDeviceInfo{
ContactDeviceInfo{ {
InstallationID: "1", InstallationID: "1",
Timestamp: 2, Timestamp: 2,
FCMToken: "token", FCMToken: "token",
}, },
ContactDeviceInfo{ {
InstallationID: "2", InstallationID: "2",
Timestamp: 3, Timestamp: 3,
FCMToken: "token-2", FCMToken: "token-2",
@ -1216,7 +1216,7 @@ func (s *MessengerSuite) TestBlockContact() {
contact.Name = "blocked" contact.Name = "blocked"
messages := []*Message{ messages := []*Message{
&Message{ {
ID: "test-1", ID: "test-1",
LocalChatID: chat2.ID, LocalChatID: chat2.ID,
ChatMessage: protobuf.ChatMessage{ ChatMessage: protobuf.ChatMessage{
@ -1226,7 +1226,7 @@ func (s *MessengerSuite) TestBlockContact() {
}, },
From: contact.ID, From: contact.ID,
}, },
&Message{ {
ID: "test-2", ID: "test-2",
LocalChatID: chat2.ID, LocalChatID: chat2.ID,
ChatMessage: protobuf.ChatMessage{ ChatMessage: protobuf.ChatMessage{
@ -1236,7 +1236,7 @@ func (s *MessengerSuite) TestBlockContact() {
}, },
From: contact.ID, From: contact.ID,
}, },
&Message{ {
ID: "test-3", ID: "test-3",
LocalChatID: chat2.ID, LocalChatID: chat2.ID,
ChatMessage: protobuf.ChatMessage{ ChatMessage: protobuf.ChatMessage{
@ -1247,7 +1247,7 @@ func (s *MessengerSuite) TestBlockContact() {
Seen: false, Seen: false,
From: "test", From: "test",
}, },
&Message{ {
ID: "test-4", ID: "test-4",
LocalChatID: chat2.ID, LocalChatID: chat2.ID,
ChatMessage: protobuf.ChatMessage{ ChatMessage: protobuf.ChatMessage{
@ -1258,7 +1258,7 @@ func (s *MessengerSuite) TestBlockContact() {
Seen: false, Seen: false,
From: "test", From: "test",
}, },
&Message{ {
ID: "test-5", ID: "test-5",
LocalChatID: chat2.ID, LocalChatID: chat2.ID,
ChatMessage: protobuf.ChatMessage{ ChatMessage: protobuf.ChatMessage{
@ -1269,7 +1269,7 @@ func (s *MessengerSuite) TestBlockContact() {
Seen: true, Seen: true,
From: "test", From: "test",
}, },
&Message{ {
ID: "test-6", ID: "test-6",
LocalChatID: chat3.ID, LocalChatID: chat3.ID,
ChatMessage: protobuf.ChatMessage{ ChatMessage: protobuf.ChatMessage{
@ -1280,7 +1280,7 @@ func (s *MessengerSuite) TestBlockContact() {
Seen: false, Seen: false,
From: contact.ID, From: contact.ID,
}, },
&Message{ {
ID: "test-7", ID: "test-7",
LocalChatID: chat3.ID, LocalChatID: chat3.ID,
ChatMessage: protobuf.ChatMessage{ ChatMessage: protobuf.ChatMessage{
@ -1346,12 +1346,12 @@ func (s *MessengerSuite) TestContactPersistence() {
LastUpdated: 20, LastUpdated: 20,
SystemTags: []string{"1", "2"}, SystemTags: []string{"1", "2"},
DeviceInfo: []ContactDeviceInfo{ DeviceInfo: []ContactDeviceInfo{
ContactDeviceInfo{ {
InstallationID: "1", InstallationID: "1",
Timestamp: 2, Timestamp: 2,
FCMToken: "token", FCMToken: "token",
}, },
ContactDeviceInfo{ {
InstallationID: "2", InstallationID: "2",
Timestamp: 3, Timestamp: 3,
FCMToken: "token-2", FCMToken: "token-2",
@ -1388,17 +1388,17 @@ func (s *MessengerSuite) TestVerifyENSNames() {
PublicKeyString: pk1, PublicKeyString: pk1,
}, },
// Not matching pk -> name // Not matching pk -> name
enstypes.ENSDetails{ {
Name: "pedro.stateofus.eth", Name: "pedro.stateofus.eth",
PublicKeyString: pk2, PublicKeyString: pk2,
}, },
// Not existing name // Not existing name
enstypes.ENSDetails{ {
Name: "definitelynotpedro.stateofus.eth", Name: "definitelynotpedro.stateofus.eth",
PublicKeyString: pk3, PublicKeyString: pk3,
}, },
// Malformed pk // Malformed pk
enstypes.ENSDetails{ {
Name: "pedro.stateofus.eth", Name: "pedro.stateofus.eth",
PublicKeyString: pk4, PublicKeyString: pk4,
}, },
@ -1454,12 +1454,12 @@ func (s *MessengerSuite) TestContactPersistenceUpdate() {
LastUpdated: 20, LastUpdated: 20,
SystemTags: []string{"1", "2"}, SystemTags: []string{"1", "2"},
DeviceInfo: []ContactDeviceInfo{ DeviceInfo: []ContactDeviceInfo{
ContactDeviceInfo{ {
InstallationID: "1", InstallationID: "1",
Timestamp: 2, Timestamp: 2,
FCMToken: "token", FCMToken: "token",
}, },
ContactDeviceInfo{ {
InstallationID: "2", InstallationID: "2",
Timestamp: 3, Timestamp: 3,
FCMToken: "token-2", FCMToken: "token-2",

2
protocol/persistence_legacy_test.go
View File

@ -364,7 +364,7 @@ func openTestDB() (*sql.DB, error) {
} }
func insertMinimalMessage(p sqlitePersistence, id string) error { func insertMinimalMessage(p sqlitePersistence, id string) error {
return p.SaveMessagesLegacy([]*Message{&Message{ return p.SaveMessagesLegacy([]*Message{{
ID: id, ID: id,
LocalChatID: "chat-id", LocalChatID: "chat-id",
ChatMessage: protobuf.ChatMessage{Text: "some-text"}, ChatMessage: protobuf.ChatMessage{Text: "some-text"},

4
vendor/github.com/status-im/status-go/protocol/messenger.go generated vendored
View File

@ -1468,11 +1468,11 @@ func (m *Messenger) handleRetrievedMessages(chatWithMessages map[transport.Filte
} }
} }
for id, _ := range modifiedChats { for id := range modifiedChats {
response.Chats = append(response.Chats, m.allChats[id]) response.Chats = append(response.Chats, m.allChats[id])
} }
for id, _ := range modifiedContacts { for id := range modifiedContacts {
response.Contacts = append(response.Contacts, m.allContacts[id]) response.Contacts = append(response.Contacts, m.allContacts[id])
} }

2
whisper/rate_limiter_test.go
View File

@ -99,7 +99,7 @@ func TestPeerLimiterHandlerWithWhitelisting(t *testing.T) {
LimitPerSecIP: 1, LimitPerSecIP: 1,
LimitPerSecPeerID: 1, LimitPerSecPeerID: 1,
WhitelistedIPs: []string{"<nil>"}, // no IP is represented as <nil> string WhitelistedIPs: []string{"<nil>"}, // no IP is represented as <nil> string
WhitelistedPeerIDs: []enode.ID{enode.ID{0xaa, 0xbb, 0xcc}}, WhitelistedPeerIDs: []enode.ID{{0xaa, 0xbb, 0xcc}},
}, h) }, h)
p := &Peer{ p := &Peer{
peer: p2p.NewPeer(enode.ID{0xaa, 0xbb, 0xcc}, "test-peer", nil), peer: p2p.NewPeer(enode.ID{0xaa, 0xbb, 0xcc}, "test-peer", nil),