Decimal sep pkg (#33)

token.Decimal to separate package

Author: vitiko

examples/erc20_utxo/erc20.go

@@ -8,6 +8,7 @@ import (
 "github.com/hyperledger-labs/cckit/examples/erc20_utxo/service/config"
 "github.com/hyperledger-labs/cckit/extensions/account"
 "github.com/hyperledger-labs/cckit/extensions/token"
+"github.com/hyperledger-labs/cckit/extensions/token/decimal"
 "github.com/hyperledger-labs/cckit/router"
 )
 
@@ -16,7 +17,7 @@ var (
 Name: `SomeToken`,
 Symbol: `@`,
 Decimals: 2,
-TotalSupply: token.NewDecimal(big.NewInt(10000000)),
+TotalSupply: decimal.New(big.NewInt(10000000)),
 }
 )
 

examples/erc20_utxo/erc20_test.go

@@ -13,6 +13,7 @@ import (
 "github.com/hyperledger-labs/cckit/examples/erc20_utxo/service/config"
 "github.com/hyperledger-labs/cckit/extensions/account"
 "github.com/hyperledger-labs/cckit/extensions/token"
+"github.com/hyperledger-labs/cckit/extensions/token/decimal"
 "github.com/hyperledger-labs/cckit/identity"
 "github.com/hyperledger-labs/cckit/identity/testdata"
 testcc "github.com/hyperledger-labs/cckit/testing"
@@ -98,13 +99,13 @@ var _ = Describe(`ERC`, func() {
 &token.BalanceId{Address: user1Address, Symbol: erc20_utxo.Token.Symbol}),
 &token.Balance{}).(*token.Balance)
 
-Expect(b.Amount).To(Equal(token.NewDecimal(big.NewInt(0))))
+Expect(b.Amount).To(Equal(decimal.New(big.NewInt(0))))
 })
 
 })
 
 Context(`transfer`, func() {
-var transferAmount = token.NewDecimal(big.NewInt(100))
+var transferAmount = decimal.New(big.NewInt(100))
 
 It(`Disallow to transfer balance by user with zero balance`, func() {
 expectcc.ResponseError(
@@ -150,7 +151,7 @@ var _ = Describe(`ERC`, func() {
 
 Context(`Allowance`, func() {
 
-var allowAmount = token.NewDecimal(big.NewInt(50))
+var allowAmount = decimal.New(big.NewInt(50))
 
 It(`Allow to approve amount by owner for spender even if balance is zero`, func() {
 a := expectcc.PayloadIs(

examples/erc20_utxo/service/allowance/allowance.go

@@ -6,6 +6,7 @@ import (
 
 "github.com/hyperledger-labs/cckit/extensions/account"
 "github.com/hyperledger-labs/cckit/extensions/token"
+"github.com/hyperledger-labs/cckit/extensions/token/decimal"
 "github.com/hyperledger-labs/cckit/router"
 "github.com/hyperledger-labs/cckit/state"
 )
@@ -120,7 +121,7 @@ func (s *Service) TransferFrom(ctx router.Context, req *TransferFromRequest) (*T
 req.Amount, allowance.Amount, ErrAllowanceInsufficient)
 }
 
-allowance.Amount = token.BigIntSubAsDecimal(curAmount, reqAmount)
+allowance.Amount = decimal.BigIntSubAsDecimal(curAmount, reqAmount)
 
 // sub from allowance
 if err := State(ctx).Put(allowance); err != nil {

examples/erc20_utxo/service/allowance/allowance.pb.cc.go

@@ -8,6 +8,7 @@ import "google/protobuf/empty.proto";
 import "mwitkow/go-proto-validators/validator.proto";
 
 import "token/balance.proto";
+import "token/decimal/decimal.proto";
 
 service AllowanceService {
  // Returns the remaining number of tokens that spender will be allowed to spend on behalf of owner through transfersender.
@@ -40,23 +41,23 @@ message ApproveRequest {
  string spender = 2 [(validator.field) = {string_not_empty : true}];
  string symbol = 3 [(validator.field) = {string_not_empty : true}];
  repeated string group = 4;
- cckit.extensions.token.Decimal amount = 5 [(validator.field) = {string_not_empty : true}];
+ cckit.extensions.token.decimal.Decimal amount = 5 [(validator.field) = {string_not_empty : true}];
 }
 
 message TransferFromRequest {
  string owner = 1 [(validator.field) = {string_not_empty : true}];
  string recipient = 2 [(validator.field) = {string_not_empty : true}];
  string symbol = 3 [(validator.field) = {string_not_empty : true}];
  repeated string group = 4;
- cckit.extensions.token.Decimal amount = 5 [(validator.field) = {string_not_empty : true}];
+ cckit.extensions.token.decimal.Decimal amount = 5 [(validator.field) = {string_not_empty : true}];
 }
 
 message TransferFromResponse {
  string owner = 1;
  string recipient = 2;
  string symbol = 3 ;
  repeated string group = 4;
- cckit.extensions.token.Decimal amount = 5;
+ cckit.extensions.token.decimal.Decimal amount = 5;
 }
 
 // Id: Allowance identifier
@@ -73,15 +74,15 @@ message Allowance {
  string spender = 2;
  string symbol = 3 ;
  repeated string group = 4;
- cckit.extensions.token.Decimal amount = 5;
+ cckit.extensions.token.decimal.Decimal amount = 5;
 }
 
 message Operation {
  string owner = 1;
  string spender = 2;
  string symbol = 3 ;
  repeated string group = 4;
- cckit.extensions.token.Decimal amount = 5;
+ cckit.extensions.token.decimal.Decimal amount = 5;
 }
 
 // List:
@@ -95,7 +96,7 @@ message Approved {
  string spender = 2;
  string symbol = 3 ;
  repeated string group = 4;
- cckit.extensions.token.Decimal amount = 5;
+ cckit.extensions.token.decimal.Decimal amount = 5;
 }
 
 // Event: TransferredFrom event is emitted when TransferFrom method has been invoked
@@ -105,5 +106,5 @@ message TransferredFrom {
  string recipient = 3;
  string symbol = 4 ;
  repeated string group = 5;
- cckit.extensions.token.Decimal amount = 6;
+ cckit.extensions.token.decimal.Decimal amount = 6;
 }

examples/erc20_utxo/service/allowance/allowance.pb.go

@@ -132,7 +132,7 @@
  }
  },
  "amount": {
- "$ref": "#/definitions/tokenDecimal"
+ "$ref": "#/definitions/decimalDecimal"
  }
  },
  "title": "State: Allowance"
@@ -156,7 +156,19 @@
  }
  },
  "amount": {
- "$ref": "#/definitions/tokenDecimal"
+ "$ref": "#/definitions/decimalDecimal"
+ }
+ }
+ },
+ "decimalDecimal": {
+ "type": "object",
+ "properties": {
+ "scale": {
+ "type": "integer",
+ "format": "int32"
+ },
+ "value": {
+ "type": "string"
  }
  }
  },
@@ -192,18 +204,6 @@
  }
  }
  }
- },
- "tokenDecimal": {
- "type": "object",
- "properties": {
- "scale": {
- "type": "integer",
- "format": "int32"
- },
- "value": {
- "type": "string"
- }
- }
  }
  }
 }