Combine the identical if-else branches in client/client.go

[chengfang]

in client/client.go, the following if-else branches contain the identical logic and should be combined:

               if err == context.DeadlineExceeded {
                       return nil, err
               }
               return nil, err