Merge pull request #20 from aemet93/master

ExportOutputs and ExportKeyImages implementations

README.md

@@ -164,11 +164,11 @@ type Wallet interface {
 	// Verify a signature on a string.
 	Verify(req *VerifyRequest) (*VerifyResponse, error)
 	// ExportOutputs Export all outputs in hex format.
-	ExportOutputs() error
+	ExportOutputs(req *ExportOutputsRequest) (*ExportOutputsResponse, error)
 	// ImportOutputs Import outputs in hex format.
 	ImportOutputs(req *ImportOutputsRequest) (*ImportOutputsResponse, error)
 	// ExportKeyImages Export a signed set of key images.
-	ExportKeyImages() error
+	ExportKeyImages(req *ExportKeyImagesRequest) (*ExportKeyImagesResponse, error)
 	// ImportKeyImages Import signed key images list and verify their spent status.
 	ImportKeyImages(req *ImportKeyImagesRequest) (*ImportKeyImagesResponse, error)
 	// MakeURI Create a payment URI using the official URI spec.

wallet/models.go

@@ -997,6 +997,18 @@ type VerifyResponse struct {
 	Good bool `json:"good"`
 }
 
+// ExportOutputsRequest represents the request model for ExportOutputs
+type ExportOutputsRequest struct {
+	// If true, export all outputs. Otherwise, export outputs since the last export. (default = false)
+	All bool `json:"all"`
+}
+
+// ExportOutputsResponse represents the response model for ExportOutputs
+type ExportOutputsResponse struct {
+	// Wallet outputs in hex format.
+	OutputsDataHex string `json:"outputs_data_hex"`
+}
+
 // ImportOutputsRequest represents the request model for ImportOutputs
 type ImportOutputsRequest struct {
 	// Wallet outputs in hex format.
@@ -1015,6 +1027,18 @@ type SignedImage struct {
 	Signature string `json:"signature"`
 }
 
+// ExportKeyImagesRequest represent the request model for ExportKeyImages
+type ExportKeyImagesRequest struct {
+	// If true, export all key images. Otherwise, export key images since the last export. (default = false)
+	All bool `json:"all"`
+}
+
+// ExportKeyImagesResponse represent the response model for ExportKeyImages
+type ExportKeyImagesResponse struct {
+	// Array of signed key images:
+	SignedKeyImages []SignedImage `json:"signed_key_images"`
+}
+
 // ImportKeyImagesRequest represents the request model for ImportKeyImages
 type ImportKeyImagesRequest struct {
 	// Array of signed key images:

wallet/wallet.go

@@ -104,11 +104,11 @@ type Wallet interface {
 	// Verify a signature on a string.
 	Verify(req *VerifyRequest) (*VerifyResponse, error)
 	// ExportOutputs Export all outputs in hex format.
-	ExportOutputs() error
+	ExportOutputs(req *ExportOutputsRequest) (*ExportOutputsResponse, error)
 	// ImportOutputs Import outputs in hex format.
 	ImportOutputs(req *ImportOutputsRequest) (*ImportOutputsResponse, error)
 	// ExportKeyImages Export a signed set of key images.
-	ExportKeyImages() error
+	ExportKeyImages(req *ExportKeyImagesRequest) (*ExportKeyImagesResponse, error)
 	// ImportKeyImages Import signed key images list and verify their spent status.
 	ImportKeyImages(req *ImportKeyImagesRequest) (*ImportKeyImagesResponse, error)
 	// MakeURI Create a payment URI using the official URI spec.
@@ -456,8 +456,10 @@ func (w *wallet) Verify(req *VerifyRequest) (*VerifyResponse, error) {
 	return res, err
 }
 
-func (w *wallet) ExportOutputs() error {
-	return w.client.Do("export_outputs", nil, nil)
+func (w *wallet) ExportOutputs(req *ExportOutputsRequest) (*ExportOutputsResponse, error) {
+	res := new(ExportOutputsResponse)
+	err := w.client.Do("export_outputs", req, res)
+	return res, err
 }
 
 func (w *wallet) ImportOutputs(req *ImportOutputsRequest) (*ImportOutputsResponse, error) {
@@ -466,8 +468,10 @@ func (w *wallet) ImportOutputs(req *ImportOutputsRequest) (*ImportOutputsRespons
 	return res, err
 }
 
-func (w *wallet) ExportKeyImages() error {
-	return w.client.Do("export_key_images", nil, nil)
+func (w *wallet) ExportKeyImages(req *ExportKeyImagesRequest) (*ExportKeyImagesResponse, error) {
+	res := new(ExportKeyImagesResponse)
+	err := w.client.Do("export_key_images", req, res)
+	return res, err
 }
 
 func (w *wallet) ImportKeyImages(req *ImportKeyImagesRequest) (*ImportKeyImagesResponse, error) {

wallet/wallet_test.go

@@ -240,7 +240,7 @@ func TestWalletValidateAddress(t *testing.T) {
 		  "integrated": false,
 		  "subaddress": false,
 		  "nettype": "mainnet",
-		  "openalias_address": false
+		  "openalias_address": ""
 		}
 	  }`
 	server := setupServer(t, "validate_address", output)
@@ -1325,7 +1325,7 @@ func TestWalletExportOutputs(t *testing.T) {
 
 	w := New(getClient(server.URL, server.Client()))
 
-	err := w.ExportOutputs()
+	_, err := w.ExportOutputs(&ExportOutputsRequest{})
 	if err != nil {
 		t.Error(err)
 	}
@@ -1369,7 +1369,7 @@ func TestWalletExportKeyImages(t *testing.T) {
 
 	w := New(getClient(server.URL, server.Client()))
 
-	err := w.ExportKeyImages()
+	_, err := w.ExportKeyImages(&ExportKeyImagesRequest{})
 	if err != nil {
 		t.Error(err)
 	}