Oracle client #479
Merged
Oracle client #479
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
antonlerner
reviewed
Jan 24, 2019
hare/algorithm.go
Outdated
| @@ -213,7 +213,7 @@ func (proc *ConsensusProcess) validateRole(m *pb.HareMessage) bool { | |||
| // TODO: validate role proof | |||
|
|
|||
| // validate role | |||
| if !proc.oracle.Validate(proc.expectedCommitteeSize(m.Message.K), Signature(m.Message.RoleProof)) { | |||
| if !proc.oracle.Validate(proc.instanceId.Bytes(), int(m.Message.K), proc.expectedCommitteeSize(m.Message.K), proc.signing.Verifier(), Signature(m.Message.RoleProof)) { | |||
There was a problem hiding this comment.
don't use bytes as id, set specific type
antonlerner
reviewed
Jan 24, 2019
hare/algorithm.go
Outdated
| @@ -514,7 +514,7 @@ func (proc *ConsensusProcess) endOfRound3() { | |||
| } | |||
|
|
|||
| func (proc *ConsensusProcess) currentRole() Role { | |||
| if proc.oracle.Validate(proc.expectedCommitteeSize(proc.k), proc.roleProof()) { | |||
| if proc.oracle.Validate(proc.instanceId.Bytes(), int(proc.k), proc.expectedCommitteeSize(proc.k), proc.signing.Verifier(), proc.roleProof()) { | |||
There was a problem hiding this comment.
Is the verifier the public key and identity? if so, lets rename it to that
antonlerner
reviewed
Jan 24, 2019
hare/mock_oracle.go
Outdated
| @@ -96,7 +96,7 @@ func (mock *MockHashOracle) calcThreshold(committeeSize int) uint32 { | |||
| } | |||
|
|
|||
| // Validate if a proof is valid for a given committee size | |||
| func (mock *MockHashOracle) Validate(committeeSize int, proof Signature) bool { | |||
| func (mock *MockHashOracle) Validate(instanceID []byte, K int, committeeSize int, pubKey Stringer, proof []byte) bool { | |||
There was a problem hiding this comment.
rename to validateEligibility
There was a problem hiding this comment.
That was the original name I didn't change it. refactoring is out of this PR scope :)
antonlerner
reviewed
Jan 24, 2019
miner/block_builder.go
Outdated
| } | ||
| t.network.Broadcast(meshSync.NewBlock, bytes) | ||
| }() | ||
| if t.blockOracle.Validate(id, t.minerID) { |
There was a problem hiding this comment.
invert the if -
if !Validate {
break
}
antonlerner
reviewed
Jan 24, 2019
oracle/oracle.go
Outdated
| return bo.Validate(block.LayerIndex, stringerer(block.MinerID)) | ||
| } | ||
|
|
||
| func (bo *blockOracle) Validate(id mesh.LayerID, pubKey fmt.Stringer) bool { |
antonlerner
reviewed
Jan 24, 2019
oracle/oracle.go
Outdated
| } | ||
| } | ||
|
|
||
| type stringerer string |
There was a problem hiding this comment.
use simple string as input
antonlerner
reviewed
Jan 24, 2019
| } | ||
|
|
||
| type hareOracle struct { | ||
| oc *OracleClient |
There was a problem hiding this comment.
you can embed OracleClient
antonlerner
reviewed
Jan 24, 2019
oracle/rolacle_client.go
Outdated
|
|
||
| func (hr *HTTPRequester) Get(api, data string) []byte { | ||
| var jsonStr = []byte(data) | ||
| spew.Println(string(jsonStr)) |
There was a problem hiding this comment.
you can just print data
antonlerner
reviewed
Jan 24, 2019
oracle/rolacle_client.go
Outdated
|
|
||
|
|
||
| // Validate checks whether a given ID is in the eligible list or not. it fetches the list once and gives answers locally after that. | ||
| func (oc *OracleClient) Validate(instanceID []byte, K int, committeeSize int, pubKey fmt.Stringer) bool { |
There was a problem hiding this comment.
its Validate for following the hare Rolacle interface.
antonlerner
reviewed
Jan 24, 2019
antonlerner
approved these changes
Jan 24, 2019
y0sher
force-pushed
the
oracle_client
branch
2 times, most recently
from
dd9ab25
to
0be9995
Compare
get rid of "stringer"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
server code is in https://github.com/y0sher/oracle_server for now.
This lets use a server as the authority of eligibility for testing.
we use the json api in order to not pollute the node with server pb files