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

Ryt Embed cvm-runtime into CortexTheseus #568

Merged
merged 52 commits into from Jul 10, 2020
Merged

Ryt Embed cvm-runtime into CortexTheseus #568

merged 52 commits into from Jul 10, 2020

Conversation

declmal
Copy link
Collaborator

@declmal declmal commented Jun 10, 2020

No description provided.

@declmal declmal changed the title Ryt Ryt Embed cvm-runtime into CortexTheseus Jun 10, 2020
@ucwong ucwong added in progress Something under development or test enhancement New feature or request bugfix fix some known bugs and removed in progress Something under development or test bugfix fix some known bugs labels Jun 10, 2020
@wlt-cortex
Copy link
Member

and the branch seems to have conflicts from master. It's cause your too old base code version. @declmal, merge the master code in your local environment and solve the conflicts and.then push.

@declmal
Copy link
Collaborator Author

declmal commented Jun 11, 2020

and the branch seems to have conflicts from master. It's cause your too old base code version. @declmal, merge the master code in your local environment and solve the conflicts and.then push.

I have merged master into ryt, but there seems to be no conflicts at all. I have pushed the commit again, please check.

@ucwong
Copy link
Member

ucwong commented Jun 11, 2020

and the branch seems to have conflicts from master. It's cause your too old base code version. @declmal, merge the master code in your local environment and solve the conflicts and.then push.

I have merged master into ryt, but there seems to be no conflicts at all. I have pushed the commit again, please check.

Have you check the latest master ? I have resolved the Makefile and synapse.go conflicts, u can pull ryt and check it

@declmal
Copy link
Collaborator Author

declmal commented Jun 11, 2020

and the branch seems to have conflicts from master. It's cause your too old base code version. @declmal, merge the master code in your local environment and solve the conflicts and.then push.

I have merged master into ryt, but there seems to be no conflicts at all. I have pushed the commit again, please check.

Have you check the latest master ? I have resolved the Makefile and synapse.go conflicts, u can pull ryt and check it

Now, I have merged the remotes/origin/master, some conflicts does occurs, I'm fixxing them.

@ucwong
Copy link
Member

ucwong commented Jun 11, 2020

image

@ucwong ucwong requested a review from ShadowErii July 7, 2020 02:24
@ucwong ucwong marked this pull request as ready for review July 10, 2020 08:17
.gitmodules Show resolved Hide resolved
@ucwong ucwong mentioned this pull request Jul 10, 2020
@ucwong
Copy link
Member

ucwong commented Jul 10, 2020

Delete the useless binary

@ucwong
Copy link
Member

ucwong commented Jul 10, 2020

You can rebase it to master for review

var CvmDolFixTorrHashes = map[string]string{
// "31f75c90e8fe1c5b16cbdc466dc6127487a92add": "0d23bf93f21b80393cce77ad8021386458adb8fc",
"31f75c90e8fe1c5b16cbdc466dc6127487a92add": "c816d85a023abacb687080ca57f580d4999b8b1d",
}
Copy link
Member

@ucwong ucwong Jul 10, 2020

Choose a reason for hiding this comment

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

de58609743e5cd0cb18798d91a196f418ac25016 TODO

Copy link
Collaborator Author

@declmal declmal Jul 10, 2020

Choose a reason for hiding this comment

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

de58... can be downloaded now, hackFile is no longer needed

ih == "de58609743e5cd0cb18798d91a196f418ac25016" {
// TODO(ryt): this part should be deprecated using hashFix maps
log.Warn("Available: start hacking...", "ih", ih)
return nil
Copy link
Member

Choose a reason for hiding this comment

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

TODO

if cvmNetworkId == 43 {
if ch, ok := CvmDolFixTorrHashes[ih]; ok {
log.Warn("start hacking hash", "ih", ih,
"ch", ch, "cvmNetworkId", cvmNetworkId)
Copy link
Member

Choose a reason for hiding this comment

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

debug

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

already fixed

//s.config.InferURI)
return errRes
}
if len(infoHash) < 2 || !strings.HasPrefix(infoHash, "0x") {
return KERNEL_RUNTIME_ERROR
}
ih := strings.ToLower(infoHash[2:])
if cvmNetworkId == 43 {
if _, ok := CvmDolFixTorrHashes[ih]; ok {
log.Warn("Available: start hacking...",
Copy link
Member

Choose a reason for hiding this comment

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

debug

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

already fixed

@ucwong ucwong self-requested a review July 10, 2020 11:12
Copy link
Member

@ucwong ucwong left a comment

Choose a reason for hiding this comment

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

All blocks in dolores have been passed, LGTM

@ucwong ucwong merged commit c0e40d1 into master Jul 10, 2020
@wlt-cortex wlt-cortex deleted the ryt branch January 7, 2022 02:51
@wlt-cortex wlt-cortex restored the ryt branch January 7, 2022 02:51
@wlt-cortex wlt-cortex deleted the ryt branch January 7, 2022 02:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request in progress Something under development or test
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants