Skip to content

Commit

Permalink
feat: AENS transactions in new struct format, given JSON() methods, s…
Browse files Browse the repository at this point in the history 
…ome types fixed.

Tx interface now includes the JSON() method
  • Loading branch information
@randomshinichi
randomshinichi committed Mar 27, 2019
1 parent c6ca727 commit edabb99
Show file tree
Hide file tree
Showing 2 changed files with 190 additions and 126 deletions.
51 changes: 41 additions & 10 deletions aeternity/transactions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ func buildPointers(pointers []string) (ptrs [][]uint8, err error) {
// See https://tour.golang.org/methods/4 or https://dave.cheney.net/2016/03/19/should-methods-be-declared-on-t-or-t
type Tx interface {
RLP() ([]byte, error)
JSON() (string, error)
}

// BaseEncodeTx takes a Tx, runs its RLP() method, and base encodes the result.
Expand Down Expand Up @@ -141,7 +142,7 @@ func NewSpendTx(senderID, recipientID string, amount, fee utils.BigInt, payload
type NamePreclaimTx struct {
AccountID string
CommitmentID string
Fee uint64
Fee utils.BigInt
TTL uint64
Nonce uint64
}
Expand All @@ -165,13 +166,25 @@ func (t *NamePreclaimTx) RLP() (rlpRawMsg []byte, err error) {
aID,
t.Nonce,
cID,
uint64(t.Fee),
t.Fee.Int,
t.TTL)
return
}

func (t *NamePreclaimTx) JSON() (string, error) {
swaggerT := models.NamePreclaimTx{
AccountID: models.EncodedHash(t.AccountID),
CommitmentID: models.EncodedHash(t.CommitmentID),
Fee: t.Fee,
Nonce: t.Nonce,
TTL: t.TTL,
}
output, err := swaggerT.MarshalBinary()
return string(output), err
}

// NewNamePreclaimTx is a constructor for a NamePreclaimTx struct
func NewNamePreclaimTx(accountID, commitmentID string, fee uint64, ttl, nonce uint64) NamePreclaimTx {
func NewNamePreclaimTx(accountID, commitmentID string, fee utils.BigInt, ttl, nonce uint64) NamePreclaimTx {
return NamePreclaimTx{accountID, commitmentID, fee, ttl, nonce}
}

Expand All @@ -180,7 +193,7 @@ type NameClaimTx struct {
AccountID string
Name string
NameSalt uint64
Fee uint64
Fee utils.BigInt
TTL uint64
Nonce uint64
}
Expand All @@ -204,14 +217,28 @@ func (t *NameClaimTx) RLP() (rlpRawMsg []byte, err error) {
aID,
t.Nonce,
nID,
uint64(t.NameSalt),
uint64(t.Fee),
t.NameSalt,
t.Fee.Int,
t.TTL)
return
}

func (t *NameClaimTx) JSON() (string, error) {
swaggerT := models.NameClaimTx{
AccountID: models.EncodedHash(t.AccountID),
Fee: t.Fee,
Name: &t.Name,
NameSalt: &t.NameSalt,
Nonce: t.Nonce,
TTL: t.TTL,
}

output, err := swaggerT.MarshalBinary()
return string(output), err
}

// NewNameClaimTx is a constructor for a NameClaimTx struct
func NewNameClaimTx(accountID, name string, nameSalt, fee uint64, ttl, nonce uint64) NameClaimTx {
func NewNameClaimTx(accountID, name string, nameSalt uint64, fee utils.BigInt, ttl, nonce uint64) NameClaimTx {
return NameClaimTx{accountID, name, nameSalt, fee, ttl, nonce}
}

Expand All @@ -222,7 +249,7 @@ type NameUpdateTx struct {
Pointers []string
NameTTL uint64
ClientTTL uint64
Fee uint64
Fee utils.BigInt
TTL uint64
Nonce uint64
}
Expand Down Expand Up @@ -255,13 +282,17 @@ func (t *NameUpdateTx) RLP() (rlpRawMsg []byte, err error) {
uint64(t.NameTTL),
ptrs,
uint64(t.ClientTTL),
uint64(t.Fee),
t.Fee.Int,
t.TTL)
return
}

func (t *NameUpdateTx) JSON() (string, error) {
return "unimplemented", nil
}

// NewNameUpdateTx is a constructor for a NameUpdateTx struct
func NewNameUpdateTx(accountID, nameID string, pointers []string, nameTTL, clientTTL uint64, fee uint64, ttl, nonce uint64) NameUpdateTx {
func NewNameUpdateTx(accountID, nameID string, pointers []string, nameTTL, clientTTL uint64, fee utils.BigInt, ttl, nonce uint64) NameUpdateTx {
return NameUpdateTx{accountID, nameID, pointers, nameTTL, clientTTL, fee, ttl, nonce}
}

Expand Down
265 changes: 149 additions & 116 deletions aeternity/transactions_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,124 +88,157 @@ func TestSpendTx_RLP(t *testing.T) {
}
}

// func TestNamePreclaimTx_RLP(t *testing.T) {
// type fields struct {
// AccountID string
// CommitmentID string
// Fee uint64
// TTL uint64
// Nonce uint64
// }
// tests := []struct {
// name string
// fields fields
// wantRlpRawMsg []byte
// wantErr bool
// }{
// // TODO: Add test cases.
// }
// for _, tt := range tests {
// t.Run(tt.name, func(t *testing.T) {
// t := &NamePreclaimTx{
// AccountID: tt.fields.AccountID,
// CommitmentID: tt.fields.CommitmentID,
// Fee: tt.fields.Fee,
// TTL: tt.fields.TTL,
// Nonce: tt.fields.Nonce,
// }
// gotRlpRawMsg, err := t.RLP()
// if (err != nil) != tt.wantErr {
// t.Errorf("NamePreclaimTx.RLP() error = %v, wantErr %v", err, tt.wantErr)
// return
// }
// if !reflect.DeepEqual(gotRlpRawMsg, tt.wantRlpRawMsg) {
// t.Errorf("NamePreclaimTx.RLP() = %v, want %v", gotRlpRawMsg, tt.wantRlpRawMsg)
// }
// })
// }
// }
func TestNamePreclaimTx_RLP(t *testing.T) {
type fields struct {
AccountID string
CommitmentID string
Fee utils.BigInt
TTL uint64
Nonce uint64
}
tests := []struct {
name string
fields fields
wantTx string
wantErr bool
}{
{
name: "Normal procedure, reserve a name on AENS",
fields: fields{
AccountID: "ak_2a1j2Mk9YSmC1gioUq4PWRm3bsv887MbuRVwyv4KaUGoR1eiKi",
CommitmentID: "cm_2jrPGyFKCEFFrsVvQsUzfnSURV5igr2WxvMR679S5DnuFEjet4", // name: fdsa.test, salt: 12345
Fee: *utils.NewBigIntFromUint64(10),
TTL: uint64(10),
Nonce: uint64(1),
},
wantTx: "tx_+EkhAaEBzqet5HDJ+Z2dTkAIgKhvHUm7REti8Rqeu2S7z+tz/vMBoQPk/tyQN11szXxmy4KFOFRzfzopJGCmg7cv5B9SwaJs0goKoCk0Qg==",
wantErr: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tx := aeternity.NewNamePreclaimTx(
tt.fields.AccountID,
tt.fields.CommitmentID,
tt.fields.Fee,
tt.fields.TTL,
tt.fields.Nonce,
)

txJson, err := tx.JSON()
fmt.Println(txJson)
gotTx, err := aeternity.BaseEncodeTx(&tx)
if (err != nil) != tt.wantErr {
t.Errorf("NamePreclaimTx.RLP() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(gotTx, tt.wantTx) {
gotTxRawBytes, wantTxRawBytes := getRLPSerialized(gotTx, tt.wantTx)
t.Errorf("NamePreclaimTx.RLP() = \n%v\n%v, want \n%v\n%v", gotTx, gotTxRawBytes, tt.wantTx, wantTxRawBytes)
}
})
}
}

func TestNameClaimTx_RLP(t *testing.T) {
type fields struct {
AccountID string
Name string
NameSalt uint64
Fee utils.BigInt
TTL uint64
Nonce uint64
}
tests := []struct {
name string
fields fields
wantTx string
wantErr bool
}{
{
name: "Normal operation: claim a reserved name",
fields: fields{
AccountID: "ak_2a1j2Mk9YSmC1gioUq4PWRm3bsv887MbuRVwyv4KaUGoR1eiKi",
Name: "nm_ie148R2qZYBfo1Ek3sZpfTLwBhkkqCRKi2Ce8JJ7yyWVRw2Sb",
NameSalt: 12345,
Fee: *utils.NewBigIntFromUint64(10),
TTL: uint64(10),
Nonce: uint64(1),
},
wantTx: "who knows",
wantErr: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tx := aeternity.NewNameClaimTx(
tt.fields.AccountID,
tt.fields.Name,
tt.fields.NameSalt,
tt.fields.Fee,
tt.fields.TTL,
tt.fields.Nonce,
)

// func TestNameClaimTx_RLP(t *testing.T) {
// type fields struct {
// AccountID string
// Name string
// NameSalt uint64
// Fee uint64
// TTL uint64
// Nonce uint64
// }
// tests := []struct {
// name string
// fields fields
// wantRlpRawMsg []byte
// wantErr bool
// }{
// // TODO: Add test cases.
// }
// for _, tt := range tests {
// t.Run(tt.name, func(t *testing.T) {
// t := &NameClaimTx{
// AccountID: tt.fields.AccountID,
// Name: tt.fields.Name,
// NameSalt: tt.fields.NameSalt,
// Fee: tt.fields.Fee,
// TTL: tt.fields.TTL,
// Nonce: tt.fields.Nonce,
// }
// gotRlpRawMsg, err := t.RLP()
// if (err != nil) != tt.wantErr {
// t.Errorf("NameClaimTx.RLP() error = %v, wantErr %v", err, tt.wantErr)
// return
// }
// if !reflect.DeepEqual(gotRlpRawMsg, tt.wantRlpRawMsg) {
// t.Errorf("NameClaimTx.RLP() = %v, want %v", gotRlpRawMsg, tt.wantRlpRawMsg)
// }
// })
// }
// }
txJson, err := tx.JSON()
fmt.Println(txJson)

// func TestNameUpdateTx_RLP(t *testing.T) {
// type fields struct {
// AccountID string
// NameID string
// Pointers []string
// NameTTL uint64
// ClientTTL uint64
// Fee uint64
// TTL uint64
// Nonce uint64
// }
// tests := []struct {
// name string
// fields fields
// wantRlpRawMsg []byte
// wantErr bool
// }{
// // TODO: Add test cases.
// }
// for _, tt := range tests {
// t.Run(tt.name, func(t *testing.T) {
// t := &NameUpdateTx{
// AccountID: tt.fields.AccountID,
// NameID: tt.fields.NameID,
// Pointers: tt.fields.Pointers,
// NameTTL: tt.fields.NameTTL,
// ClientTTL: tt.fields.ClientTTL,
// Fee: tt.fields.Fee,
// TTL: tt.fields.TTL,
// Nonce: tt.fields.Nonce,
// }
// gotRlpRawMsg, err := t.RLP()
// if (err != nil) != tt.wantErr {
// t.Errorf("NameUpdateTx.RLP() error = %v, wantErr %v", err, tt.wantErr)
// return
// }
// if !reflect.DeepEqual(gotRlpRawMsg, tt.wantRlpRawMsg) {
// t.Errorf("NameUpdateTx.RLP() = %v, want %v", gotRlpRawMsg, tt.wantRlpRawMsg)
// }
// })
// }
// }
gotTx, err := aeternity.BaseEncodeTx(&tx)
if (err != nil) != tt.wantErr {
t.Errorf("NameClaimTx.RLP() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(gotTx, tt.wantTx) {
gotTxRawBytes, wantTxRawBytes := getRLPSerialized(gotTx, tt.wantTx)
t.Errorf("NameClaimTx.RLP() = \n%v\n%v, want \n%v\n%v", gotTx, gotTxRawBytes, tt.wantTx, wantTxRawBytes)
}
})
}
}

func TestNameUpdateTx_RLP(t *testing.T) {
type fields struct {
AccountID string
NameID string
Pointers []string
NameTTL uint64
ClientTTL uint64
Fee utils.BigInt
TTL uint64
Nonce uint64
}
tests := []struct {
name string
fields fields
wantTx string
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tx := aeternity.NewNameUpdateTx(
tt.fields.AccountID,
tt.fields.NameID,
tt.fields.Pointers,
tt.fields.NameTTL,
tt.fields.ClientTTL,
tt.fields.Fee,
tt.fields.TTL,
tt.fields.Nonce,
)
gotTx, err := aeternity.BaseEncodeTx(&tx)
if (err != nil) != tt.wantErr {
t.Errorf("NameUpdateTx.RLP() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(gotTx, tt.wantTx) {
gotTxRawBytes, wantTxRawBytes := getRLPSerialized(gotTx, tt.wantTx)
t.Errorf("NameUpdateTx.RLP() = \n%v\n%v, want \n%v\n%v", gotTx, gotTxRawBytes, tt.wantTx, wantTxRawBytes)
}
})
}
}

func TestOracleRegisterTx_RLP(t *testing.T) {
type fields struct {
Expand Down

0 comments on commit edabb99

Please sign in to comment.