Edit Client Function

asuleymanov · Oct 5, 2017 · ceb5659 · ceb5659
1 parent 0197e17
commit ceb5659
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ This is just a code snippet. Please check the `examples` directory
 for more complete and ready to use examples.
 
 ```go
-	cls := client.NewApi()
+	cls := client.NewApi([]string{"wss://ws.golos.io"},"golos")
 	defer cls.Rpc.Close()
 
 	// Get config.

diff --git a/apis/database/api.go b/apis/database/api.go
@@ -472,11 +472,11 @@ func (api *API) GetConversionRequests(accountName string) ([]*ConversionRequests
 }
 
 //get_account_history
-func (api *API) GetAccountHistory(account string, from uint64, limit uint32) (*json.RawMessage, error) {
+/*func (api *API) GetAccountHistory(account string, from uint64, limit uint32) (*json.RawMessage, error) {
 	return api.Raw("get_account_history", []interface{}{account, from, limit})
-}
+}*/
 
-/*func (api *API) GetAccountHistory(account string, from uint64, limit uint32) ([]*AccountHistory, error) {
+func (api *API) GetAccountHistory(account string, from uint64, limit uint32) ([]*types.OperationObject, error) {
 	raw, err := api.Raw("get_account_history", []interface{}{account, from, limit})
 	if err != nil {
 		return nil, err
@@ -485,17 +485,20 @@ func (api *API) GetAccountHistory(account string, from uint64, limit uint32) (*j
 	if err := json.Unmarshal([]byte(*raw), &tmp1); err != nil {
 		return nil, err
 	}
-	var resp []*AccountHistory
+	var resp []*types.OperationObject
 	for _, v := range tmp1 {
-		byteData, _ := json.Marshal(v[1])
-		var tmp AccountHistory
+		byteData, errm := json.Marshal(&v[1])
+		if errm != nil {
+			return nil, errm
+		}
+		var tmp *types.OperationObject
 		if err := json.Unmarshal(byteData, &tmp); err != nil {
 			return nil, err
 		}
-		resp = append(resp, &tmp)
+		resp = append(resp, tmp)
 	}
 	return resp, nil
-}*/
+}
 
 //get_owner_history
 func (api *API) GetOwnerHistory(accountName string) (*json.RawMessage, error) {

diff --git a/apis/database/data.go b/apis/database/data.go
@@ -493,13 +493,3 @@ type Categories struct {
 	Discussions  *types.Int `json:"discussions"`
 	LastUpdate   string     `json:"last_update"`
 }
-
-type AccountHistory struct {
-	TrxID      string        `json:"trx_id"`
-	Block      int           `json:"block"`
-	TrxInBlock int           `json:"trx_in_block"`
-	OpInTrx    int           `json:"op_in_trx"`
-	VirtualOp  int           `json:"virtual_op"`
-	Timestamp  string        `json:"timestamp"`
-	Op         []interface{} `json:"op"`
-}
diff --git a/client/functions.go b/client/functions.go
@@ -198,6 +198,15 @@ func (api *Client) Post_Options(author_name, title, body string, tags []string,
 	permlink := translit.EncodeTitle(title)
 	tag := translit.EncodeTags(tags)
 	ptag := translit.EncodeTag(tags[0])
+	MAP := "1000000.000 GBG"
+	PSD := percent
+	if percent == 0 {
+		MAP = "0.000 GBG"
+	} else if percent == 50 {
+		PSD = 10000
+	} else {
+		PSD = 0
+	}
 
 	json_meta := "{\"tags\":["
 	for k, v := range tag {
@@ -222,8 +231,8 @@ func (api *Client) Post_Options(author_name, title, body string, tags []string,
 	txo := &types.CommentOptionsOperation{
 		Author:               author_name,
 		Permlink:             permlink,
-		MaxAcceptedPayout:    "1000000.000 GBG",
-		PercentSteemDollars:  percent,
+		MaxAcceptedPayout:    MAP,
+		PercentSteemDollars:  PSD,
 		AllowVotes:           votes,
 		AllowCurationRewards: curation,
 		Extensions:           []interface{}{},
@@ -239,13 +248,22 @@ func (api *Client) Post_Options(author_name, title, body string, tags []string,
 	}
 }
 
-func (api *Client) Post_Options_Vote(author_name, title, body string, tags []string, percent uint16, weight_post int, votes, curation bool) error {
+func (api *Client) Post_Options_Vote(author_name, title, body string, tags []string, weight_post int, percent uint16, votes, curation bool) error {
 	if weight_post > 10000 {
 		weight_post = 10000
 	}
 	permlink := translit.EncodeTitle(title)
 	tag := translit.EncodeTags(tags)
 	ptag := translit.EncodeTag(tags[0])
+	MAP := "1000000.000 GBG"
+	PSD := percent
+	if percent == 0 {
+		MAP = "0.000 GBG"
+	} else if percent == 50 {
+		PSD = 10000
+	} else {
+		PSD = 0
+	}
 
 	json_meta := "{\"tags\":["
 	for k, v := range tag {
@@ -271,11 +289,11 @@ func (api *Client) Post_Options_Vote(author_name, title, body string, tags []str
 	txo := &types.CommentOptionsOperation{
 		Author:               author_name,
 		Permlink:             permlink,
-		MaxAcceptedPayout:    "1000000.000 GBG",
-		PercentSteemDollars:  percent,
+		MaxAcceptedPayout:    MAP,
+		PercentSteemDollars:  PSD,
 		AllowVotes:           votes,
 		AllowCurationRewards: curation,
-		//Extensions:           "",
+		Extensions:           []interface{}{},
 	}
 	trx = append(trx, txo)