Seperate general type files from transaction package

Author: Seongjae Choi

core/transaction/signedTransaction.go renamed to core/signedTransaction.go

@@ -1,4 +1,4 @@
-package transaction
+package core
 
 import (
 "encoding/hex"

core/transaction/transaction.go renamed to core/transaction.go

@@ -1,4 +1,4 @@
-package transaction
+package core
 
 import (
 "github.com/CodeChain-io/codechain-sdk-go/crypto"
@@ -33,45 +33,45 @@ type TransactionInterface interface {
 ActionToEncodeObject() []interface{}
 }
 
-type transaction struct {
+type Transaction struct {
 seq uint
 fee primitives.U64
 networkID string
 }
 
-func newTransaction(networkID string) transaction {
-return transaction{0, primitives.NewU64("0"), networkID}
+func NewTransaction(networkID string) Transaction {
+return Transaction{0, primitives.NewU64("0"), networkID}
 }
 
-func (t transaction) Seq() uint {
+func (t Transaction) Seq() uint {
 return t.seq
 }
 
-func (t transaction) Fee() primitives.U64 {
+func (t Transaction) Fee() primitives.U64 {
 return t.fee
 }
 
-func (t *transaction) SetSeq(seq uint) {
+func (t *Transaction) SetSeq(seq uint) {
 t.seq = seq
 }
 
-func (t *transaction) SetFee(fee primitives.U64) {
+func (t *Transaction) SetFee(fee primitives.U64) {
 t.fee = fee
 }
 
-func (t transaction) NetworkID() string {
+func (t Transaction) NetworkID() string {
 return t.networkID
 }
 
-func (t transaction) UnsignedHash() primitives.H256 {
+func (t Transaction) UnsignedHash() primitives.H256 {
 hash, _ := crypto.Blake256([]byte{0}) //t.RlpBytes())
 
 var value [32]byte
 copy(value[:], hash[:32])
 return primitives.H256(value) // byte
 }
 
-func (t *transaction) Sign(secret primitives.H256, seq uint, fee primitives.U64) SignedTransaction {
+func (t *Transaction) Sign(secret primitives.H256, seq uint, fee primitives.U64) SignedTransaction {
 // Handle error
 
 sig := crypto.SignEcdsa(t.UnsignedHash().Bytes(), secret.Bytes())
@@ -80,30 +80,30 @@ func (t *transaction) Sign(secret primitives.H256, seq uint, fee primitives.U64)
 return NewSignedTransaction(t, sig, nil, nil, nil) // nil
 }
 
-func (t transaction) ToJSON() TransactionJSON {
+func (t Transaction) ToJSON() TransactionJSON {
 return TransactionJSON{
 t.GetType(), // assign action type.
 t.networkID,
 t.seq,
 t.fee.ToJSON()}
 }
 
-func (t transaction) GetType() string {
+func (t Transaction) GetType() string {
 return ""
 }
 
-func (t transaction) ActionToEncodeObject() []interface{} {
+func (t Transaction) ActionToEncodeObject() []interface{} {
 return nil
 }
 
-func (t transaction) ActionToJSON() interface{} {
+func (t Transaction) ActionToJSON() interface{} {
 return nil
 }
 
-func (t transaction) RlpBytes() []byte {
+func (t Transaction) RlpBytes() []byte {
 return nil
 }
 
-func (t transaction) ToEncodeObject() []interface{} {
+func (t Transaction) ToEncodeObject() []interface{} {
 return nil
 }

core/transaction/pay.go

@@ -1,6 +1,7 @@
 package transaction
 
 import (
+"github.com/CodeChain-io/codechain-sdk-go/core"
 "github.com/CodeChain-io/codechain-sdk-go/crypto"
 "github.com/CodeChain-io/codechain-sdk-go/primitives"
 "github.com/ethereum/go-ethereum/rlp"
@@ -12,7 +13,7 @@ type PayAction struct {
 }
 
 type Pay struct {
-transaction
+core.Transaction
 Receiver primitives.PlatformAddress
 Quantity primitives.U64
 }
@@ -21,7 +22,7 @@ func NewPay(receiver primitives.PlatformAddress,
 quantity primitives.U64,
 networkID string) Pay {
 
-t := newTransaction(networkID)
+t := core.NewTransaction(networkID)
 return Pay{t, receiver, quantity}
 }
 
@@ -61,11 +62,11 @@ func (p Pay) UnsignedHash() primitives.H256 {
 return primitives.H256(value)
 }
 
-func (p *Pay) Sign(secret primitives.H256, seq uint, fee primitives.U64) SignedTransaction {
+func (p *Pay) Sign(secret primitives.H256, seq uint, fee primitives.U64) core.SignedTransaction {
 // Handle error
 p.SetSeq(seq)
 p.SetFee(fee)
 sig := crypto.SignEcdsa(p.UnsignedHash().Bytes(), secret.Bytes())
 
-return NewSignedTransaction(p, sig, nil, nil, nil)
+return core.NewSignedTransaction(p, sig, nil, nil, nil)
 }

core/transaction/pay_test.go

@@ -3,8 +3,10 @@ package transaction
 import (
 "bytes"
 "encoding/hex"
-"github.com/CodeChain-io/codechain-sdk-go/primitives"
 "testing"
+
+"github.com/CodeChain-io/codechain-sdk-go/primitives"
+"github.com/CodeChain-io/codechain-sdk-go/rpc"
 )
 
 func TestPay(t *testing.T) {
@@ -28,3 +30,64 @@ func TestPay(t *testing.T) {
 }
 
 }
+
+func TestSigning(t *testing.T) {
+id, _ := hex.DecodeString("0000000000000000000000000000000000000000")
+accountID := primitives.NewH160(id)
+
+p, _ := primitives.PlatformAddressFromAccountID(accountID, "tc")
+q := primitives.NewU64("11")
+
+pay := NewPay(p, q, "tc")
+
+secret, _ := primitives.StringToH256("ede1d4ccb4ec9a8bbbae9a13db3f4a7b56ea04189be86ac3a6a439d9a0a1addd")
+fee := primitives.NewU64("0")
+
+signed := pay.Sign(secret, uint(0), fee)
+
+if bytes.Compare(
+signed.RlpBytes(),
+[]byte{248, 96, 128, 128, 130, 116, 99, 215, 2, 148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 184, 65, 63, 155, 207, 244, 132, 189, 95, 29, 85, 73, 249, 18, 249, 238, 175, 140, 47, 227, 73, 178, 87, 189, 226, 182, 31, 177, 3, 96, 19, 212, 228, 76, 32, 74, 66, 21, 210, 108, 184, 121, 234, 173, 32, 40, 254, 26, 120, 152, 228, 207, 154, 93, 151, 158, 179, 131, 224, 163, 132, 20, 13, 110, 4, 193, 1}) != 0 {
+t.Fatal("Signing Pay transaction Error")
+}
+}
+
+func TestSendSignedTransaction(t *testing.T) {
+rpcClient := rpc.NewRPC("https://corgi-rpc.codechain.io/")
+
+recipient, err1 := primitives.PlatformAddressFromString("wccq95dss644nd3xgddje38k2kdldzsy6ns5gmscxu2")
+if err1 != nil {
+t.Fatal(err1)
+}
+
+quantity := primitives.NewU64("12345")
+
+pay := NewPay(recipient, quantity, "wc")
+
+secret, err2 := primitives.StringToH256("6692200de85d2ae6fbb817c656cc9f5a0b8ee1ed82795289aaf4400f1d817d62")
+if err2 != nil {
+t.Fatal(err2)
+}
+
+fee := primitives.NewU64("100")
+accountID, err3 := primitives.PlatformAddressFromString("wccq9dddym9sc6rn3jgsnmp8qel57s5mwjq6v5ye68e")
+
+if err3 != nil {
+t.Fatal(err3)
+}
+
+seq, err4 := rpcClient.Chain.GetLatestSeq(accountID.Value)
+
+if err4 != nil {
+t.Fatal(err4)
+}
+
+signed := pay.Sign(secret, seq, fee)
+
+_, err5 := rpcClient.Mempool.SendSignedTransaction(hex.EncodeToString(signed.RlpBytes()))
+
+if err5 != nil {
+t.Fatal(err5)
+}
+
+}