MYST-18 define client promise

client_promise/dto/promise_body.go

@@ -0,0 +1,10 @@
+package dto
+
+import "github.com/mysterium/node/service_discovery/dto"
+
+type PromiseBody struct {
+	SerialNumber int
+	IssuerId     string
+	BenefiterId  string
+	Amount       dto.Money
+}

client_promise/dto/signature.go

@@ -0,0 +1,3 @@
+package dto
+
+type Signature string

client_promise/dto/signed_promise.go

@@ -0,0 +1,6 @@
+package dto
+
+type SignedPromise struct {
+	Promise         PromiseBody
+	IssuerSignature Signature
+}

client_promise/promise_test.go

@@ -0,0 +1,42 @@
+package client_promise
+
+import (
+	dto "github.com/mysterium/node/client_promise/dto"
+	discovery_dto "github.com/mysterium/node/service_discovery/dto"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func Test_PromiseBody(t *testing.T) {
+
+	amount := discovery_dto.Money{
+		Amount:   uint64(5),
+		Currency: "Token",
+	}
+
+	promise := dto.PromiseBody{
+		SerialNumber: 1,
+		IssuerId:     "issuer1",
+		BenefiterId:  "benefiter1",
+		Amount:       amount,
+	}
+
+	assert.Equal(t, promise.SerialNumber, 1)
+	assert.Equal(t, promise.IssuerId, "issuer1")
+	assert.Equal(t, promise.BenefiterId, "benefiter1")
+	assert.Equal(t, promise.Amount.Amount, uint64(5))
+	assert.Equal(t, promise.Amount.Currency, "Token")
+}
+
+func Test_SignedPromise(t *testing.T) {
+
+	promise := dto.PromiseBody{}
+
+	signedPromise := dto.SignedPromise{
+		Promise: promise,
+		IssuerSignature: "signature",
+	}
+
+	assert.Equal(t, signedPromise.Promise, promise)
+	assert.Equal(t, signedPromise.IssuerSignature, dto.Signature("signature"))
+}

openvpn/service_discovery/dto/payment_method_per_bytes.go

@@ -10,7 +10,7 @@ const PAYMENT_METHOD_PER_BYTES = "PER_BYTES"
 type PaymentMethodPerBytes struct {
 	Type string
 
-	Price dto_discovery.Price
+	Price dto_discovery.Money
 
 	// Service bytes provided for paid price
 	Bytes datasize.BitSize
@@ -20,6 +20,6 @@ func (method PaymentMethodPerBytes) GetType() string {
 	return method.Type
 }
 
-func (method PaymentMethodPerBytes) GetPrice() dto_discovery.Price {
+func (method PaymentMethodPerBytes) GetPrice() dto_discovery.Money {
 	return method.Price
 }

openvpn/service_discovery/dto/payment_method_per_time.go

@@ -8,12 +8,12 @@ import (
 const PAYMENT_METHOD_PER_TIME = "PER_TIME"
 
 type PaymentMethodPerTime struct {
-	Price dto_discovery.Price
+	Price dto_discovery.Money
 
 	// Service duration provided for paid price
 	Duration time.Duration
 }
 
-func (method PaymentMethodPerTime) GetPrice() dto_discovery.Price {
+func (method PaymentMethodPerTime) GetPrice() dto_discovery.Money {
 	return method.Price
 }

openvpn/service_discovery/factory.go

@@ -20,7 +20,7 @@ func NewServiceProposal(nodeKey string, nodeLocation dto_discovery.Location) dto
 		PaymentMethodType: dto.PAYMENT_METHOD_PER_TIME,
 		PaymentMethod: dto.PaymentMethodPerTime{
 			// 15 MYST/month = 0,5 MYST/day = 0,125 MYST/hour
-			Price:    dto_discovery.Price{0.125, "MYST"},
+			Price:    dto_discovery.Money{0.125, "MYST"},
 			Duration: 1 * time.Hour,
 		},
 		ProviderId: nodeKey,

openvpn/service_discovery/factory_test.go

@@ -33,7 +33,7 @@ func Test_NewServiceProposal(t *testing.T) {
 	assert.Equal(
 		t,
 		dto.PaymentMethodPerTime{
-			Price:    dto_discovery.Price{0.125, "MYST"},
+			Price:    dto_discovery.Money{0.125, "MYST"},
 			Duration: 60 * time.Minute,
 		},
 		proposal.PaymentMethod,

service_discovery/dto/money.go

@@ -0,0 +1,6 @@
+package dto
+
+type Money struct {
+	Amount   uint64
+	Currency string
+}

service_discovery/dto/payment_method.go

@@ -2,5 +2,5 @@ package dto
 
 type PaymentMethod interface {
 	// Service price per unit of metering
-	GetPrice() Price
+	GetPrice() Money
 }