arnaucube/hermez-node
1
0
Fork 0
mirror of https://github.com/arnaucube/hermez-node.git synced 2026-02-07 03:16:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update node and coordinator, fix linters

Browse Source
This commit is contained in:
Eduard S
2020-12-09 16:22:31 +01:00
parent 4ad67a3d18
commit d8050dd0a6
5 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
prover/prover.go
View File

@@ -133,7 +133,7 @@ type formFileProvider struct {
body []byte
}
//nolint:unused
//nolint:unused,deadcode
func newFormFileProvider(payload interface{}) (*formFileProvider, error) {
body := new(bytes.Buffer)
writer := multipart.NewWriter(body)
@@ -239,9 +239,8 @@ func (p *ProofServerClient) GetProof(ctx context.Context) (*Proof, error) {
return nil, tracerr.Wrap(err)
}
return &proof, nil
} else {
return nil, errors.New("State is not Success")
}
return nil, errors.New("State is not Success")
}
// Cancel cancels any current proof computation
@@ -262,22 +261,21 @@ func (p *ProofServerClient) WaitReady(ctx context.Context) error {
if !status.Status.IsInitialized() {
err := errors.New("Proof Server is not initialized")
return err
} else {
if status.Status.IsReady() {
return nil
}
for {
select {
case <-ctx.Done():
return tracerr.Wrap(common.ErrDone)
case <-time.After(p.timeCons):
status, err := p.apiStatus(ctx)
if err != nil {
return tracerr.Wrap(err)
}
if status.Status.IsReady() {
return nil
}
}
if status.Status.IsReady() {
return nil
}
for {
select {
case <-ctx.Done():
return tracerr.Wrap(common.ErrDone)
case <-time.After(p.timeCons):
status, err := p.apiStatus(ctx)
if err != nil {
return tracerr.Wrap(err)
}
if status.Status.IsReady() {
return nil
}
}
}
@@ -289,7 +287,7 @@ type MockClient struct {
// CalculateProof sends the *common.ZKInputs to the ServerProof to compute the
// Proof
func (p *MockClient) CalculateProof(zkInputs *common.ZKInputs) error {
func (p *MockClient) CalculateProof(ctx context.Context, zkInputs *common.ZKInputs) error {
return nil
}

6
prover/prover_test.go
View File

@@ -47,8 +47,7 @@ func testAPIStatus(t *testing.T) {
}
func testCalculateProof(t *testing.T) {
var zkInputs *common.ZKInputs
zkInputs = common.NewZKInputs(100, 16, 512, 24, 32, big.NewInt(1))
zkInputs := common.NewZKInputs(100, 16, 512, 24, 32, big.NewInt(1))
err := proofServerClient.CalculateProof(context.Background(), zkInputs)
require.NoError(t, err)
}
@@ -64,8 +63,7 @@ func testGetProof(t *testing.T) {
}
func testCancel(t *testing.T) {
var zkInputs *common.ZKInputs
zkInputs = common.NewZKInputs(100, 16, 512, 24, 32, big.NewInt(1))
zkInputs := common.NewZKInputs(100, 16, 512, 24, 32, big.NewInt(1))
err := proofServerClient.CalculateProof(context.Background(), zkInputs)
require.NoError(t, err)
// TODO: remove sleep when the server has been reviewed