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
Conversation
git-subtree-dir: cvm-runtime git-subtree-split: 61fca71721397b6c9c97309c8ad85bb66a21f01b
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 |
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. |
Delete the useless binary |
You can rebase it to master for review |
var CvmDolFixTorrHashes = map[string]string{ | ||
// "31f75c90e8fe1c5b16cbdc466dc6127487a92add": "0d23bf93f21b80393cce77ad8021386458adb8fc", | ||
"31f75c90e8fe1c5b16cbdc466dc6127487a92add": "c816d85a023abacb687080ca57f580d4999b8b1d", | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
de58609743e5cd0cb18798d91a196f418ac25016 TODO
There was a problem hiding this comment.
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
inference/synapse/local_infer.go
Outdated
ih == "de58609743e5cd0cb18798d91a196f418ac25016" { | ||
// TODO(ryt): this part should be deprecated using hashFix maps | ||
log.Warn("Available: start hacking...", "ih", ih) | ||
return nil |
There was a problem hiding this comment.
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) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
debug
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
already fixed
inference/synapse/local_infer.go
Outdated
//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...", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
debug
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
already fixed
There was a problem hiding this 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
No description provided.