util cleanup
This commit is contained in:
parent
fee0763b5e
commit
eb16a01666
|
@ -74,6 +74,7 @@ func updateValidators(tb testing.TB, r *rand.Rand, params Params,
|
||||||
|
|
||||||
for _, update := range updates {
|
for _, update := range updates {
|
||||||
str := fmt.Sprintf("%v", update.PubKey)
|
str := fmt.Sprintf("%v", update.PubKey)
|
||||||
|
|
||||||
if update.Power == 0 {
|
if update.Power == 0 {
|
||||||
if _, ok := current[str]; !ok {
|
if _, ok := current[str]; !ok {
|
||||||
tb.Fatalf("tried to delete a nonexistent validator")
|
tb.Fatalf("tried to delete a nonexistent validator")
|
||||||
|
@ -85,6 +86,7 @@ func updateValidators(tb testing.TB, r *rand.Rand, params Params,
|
||||||
// validator already exists
|
// validator already exists
|
||||||
mVal.val = update
|
mVal.val = update
|
||||||
event("endblock/validatorupdates/updated")
|
event("endblock/validatorupdates/updated")
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Set this new validator
|
// Set this new validator
|
||||||
current[str] = mockValidator{
|
current[str] = mockValidator{
|
||||||
|
|
|
@ -34,20 +34,26 @@ func DisplayEvents(events map[string]uint) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Builds a function to add logs for this particular block
|
// Builds a function to add logs for this particular block
|
||||||
func addLogMessage(testingmode bool, blockLogBuilders []*strings.Builder, height int) func(string) {
|
func addLogMessage(testingmode bool,
|
||||||
if testingmode {
|
blockLogBuilders []*strings.Builder, height int) func(string) {
|
||||||
|
|
||||||
|
if !testingmode {
|
||||||
|
return func(_ string) {}
|
||||||
|
}
|
||||||
|
|
||||||
blockLogBuilders[height] = &strings.Builder{}
|
blockLogBuilders[height] = &strings.Builder{}
|
||||||
return func(x string) {
|
return func(x string) {
|
||||||
(*blockLogBuilders[height]).WriteString(x)
|
(*blockLogBuilders[height]).WriteString(x)
|
||||||
(*blockLogBuilders[height]).WriteString("\n")
|
(*blockLogBuilders[height]).WriteString("\n")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return func(x string) {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Creates a function to print out the logs
|
// Creates a function to print out the logs
|
||||||
func logPrinter(testingmode bool, logs []*strings.Builder) func() {
|
func logPrinter(testingmode bool, logs []*strings.Builder) func() {
|
||||||
if testingmode {
|
if !testingmode {
|
||||||
|
return func() {}
|
||||||
|
}
|
||||||
|
|
||||||
return func() {
|
return func() {
|
||||||
numLoggers := 0
|
numLoggers := 0
|
||||||
for i := 0; i < len(logs); i++ {
|
for i := 0; i < len(logs); i++ {
|
||||||
|
@ -57,31 +63,32 @@ func logPrinter(testingmode bool, logs []*strings.Builder) func() {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var f *os.File
|
var f *os.File
|
||||||
if numLoggers > 10 {
|
if numLoggers > 10 {
|
||||||
|
|
||||||
fileName := fmt.Sprintf("simulation_log_%s.txt",
|
fileName := fmt.Sprintf("simulation_log_%s.txt",
|
||||||
time.Now().Format("2006-01-02 15:04:05"))
|
time.Now().Format("2006-01-02 15:04:05"))
|
||||||
|
fmt.Printf("Too many logs to display, instead writing to %s\n",
|
||||||
fmt.Printf("Too many logs to display, instead writing to %s\n", fileName)
|
fileName)
|
||||||
f, _ = os.Create(fileName)
|
f, _ = os.Create(fileName)
|
||||||
}
|
}
|
||||||
|
|
||||||
for i := 0; i < numLoggers; i++ {
|
for i := 0; i < numLoggers; i++ {
|
||||||
if f != nil {
|
if f == nil {
|
||||||
|
fmt.Printf("Begin block %d\n", i+1)
|
||||||
|
fmt.Println((*logs[i]).String())
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
_, err := f.WriteString(fmt.Sprintf("Begin block %d\n", i+1))
|
_, err := f.WriteString(fmt.Sprintf("Begin block %d\n", i+1))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic("Failed to write logs to file")
|
panic("Failed to write logs to file")
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = f.WriteString((*logs[i]).String())
|
_, err = f.WriteString((*logs[i]).String())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic("Failed to write logs to file")
|
panic("Failed to write logs to file")
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
fmt.Printf("Begin block %d\n", i+1)
|
|
||||||
fmt.Println((*logs[i]).String())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
return func() {}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue