diff --git a/.gitignore b/.gitignore index c74436ef2..760c8cf71 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.swp *.swo .bak +*.bak .DS_Store build/* rpc/test/.tendermint diff --git a/rpc/core_client/client_methods.go.bak b/rpc/core_client/client_methods.go.bak deleted file mode 100644 index b9af5ff19..000000000 --- a/rpc/core_client/client_methods.go.bak +++ /dev/null @@ -1,828 +0,0 @@ -// File generated by github.com/ebuchman/rpc-gen - -package rpc - -import ( - "fmt" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - "github.com/tendermint/tendermint/rpc/core" - "github.com/tendermint/tendermint/types" - "io/ioutil" - "net/http" -) - -type Client interface { - BlockchainInfo(minHeight uint, maxHeight uint) (*core.ResponseBlockchainInfo, error) - BroadcastTx(tx types.Tx) (*core.ResponseBroadcastTx, error) - Call(address []byte, data []byte) (*core.ResponseCall, error) - CallCode(code []byte, data []byte) (*core.ResponseCall, error) - DumpStorage(addr []byte) (*core.ResponseDumpStorage, error) - GenPrivAccount() (*core.ResponseGenPrivAccount, error) - GetAccount(address []byte) (*core.ResponseGetAccount, error) - GetBlock(height uint) (*core.ResponseGetBlock, error) - GetStorage(address []byte, key []byte) (*core.ResponseGetStorage, error) - ListAccounts() (*core.ResponseListAccounts, error) - ListValidators() (*core.ResponseListValidators, error) - NetInfo() (*core.ResponseNetInfo, error) - SignTx(tx types.Tx, privAccounts []*account.PrivAccount) (*core.ResponseSignTx, error) - Status() (*core.ResponseStatus, error) -} - -func (c *ClientHTTP) BlockchainInfo(minHeight uint, maxHeight uint) (*core.ResponseBlockchainInfo, error) { - values, err := argsToURLValues([]string{"minHeight", "maxHeight"}, minHeight, maxHeight) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["BlockchainInfo"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseBlockchainInfo `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientHTTP) BroadcastTx(tx types.Tx) (*core.ResponseBroadcastTx, error) { - values, err := argsToURLValues([]string{"tx"}, tx) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["BroadcastTx"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseBroadcastTx `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientHTTP) Call(address []byte, data []byte) (*core.ResponseCall, error) { - values, err := argsToURLValues([]string{"address", "data"}, address, data) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["Call"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseCall `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientHTTP) CallCode(code []byte, data []byte) (*core.ResponseCall, error) { - values, err := argsToURLValues([]string{"code", "data"}, code, data) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["CallCode"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseCall `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientHTTP) DumpStorage(addr []byte) (*core.ResponseDumpStorage, error) { - values, err := argsToURLValues([]string{"addr"}, addr) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["DumpStorage"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseDumpStorage `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientHTTP) GenPrivAccount() (*core.ResponseGenPrivAccount, error) { - values, err := argsToURLValues(nil) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["GenPrivAccount"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseGenPrivAccount `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientHTTP) GetAccount(address []byte) (*core.ResponseGetAccount, error) { - values, err := argsToURLValues([]string{"address"}, address) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["GetAccount"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseGetAccount `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientHTTP) GetBlock(height uint) (*core.ResponseGetBlock, error) { - values, err := argsToURLValues([]string{"height"}, height) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["GetBlock"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseGetBlock `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientHTTP) GetStorage(address []byte, key []byte) (*core.ResponseGetStorage, error) { - values, err := argsToURLValues([]string{"address", "key"}, address, key) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["GetStorage"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseGetStorage `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientHTTP) ListAccounts() (*core.ResponseListAccounts, error) { - values, err := argsToURLValues(nil) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["ListAccounts"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseListAccounts `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientHTTP) ListValidators() (*core.ResponseListValidators, error) { - values, err := argsToURLValues(nil) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["ListValidators"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseListValidators `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientHTTP) NetInfo() (*core.ResponseNetInfo, error) { - values, err := argsToURLValues(nil) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["NetInfo"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseNetInfo `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientHTTP) SignTx(tx types.Tx, privAccounts []*account.PrivAccount) (*core.ResponseSignTx, error) { - values, err := argsToURLValues([]string{"tx", "priv_accounts"}, tx, privAccounts) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["SignTx"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseSignTx `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientHTTP) Status() (*core.ResponseStatus, error) { - values, err := argsToURLValues(nil) - if err != nil { - return nil, err - } - resp, err := http.PostForm(c.addr+reverseFuncMap["Status"], values) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseStatus `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) BlockchainInfo(minHeight uint, maxHeight uint) (*core.ResponseBlockchainInfo, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["BlockchainInfo"], - Params: []interface{}{minHeight, maxHeight}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseBlockchainInfo `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) BroadcastTx(tx types.Tx) (*core.ResponseBroadcastTx, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["BroadcastTx"], - Params: []interface{}{tx}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseBroadcastTx `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) Call(address []byte, data []byte) (*core.ResponseCall, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["Call"], - Params: []interface{}{address, data}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseCall `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) CallCode(code []byte, data []byte) (*core.ResponseCall, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["CallCode"], - Params: []interface{}{code, data}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseCall `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) DumpStorage(addr []byte) (*core.ResponseDumpStorage, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["DumpStorage"], - Params: []interface{}{addr}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseDumpStorage `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) GenPrivAccount() (*core.ResponseGenPrivAccount, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["GenPrivAccount"], - Params: []interface{}{}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseGenPrivAccount `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) GetAccount(address []byte) (*core.ResponseGetAccount, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["GetAccount"], - Params: []interface{}{address}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseGetAccount `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) GetBlock(height uint) (*core.ResponseGetBlock, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["GetBlock"], - Params: []interface{}{height}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseGetBlock `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) GetStorage(address []byte, key []byte) (*core.ResponseGetStorage, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["GetStorage"], - Params: []interface{}{address, key}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseGetStorage `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) ListAccounts() (*core.ResponseListAccounts, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["ListAccounts"], - Params: []interface{}{}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseListAccounts `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) ListValidators() (*core.ResponseListValidators, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["ListValidators"], - Params: []interface{}{}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseListValidators `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) NetInfo() (*core.ResponseNetInfo, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["NetInfo"], - Params: []interface{}{}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseNetInfo `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) SignTx(tx types.Tx, privAccounts []*account.PrivAccount) (*core.ResponseSignTx, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["SignTx"], - Params: []interface{}{tx, privAccounts}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseSignTx `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -} - -func (c *ClientJSON) Status() (*core.ResponseStatus, error) { - request := RPCRequest{ - JSONRPC: "2.0", - Method: reverseFuncMap["Status"], - Params: []interface{}{}, - Id: 0, - } - body, err := c.RequestResponse(request) - if err != nil { - return nil, err - } - var response struct { - Result *core.ResponseStatus `json:"result"` - Error string `json:"error"` - Id string `json:"id"` - JSONRPC string `json:"jsonrpc"` - } - binary.ReadJSON(&response, body, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - return response.Result, nil -}