Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove submodules #1835

Merged
merged 8 commits into from Feb 10, 2020
Merged

Remove submodules #1835

merged 8 commits into from Feb 10, 2020

Conversation

adambabik
Copy link
Contributor

@adambabik adambabik commented Feb 6, 2020

At the current stage, submodules, especially for protocol and eth-node packages, bring more troubles than advantages.

The biggest problem is that we use replaces in the main go.mod which makes status-go act differently depending whether it is used as a main program vs a library in other projects.

@status-github-bot
Copy link

status-github-bot bot commented Feb 6, 2020

Pull Request Checklist

  • Have you updated the documentation, if impacted (e.g. docs.status.im)?

@status-im-auto
Copy link
Member

status-im-auto commented Feb 6, 2020

Jenkins Builds

Click to see older builds (30)
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 5562bea #1 2020-02-06 18:21:47 ~51 sec linux 📦zip
✔️ 5562bea #1 2020-02-06 18:26:13 ~5 min ios 📦zip
✔️ 5562bea #1 2020-02-06 18:28:05 ~7 min android 📦aar
✔️ 41f61fa #2 2020-02-06 18:37:58 ~33 sec linux 📦zip
✔️ 41f61fa #2 2020-02-06 18:40:24 ~3 min ios 📦zip
✔️ 41f61fa #2 2020-02-06 18:43:01 ~5 min android 📦aar
✔️ 7a1cf4a #3 2020-02-07 00:09:25 ~58 sec linux 📦zip
✔️ 7a1cf4a #3 2020-02-07 00:10:59 ~2 min ios 📦zip
✔️ 7a1cf4a #3 2020-02-07 00:14:30 ~6 min android 📦aar
✔️ 65f7c8f #4 2020-02-07 11:37:54 ~39 sec linux 📦zip
✔️ 65f7c8f #4 2020-02-07 11:39:41 ~2 min ios 📦zip
✔️ 65f7c8f #4 2020-02-07 11:42:34 ~5 min android 📦aar
✔️ f18ad57 #5 2020-02-07 13:05:28 ~39 sec linux 📦zip
✔️ f18ad57 #5 2020-02-07 13:07:22 ~2 min ios 📦zip
✔️ f18ad57 #5 2020-02-07 13:10:19 ~5 min android 📦aar
✔️ 904b52f #6 2020-02-07 15:17:25 ~40 sec linux 📦zip
✔️ 904b52f #6 2020-02-07 15:19:17 ~2 min ios 📦zip
✔️ 904b52f #6 2020-02-07 15:22:09 ~5 min android 📦aar
✔️ 9534aa5 #7 2020-02-07 15:44:44 ~1 min linux 📦zip
✔️ 9534aa5 #7 2020-02-07 15:46:06 ~2 min ios 📦zip
✔️ 9534aa5 #7 2020-02-07 15:48:56 ~5 min android 📦aar
✔️ a1cfe03 #8 2020-02-07 17:59:17 ~38 sec linux 📦zip
✔️ a1cfe03 #8 2020-02-07 18:01:16 ~2 min ios 📦zip
✔️ a1cfe03 #8 2020-02-07 18:04:05 ~5 min android 📦aar
✔️ 109be16 #9 2020-02-08 10:36:52 ~46 sec linux 📦zip
✔️ 109be16 #9 2020-02-08 10:38:53 ~2 min ios 📦zip
✔️ 109be16 #9 2020-02-08 10:41:22 ~5 min android 📦aar
✔️ 0718ac2 #10 2020-02-08 10:44:43 ~49 sec linux 📦zip
✔️ 0718ac2 #10 2020-02-08 10:46:16 ~2 min ios 📦zip
✔️ 0718ac2 #10 2020-02-08 10:48:59 ~5 min android 📦aar
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 29f6b86 #11 2020-02-08 17:39:41 ~37 sec linux 📦zip
✔️ 29f6b86 #11 2020-02-08 17:41:26 ~2 min ios 📦zip
✔️ 29f6b86 #11 2020-02-08 17:44:14 ~5 min android 📦aar
✔️ 6068ea1 #12 2020-02-08 18:37:24 ~34 sec linux 📦zip
✔️ 6068ea1 #12 2020-02-08 18:39:19 ~2 min ios 📦zip
✔️ 6068ea1 #12 2020-02-08 18:41:56 ~5 min android 📦aar

@adambabik adambabik marked this pull request as ready for review February 7, 2020 15:03
@adambabik adambabik force-pushed the remove-submodules branch 4 times, most recently from 0718ac2 to 29f6b86 Compare February 8, 2020 17:38
@@ -58,7 +58,7 @@ type Contact struct {
SystemTags []string `json:"systemTags"`

DeviceInfo []ContactDeviceInfo `json:"deviceInfo"`
TributeToTalk string `json:"tributeToTalk,omitEmpty"`
TributeToTalk string `json:"tributeToTalk,omitempty"`
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially breaking change but tests pass. cc @cammellos

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is ok, I believe, tributeToTalk is not used

@@ -93,7 +93,7 @@ type Message struct {

// Replace indicates that this is a replacement of a message
// that has been updated
Replace string `json:"replace,omitEmpty"`
Replace string `json:"replace,omitempty"`
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially breaking change cc @cammellos

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also likely ok

LocalChatID string `json:"localChatId"`
Clock uint64 `json:"clock"`
Replace string `json:"replace,omitEmpty"`
Replace string `json:"replace"`
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A unit test was failing so I removed it. omitEmpty did not work, it is omitempty. cc @cammellos

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good to know, I obviously sprinkled the codebase with the wrong version :)

Messages []*Message `json:"messages,omitEmpty"`
Contacts []*Contact `json:"contacts,omitEmpty"`
Installations []*multidevice.Installation `json:"installations,omitEmpty"`
Chats []*Chat `json:"chats,omitempty"`
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially breaking change cc @cammellos.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also fine

Messages []*Message `json:"messages,omitEmpty"`
Contacts []*Contact `json:"contacts,omitEmpty"`
Installations []*multidevice.Installation `json:"installations,omitEmpty"`
Chats []*Chat `json:"chats,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also fine

@adambabik adambabik merged commit 8b61d92 into develop Feb 10, 2020
@adambabik adambabik deleted the remove-submodules branch February 10, 2020 11:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants