Skip to content

Commit 7f5f515

Browse files
MatusKyselMatusKysel
authored
fix(reshare): fix check of proof path (#167)
* fix(reshare): fix check of proof path * fix: local path for resign * fix default output path * fix the tests * fix default value * remove debug print
1 parent 08425ce commit 7f5f515

10 files changed

+161
-161
lines changed

‎cli/flags/base.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,5 @@ func ConfigPathFlag(c *cobra.Command) {
106106

107107
// OutputPathFlag sets the path to store resulting files
108108
func OutputPathFlag(c *cobra.Command) {
109-
AddPersistentStringFlag(c, outputPath, "./output", "Path to store results", false)
109+
AddPersistentStringFlag(c, outputPath, "./data/output", "Path to store results", false)
110110
}

‎cli/flags/reshare.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -107,46 +107,46 @@ func BindGenerateReshareMsgFlags(cmd *cobra.Command) error {
107107
}
108108
OperatorIDs = viper.GetStringSlice("operatorIDs")
109109
if len(OperatorIDs) == 0 {
110-
return fmt.Errorf("😥 Old operator IDs flag cannot be empty")
110+
return fmt.Errorf("😥 old operator IDs flag cannot be empty")
111111
}
112112
NewOperatorIDs = viper.GetStringSlice("newOperatorIDs")
113113
if len(NewOperatorIDs) == 0 {
114-
return fmt.Errorf("😥 New operator IDs flag cannot be empty")
114+
return fmt.Errorf("😥 new operator IDs flag cannot be empty")
115115
}
116116
ProofsFilePath = viper.GetString("proofsFilePath")
117117
if ProofsFilePath != "" {
118118
ProofsFilePath = filepath.Clean(ProofsFilePath)
119119
}
120120
ProofsString = viper.GetString("proofsString")
121121
if ProofsFilePath == "" && ProofsString == "" {
122-
return fmt.Errorf("😥 Failed to get proofs from proofs string or path to proofs flag value")
122+
return fmt.Errorf("😥 failed to get proofs from proofs string or path to proofs flag value")
123123
}
124124
if ProofsFilePath != "" && ProofsString != "" {
125125
return fmt.Errorf("😥 proofs can be provided either as a string, or path to a file, not both")
126126
}
127-
if !filepath.IsLocal(ProofsFilePath) {
127+
if ProofsFilePath != "" && !filepath.IsLocal(ProofsFilePath) {
128128
return fmt.Errorf("😥 wrong proofsFilePath flag, should be local")
129129
}
130130
withdrawAddr := viper.GetString("withdrawAddress")
131131
if withdrawAddr == "" {
132-
return fmt.Errorf("😥 Failed to get withdrawal address flag value")
132+
return fmt.Errorf("😥 failed to get withdrawal address flag value")
133133
}
134134
var err error
135135
WithdrawAddress, err = utils.HexToAddress(withdrawAddr)
136136
if err != nil {
137-
return fmt.Errorf("😥 Failed to parse withdraw address: %s", err.Error())
137+
return fmt.Errorf("😥 failed to parse withdraw address: %s", err.Error())
138138
}
139139
Network = viper.GetString("network")
140140
if Network == "" {
141-
return fmt.Errorf("😥 Failed to get fork version flag value")
141+
return fmt.Errorf("😥 failed to get fork version flag value")
142142
}
143143
owner := viper.GetString("owner")
144144
if owner == "" {
145-
return fmt.Errorf("😥 Failed to get owner address flag value")
145+
return fmt.Errorf("😥 failed to get owner address flag value")
146146
}
147147
OwnerAddress, err = utils.HexToAddress(owner)
148148
if err != nil {
149-
return fmt.Errorf("😥 Failed to parse owner address: %s", err)
149+
return fmt.Errorf("😥 failed to parse owner address: %s", err)
150150
}
151151
Nonce = viper.GetUint64("nonce")
152152
Amount = viper.GetUint64("amount")
@@ -166,7 +166,7 @@ func BindReshareFlags(cmd *cobra.Command) error {
166166
}
167167
Signatures = viper.GetString("signatures")
168168
if Signatures == "" {
169-
return fmt.Errorf("😥 Failed to get --signatures flag value")
169+
return fmt.Errorf("😥 failed to get --signatures flag value")
170170
}
171171
if err := viper.BindPFlag("clientCACertPath", cmd.PersistentFlags().Lookup("clientCACertPath")); err != nil {
172172
return err
@@ -194,7 +194,7 @@ func BindReshareFlags(cmd *cobra.Command) error {
194194

195195
// newOperatorIDsFlag adds new operators IDs flag to the command
196196
func NewOperatorIDsFlag(c *cobra.Command) {
197-
AddPersistentStringSliceFlag(c, newOperatorIDs, []string{"1", "2", "3"}, "New operator IDs for resharing ceremony", false)
197+
AddPersistentStringSliceFlag(c, newOperatorIDs, []string{}, "New operator IDs for resharing ceremony", false)
198198
}
199199

200200
// ProofsFilePath add file path to proofs flag to the command

‎cli/flags/resign.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func BindGenerateResignMsgFlags(cmd *cobra.Command) error {
7373
}
7474
OperatorIDs = viper.GetStringSlice("operatorIDs")
7575
if len(OperatorIDs) == 0 {
76-
return fmt.Errorf("😥 Operator IDs flag cant be empty")
76+
return fmt.Errorf("😥 operator IDs flag cant be empty")
7777
}
7878
OperatorsInfoPath = viper.GetString("operatorsInfoPath")
7979
if OperatorsInfoPath != "" {
@@ -91,43 +91,43 @@ func BindGenerateResignMsgFlags(cmd *cobra.Command) error {
9191
}
9292
owner := viper.GetString("owner")
9393
if owner == "" {
94-
return fmt.Errorf("😥 Failed to get owner address flag value")
94+
return fmt.Errorf("😥 failed to get owner address flag value")
9595
}
9696
Nonce = viper.GetUint64("nonce")
9797
Amount = viper.GetUint64("amount")
9898
if !spec.ValidAmountSet(phase0.Gwei(Amount)) {
99-
return fmt.Errorf("🚨 Amount should be in range between 32 ETH and 2048 ETH")
99+
return fmt.Errorf("🚨 amount should be in range between 32 ETH and 2048 ETH")
100100
}
101101
ProofsFilePath = viper.GetString("proofsFilePath")
102102
if ProofsFilePath != "" {
103103
ProofsFilePath = filepath.Clean(ProofsFilePath)
104104
}
105105
ProofsString = viper.GetString("proofsString")
106106
if ProofsFilePath == "" && ProofsString == "" {
107-
return fmt.Errorf("😥 Failed to get proofs from proofs string or path to proofs flag value")
107+
return fmt.Errorf("😥 failed to get proofs from proofs string or path to proofs flag value")
108108
}
109109
if ProofsFilePath != "" && ProofsString != "" {
110110
return fmt.Errorf("😥 proofs can be provided either as a string, or path to a file, not both")
111111
}
112-
if !filepath.IsLocal(ProofsFilePath) {
112+
if ProofsFilePath != "" && !filepath.IsLocal(ProofsFilePath) {
113113
return fmt.Errorf("😥 wrong proofsFilePath flag, should be local")
114114
}
115115
withdrawAddr := viper.GetString("withdrawAddress")
116116
if withdrawAddr == "" {
117-
return fmt.Errorf("😥 Failed to get withdrawal address flag value")
117+
return fmt.Errorf("😥 failed to get withdrawal address flag value")
118118
}
119119
var err error
120120
WithdrawAddress, err = utils.HexToAddress(withdrawAddr)
121121
if err != nil {
122-
return fmt.Errorf("😥 Failed to parse withdraw address: %s", err.Error())
122+
return fmt.Errorf("😥 failed to parse withdraw address: %s", err.Error())
123123
}
124124
Network = viper.GetString("network")
125125
if Network == "" {
126-
return fmt.Errorf("😥 Failed to get fork version flag value")
126+
return fmt.Errorf("😥 failed to get fork version flag value")
127127
}
128128
OwnerAddress, err = utils.HexToAddress(owner)
129129
if err != nil {
130-
return fmt.Errorf("😥 Failed to parse owner address: %s", err)
130+
return fmt.Errorf("😥 failed to parse owner address: %s", err)
131131
}
132132
return nil
133133
}

‎integration_test/init_bulk_test.go

+16-16
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
)
1818

1919
func TestBulkHappyFlows4Ops(t *testing.T) {
20-
err := os.RemoveAll("./output/")
20+
err := os.RemoveAll("./data/output/")
2121
require.NoError(t, err)
2222
err = logging.SetGlobalLogger("info", "capital", "console", nil)
2323
require.NoError(t, err)
@@ -89,12 +89,12 @@ func TestBulkHappyFlows4Ops(t *testing.T) {
8989
resetFlags(RootCmd)
9090
})
9191
// validate results
92-
initCeremonies, err := os.ReadDir("./output")
92+
initCeremonies, err := os.ReadDir("./data/output")
9393
require.NoError(t, err)
9494
validators := []int{1, 10, 100}
9595
for i, c := range initCeremonies {
9696
args := []string{"verify",
97-
"--ceremonyDir", "./output/" + c.Name(),
97+
"--ceremonyDir", "./data/output/" + c.Name(),
9898
"--validators", strconv.Itoa(validators[i]),
9999
"--withdrawAddress", "0x81592c3de184a3e2c0dcb5a261bc107bfa91f494",
100100
"--owner", "0x81592c3de184a3e2c0dcb5a261bc107bfa91f494",
@@ -105,15 +105,15 @@ func TestBulkHappyFlows4Ops(t *testing.T) {
105105
require.NoError(t, err)
106106
resetFlags(RootCmd)
107107
}
108-
err = os.RemoveAll("./output/")
108+
err = os.RemoveAll("./data/output/")
109109
require.NoError(t, err)
110110
for _, srv := range servers {
111111
srv.HttpSrv.Close()
112112
}
113113
}
114114

115115
func TestBulkHappyFlows7Ops(t *testing.T) {
116-
err := os.RemoveAll("./output/")
116+
err := os.RemoveAll("./data/output/")
117117
require.NoError(t, err)
118118
err = logging.SetGlobalLogger("info", "capital", "console", nil)
119119
require.NoError(t, err)
@@ -184,12 +184,12 @@ func TestBulkHappyFlows7Ops(t *testing.T) {
184184
resetFlags(RootCmd)
185185
})
186186
// validate results
187-
initCeremonies, err := os.ReadDir("./output")
187+
initCeremonies, err := os.ReadDir("./data/output")
188188
require.NoError(t, err)
189189
validators := []int{1, 10, 100}
190190
for i, c := range initCeremonies {
191191
args := []string{"verify",
192-
"--ceremonyDir", "./output/" + c.Name(),
192+
"--ceremonyDir", "./data/output/" + c.Name(),
193193
"--validators", strconv.Itoa(validators[i]),
194194
"--withdrawAddress", "0x81592c3de184a3e2c0dcb5a261bc107bfa91f494",
195195
"--owner", "0x81592c3de184a3e2c0dcb5a261bc107bfa91f494",
@@ -200,15 +200,15 @@ func TestBulkHappyFlows7Ops(t *testing.T) {
200200
require.NoError(t, err)
201201
resetFlags(RootCmd)
202202
}
203-
err = os.RemoveAll("./output/")
203+
err = os.RemoveAll("./data/output/")
204204
require.NoError(t, err)
205205
for _, srv := range servers {
206206
srv.HttpSrv.Close()
207207
}
208208
}
209209

210210
func TestBulkHappyFlows10Ops(t *testing.T) {
211-
err := os.RemoveAll("./output/")
211+
err := os.RemoveAll("./data/output/")
212212
require.NoError(t, err)
213213
err = logging.SetGlobalLogger("info", "capital", "console", nil)
214214
require.NoError(t, err)
@@ -279,12 +279,12 @@ func TestBulkHappyFlows10Ops(t *testing.T) {
279279
resetFlags(RootCmd)
280280
})
281281
// validate results
282-
initCeremonies, err := os.ReadDir("./output")
282+
initCeremonies, err := os.ReadDir("./data/output")
283283
require.NoError(t, err)
284284
validators := []int{1, 10, 100}
285285
for i, c := range initCeremonies {
286286
args := []string{"verify",
287-
"--ceremonyDir", "./output/" + c.Name(),
287+
"--ceremonyDir", "./data/output/" + c.Name(),
288288
"--validators", strconv.Itoa(validators[i]),
289289
"--withdrawAddress", "0x81592c3de184a3e2c0dcb5a261bc107bfa91f494",
290290
"--owner", "0x81592c3de184a3e2c0dcb5a261bc107bfa91f494",
@@ -295,15 +295,15 @@ func TestBulkHappyFlows10Ops(t *testing.T) {
295295
require.NoError(t, err)
296296
resetFlags(RootCmd)
297297
}
298-
err = os.RemoveAll("./output/")
298+
err = os.RemoveAll("./data/output/")
299299
require.NoError(t, err)
300300
for _, srv := range servers {
301301
srv.HttpSrv.Close()
302302
}
303303
}
304304

305305
func TestBulkHappyFlows13Ops(t *testing.T) {
306-
err := os.RemoveAll("./output/")
306+
err := os.RemoveAll("./data/output/")
307307
require.NoError(t, err)
308308
err = logging.SetGlobalLogger("info", "capital", "console", nil)
309309
require.NoError(t, err)
@@ -374,12 +374,12 @@ func TestBulkHappyFlows13Ops(t *testing.T) {
374374
resetFlags(RootCmd)
375375
})
376376
// validate results
377-
initCeremonies, err := os.ReadDir("./output")
377+
initCeremonies, err := os.ReadDir("./data/output")
378378
require.NoError(t, err)
379379
validators := []int{1, 10, 100}
380380
for i, c := range initCeremonies {
381381
args := []string{"verify",
382-
"--ceremonyDir", "./output/" + c.Name(),
382+
"--ceremonyDir", "./data/output/" + c.Name(),
383383
"--validators", strconv.Itoa(validators[i]),
384384
"--withdrawAddress", "0x81592c3de184a3e2c0dcb5a261bc107bfa91f494",
385385
"--owner", "0x81592c3de184a3e2c0dcb5a261bc107bfa91f494",
@@ -390,7 +390,7 @@ func TestBulkHappyFlows13Ops(t *testing.T) {
390390
require.NoError(t, err)
391391
resetFlags(RootCmd)
392392
}
393-
err = os.RemoveAll("./output/")
393+
err = os.RemoveAll("./data/output/")
394394
require.NoError(t, err)
395395
for _, srv := range servers {
396396
srv.HttpSrv.Close()

0 commit comments

Comments
 (0)