linting: cover the basics

This commit is contained in:
Zach Ramsay 2017-09-21 15:26:43 -04:00 committed by Ethan Buchman
parent bd9f1d0d4c
commit 6a378d30f3
7 changed files with 13 additions and 23 deletions

View File

@ -113,7 +113,7 @@ func (cli *grpcClient) SetResponseCallback(resCb Callback) {
//---------------------------------------- //----------------------------------------
// GRPC calls are synchronous, but some callbacks expect to be called asynchronously // GRPC calls are synchronous, but some callbacks expect to be called asynchronously
// (eg. the mempool expects to be able to lock to remove bad txs from cache). // (eg. the mempool expects to be able to lock to remove bad txs from cache).
// To accomodate, we finish each call in its own go-routine, // To accommodate, we finish each call in its own go-routine,
// which is expensive, but easy - if you want something better, use the socket protocol! // which is expensive, but easy - if you want something better, use the socket protocol!
// maybe one day, if people really want it, we use grpc streams, // maybe one day, if people really want it, we use grpc streams,
// but hopefully not :D // but hopefully not :D

View File

@ -20,7 +20,7 @@ const (
) )
const reqQueueSize = 256 // TODO make configurable const reqQueueSize = 256 // TODO make configurable
const maxResponseSize = 1048576 // 1MB TODO make configurable // const maxResponseSize = 1048576 // 1MB TODO make configurable
const flushThrottleMS = 20 // Don't wait longer than... const flushThrottleMS = 20 // Don't wait longer than...
// This is goroutine-safe, but users should beware that // This is goroutine-safe, but users should beware that
@ -355,19 +355,13 @@ func (cli *socketClient) CommitSync() (res types.Result) {
func (cli *socketClient) InitChainSync(params types.RequestInitChain) (err error) { func (cli *socketClient) InitChainSync(params types.RequestInitChain) (err error) {
cli.queueRequest(types.ToRequestInitChain(params)) cli.queueRequest(types.ToRequestInitChain(params))
cli.FlushSync() cli.FlushSync()
if err := cli.Error(); err != nil { return cli.Error()
return err
}
return nil
} }
func (cli *socketClient) BeginBlockSync(params types.RequestBeginBlock) (err error) { func (cli *socketClient) BeginBlockSync(params types.RequestBeginBlock) (err error) {
cli.queueRequest(types.ToRequestBeginBlock(params)) cli.queueRequest(types.ToRequestBeginBlock(params))
cli.FlushSync() cli.FlushSync()
if err := cli.Error(); err != nil { return cli.Error()
return err
}
return nil
} }
func (cli *socketClient) EndBlockSync(height uint64) (resEndBlock types.ResponseEndBlock, err error) { func (cli *socketClient) EndBlockSync(height uint64) (resEndBlock types.ResponseEndBlock, err error) {

View File

@ -183,12 +183,12 @@ func badCmd(c *cli.Context, cmd string) {
//Generates new Args array based off of previous call args to maintain flag persistence //Generates new Args array based off of previous call args to maintain flag persistence
func persistentArgs(line []byte) []string { func persistentArgs(line []byte) []string {
//generate the arguments to run from orginal os.Args // generate the arguments to run from original os.Args
// to maintain flag arguments // to maintain flag arguments
args := os.Args args := os.Args
args = args[:len(args)-1] // remove the previous command argument args = args[:len(args)-1] // remove the previous command argument
if len(line) > 0 { //prevents introduction of extra space leading to argument parse errors if len(line) > 0 { // prevents introduction of extra space leading to argument parse errors
args = append(args, strings.Split(string(line), " ")...) args = append(args, strings.Split(string(line), " ")...)
} }
return args return args

View File

@ -57,7 +57,6 @@ func (app *ChainAwareApplication) Query(reqQuery types.RequestQuery) (resQuery t
func (app *ChainAwareApplication) BeginBlock(reqBeginBlock types.RequestBeginBlock) { func (app *ChainAwareApplication) BeginBlock(reqBeginBlock types.RequestBeginBlock) {
app.beginCount++ app.beginCount++
return
} }
func (app *ChainAwareApplication) EndBlock(height uint64) (resEndBlock types.ResponseEndBlock) { func (app *ChainAwareApplication) EndBlock(height uint64) (resEndBlock types.ResponseEndBlock) {

View File

@ -166,7 +166,7 @@ func TestValSetChanges(t *testing.T) {
makeApplyBlock(t, dummy, 3, diff, tx1) makeApplyBlock(t, dummy, 3, diff, tx1)
vals1 = append([]*types.Validator{v1}, vals1[1:len(vals1)]...) vals1 = append([]*types.Validator{v1}, vals1[1:]...)
vals2 = dummy.Validators() vals2 = dummy.Validators()
valsEqual(t, vals1, vals2) valsEqual(t, vals1, vals2)

View File

@ -187,10 +187,7 @@ func MakeValSetChangeTx(pubkey []byte, power uint64) []byte {
} }
func isValidatorTx(tx []byte) bool { func isValidatorTx(tx []byte) bool {
if strings.HasPrefix(string(tx), ValidatorSetChangePrefix) { return strings.HasPrefix(string(tx), ValidatorSetChangePrefix)
return true
}
return false
} }
// format is "val:pubkey1/power1,addr2/power2,addr3/power3"tx // format is "val:pubkey1/power1,addr2/power2,addr3/power3"tx
@ -232,7 +229,7 @@ func (app *PersistentDummyApplication) updateValidator(v *types.Validator) types
app.app.state.Set(key, value.Bytes()) app.app.state.Set(key, value.Bytes())
} }
// we only update the changes array if we succesfully updated the tree // we only update the changes array if we successfully updated the tree
app.changes = append(app.changes, v) app.changes = append(app.changes, v)
return types.OK return types.OK

View File

@ -80,7 +80,7 @@ func deliverTx(client abcicli.Client, txBytes []byte, codeExp types.CodeType, da
} }
} }
func checkTx(client abcicli.Client, txBytes []byte, codeExp types.CodeType, dataExp []byte) { /*func checkTx(client abcicli.Client, txBytes []byte, codeExp types.CodeType, dataExp []byte) {
res := client.CheckTxSync(txBytes) res := client.CheckTxSync(txBytes)
code, data, log := res.Code, res.Data, res.Log code, data, log := res.Code, res.Data, res.Log
if res.IsErr() { if res.IsErr() {
@ -94,4 +94,4 @@ func checkTx(client abcicli.Client, txBytes []byte, codeExp types.CodeType, data
panic(fmt.Sprintf("CheckTx response data was unexpected. Got %X expected %X", panic(fmt.Sprintf("CheckTx response data was unexpected. Got %X expected %X",
data, dataExp)) data, dataExp))
} }
} }*/