Skip to content

Commit

Permalink
refactor: remove signer types
Browse files Browse the repository at this point in the history
  • Loading branch information
nicksinch committed Nov 9, 2023
1 parent bbca0dc commit eeedc33
Show file tree
Hide file tree
Showing 30 changed files with 261 additions and 260 deletions.
6 changes: 3 additions & 3 deletions execution/types/runtime_decoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ type RuntimeDecoder interface {
DecodeCall(buffer *bytes.Buffer) (primitives.Call, error)
}

type runtimeDecoder[S primitives.PublicKey] struct {
type runtimeDecoder[P primitives.PublicKey] struct {
modules []types.Module
extra primitives.SignedExtra
}

func NewRuntimeDecoder[S primitives.PublicKey](modules []types.Module, extra primitives.SignedExtra) RuntimeDecoder {
return runtimeDecoder[S]{
func NewRuntimeDecoder[P primitives.PublicKey](modules []types.Module, extra primitives.SignedExtra) RuntimeDecoder {
return runtimeDecoder[P]{
modules: modules,
extra: extra,
}
Expand Down
6 changes: 3 additions & 3 deletions execution/types/runtime_decoder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const (
signedExtrinsicVersion = 132
)

type testKeyType = primitives.Ed25519PublicKey
type testPublicKeyType = primitives.Ed25519PublicKey

var (
signedExtrinsicBytes = []byte{
Expand Down Expand Up @@ -55,7 +55,7 @@ var (

func Test_RuntimeDecoder_New(t *testing.T) {
target := setupRuntimeDecoder()
expect := runtimeDecoder[testKeyType]{
expect := runtimeDecoder[testPublicKeyType]{
modules: []primitives.Module{mockModuleOne},
extra: mockSignedExtra,
}
Expand Down Expand Up @@ -357,5 +357,5 @@ func setupRuntimeDecoder() RuntimeDecoder {

apis := []primitives.Module{mockModuleOne}

return NewRuntimeDecoder[testKeyType](apis, mockSignedExtra)
return NewRuntimeDecoder[testPublicKeyType](apis, mockSignedExtra)
}
2 changes: 1 addition & 1 deletion frame/balances/call_force_free.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func newCallForceFree(moduleId sc.U8, functionId sc.U8, storedMap primitives.Sto
}

func (c callForceFree) DecodeArgs(buffer *bytes.Buffer) (primitives.Call, error) {
who, err := types.DecodeMultiAddress[testKeyType](buffer)
who, err := types.DecodeMultiAddress[testPublicKeyType](buffer)
if err != nil {
return nil, err
}
Expand Down
6 changes: 3 additions & 3 deletions frame/balances/call_force_transfer.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
primitives "github.com/LimeChain/gosemble/primitives/types"
)

type testKeyType = primitives.Ed25519PublicKey
type testPublicKeyType = primitives.Ed25519PublicKey

type callForceTransfer struct {
primitives.Callable
Expand All @@ -28,11 +28,11 @@ func newCallForceTransfer(moduleId sc.U8, functionId sc.U8, storedMap primitives
}

func (c callForceTransfer) DecodeArgs(buffer *bytes.Buffer) (primitives.Call, error) {
source, err := types.DecodeMultiAddress[testKeyType](buffer)
source, err := types.DecodeMultiAddress[testPublicKeyType](buffer)
if err != nil {
return nil, err
}
dest, err := types.DecodeMultiAddress[testKeyType](buffer)
dest, err := types.DecodeMultiAddress[testPublicKeyType](buffer)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion frame/balances/call_set_balance.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func newCallSetBalance(moduleId sc.U8, functionId sc.U8, storedMap types.StoredM
}

func (c callSetBalance) DecodeArgs(buffer *bytes.Buffer) (types.Call, error) {
targetAddress, err := types.DecodeMultiAddress[testKeyType](buffer)
targetAddress, err := types.DecodeMultiAddress[testPublicKeyType](buffer)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion frame/balances/call_transfer.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func newCallTransfer(moduleId sc.U8, functionId sc.U8, storedMap primitives.Stor
}

func (c callTransfer) DecodeArgs(buffer *bytes.Buffer) (primitives.Call, error) {
dest, err := types.DecodeMultiAddress[testKeyType](buffer)
dest, err := types.DecodeMultiAddress[testPublicKeyType](buffer)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion frame/balances/call_transfer_all.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func newCallTransferAll(moduleId sc.U8, functionId sc.U8, storedMap primitives.S
}

func (c callTransferAll) DecodeArgs(buffer *bytes.Buffer) (primitives.Call, error) {
dest, err := types.DecodeMultiAddress[testKeyType](buffer)
dest, err := types.DecodeMultiAddress[testPublicKeyType](buffer)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion frame/balances/call_transfer_keep_alive.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func newCallTransferKeepAlive(moduleId sc.U8, functionId sc.U8, storedMap primit
}

func (c callTransferKeepAlive) DecodeArgs(buffer *bytes.Buffer) (primitives.Call, error) {
dest, err := types.DecodeMultiAddress[testKeyType](buffer)
dest, err := types.DecodeMultiAddress[testPublicKeyType](buffer)
if err != nil {
return nil, err
}
Expand Down
26 changes: 13 additions & 13 deletions frame/balances/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func newEventSlashed(moduleIndex sc.U8, account primitives.AccountId[primitives.
return primitives.NewEvent(moduleIndex, EventSlashed, account, amount)
}

func DecodeEvent[S primitives.PublicKey](moduleIndex sc.U8, buffer *bytes.Buffer) (primitives.Event, error) {
func DecodeEvent[P primitives.PublicKey](moduleIndex sc.U8, buffer *bytes.Buffer) (primitives.Event, error) {
decodedModuleIndex, err := sc.DecodeU8(buffer)
if err != nil {
return primitives.Event{}, err
Expand All @@ -84,7 +84,7 @@ func DecodeEvent[S primitives.PublicKey](moduleIndex sc.U8, buffer *bytes.Buffer

switch b {
case EventEndowed:
account, err := primitives.DecodeAccountId[S](buffer)
account, err := primitives.DecodeAccountId[P](buffer)
if err != nil {
return primitives.Event{}, err
}
Expand All @@ -94,7 +94,7 @@ func DecodeEvent[S primitives.PublicKey](moduleIndex sc.U8, buffer *bytes.Buffer
}
return newEventEndowed(moduleIndex, account, freeBalance), nil
case EventDustLost:
account, err := primitives.DecodeAccountId[S](buffer)
account, err := primitives.DecodeAccountId[P](buffer)
if err != nil {
return primitives.Event{}, err
}
Expand All @@ -104,11 +104,11 @@ func DecodeEvent[S primitives.PublicKey](moduleIndex sc.U8, buffer *bytes.Buffer
}
return newEventDustLost(moduleIndex, account, amount), nil
case EventTransfer:
from, err := primitives.DecodeAccountId[S](buffer)
from, err := primitives.DecodeAccountId[P](buffer)
if err != nil {
return primitives.Event{}, err
}
to, err := primitives.DecodeAccountId[S](buffer)
to, err := primitives.DecodeAccountId[P](buffer)
if err != nil {
return primitives.Event{}, err
}
Expand All @@ -118,7 +118,7 @@ func DecodeEvent[S primitives.PublicKey](moduleIndex sc.U8, buffer *bytes.Buffer
}
return newEventTransfer(moduleIndex, from, to, amount), nil
case EventBalanceSet:
account, err := primitives.DecodeAccountId[S](buffer)
account, err := primitives.DecodeAccountId[P](buffer)
if err != nil {
return primitives.Event{}, err
}
Expand All @@ -132,7 +132,7 @@ func DecodeEvent[S primitives.PublicKey](moduleIndex sc.U8, buffer *bytes.Buffer
}
return newEventBalanceSet(moduleIndex, account, free, reserved), nil
case EventReserved:
account, err := primitives.DecodeAccountId[S](buffer)
account, err := primitives.DecodeAccountId[P](buffer)
if err != nil {
return primitives.Event{}, err
}
Expand All @@ -142,7 +142,7 @@ func DecodeEvent[S primitives.PublicKey](moduleIndex sc.U8, buffer *bytes.Buffer
}
return newEventReserved(moduleIndex, account, amount), nil
case EventUnreserved:
account, err := primitives.DecodeAccountId[S](buffer)
account, err := primitives.DecodeAccountId[P](buffer)
if err != nil {
return primitives.Event{}, err
}
Expand All @@ -152,11 +152,11 @@ func DecodeEvent[S primitives.PublicKey](moduleIndex sc.U8, buffer *bytes.Buffer
}
return newEventUnreserved(moduleIndex, account, amount), nil
case EventReserveRepatriated:
from, err := primitives.DecodeAccountId[S](buffer)
from, err := primitives.DecodeAccountId[P](buffer)
if err != nil {
return primitives.Event{}, err
}
to, err := primitives.DecodeAccountId[S](buffer)
to, err := primitives.DecodeAccountId[P](buffer)
if err != nil {
return primitives.Event{}, err
}
Expand All @@ -170,7 +170,7 @@ func DecodeEvent[S primitives.PublicKey](moduleIndex sc.U8, buffer *bytes.Buffer
}
return newEventReserveRepatriated(moduleIndex, from, to, amount, destinationStatus), nil
case EventDeposit:
account, err := primitives.DecodeAccountId[S](buffer)
account, err := primitives.DecodeAccountId[P](buffer)
if err != nil {
return primitives.Event{}, err
}
Expand All @@ -180,7 +180,7 @@ func DecodeEvent[S primitives.PublicKey](moduleIndex sc.U8, buffer *bytes.Buffer
}
return newEventDeposit(moduleIndex, account, amount), nil
case EventWithdraw:
account, err := primitives.DecodeAccountId[S](buffer)
account, err := primitives.DecodeAccountId[P](buffer)
if err != nil {
return primitives.Event{}, err
}
Expand All @@ -190,7 +190,7 @@ func DecodeEvent[S primitives.PublicKey](moduleIndex sc.U8, buffer *bytes.Buffer
}
return newEventWithdraw(moduleIndex, account, amount), nil
case EventSlashed:
account, err := primitives.DecodeAccountId[S](buffer)
account, err := primitives.DecodeAccountId[P](buffer)
if err != nil {
return primitives.Event{}, err
}
Expand Down
25 changes: 12 additions & 13 deletions frame/balances/events_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

sc "github.com/LimeChain/goscale"
"github.com/LimeChain/gosemble/frame/balances/types"
primitives "github.com/LimeChain/gosemble/primitives/types"
"github.com/stretchr/testify/assert"
)

Expand All @@ -20,7 +19,7 @@ func Test_Balances_DecodeEvent_Endowed(t *testing.T) {
buffer.Write(targetAddressId.Bytes())
buffer.Write(targetValue.Bytes())

result, err := DecodeEvent[primitives.Ed25519PublicKey](moduleId, buffer)
result, err := DecodeEvent[testPublicKeyType](moduleId, buffer)
assert.Nil(t, err)

assert.Equal(t,
Expand All @@ -38,7 +37,7 @@ func Test_Balances_DecodeEvent_DustLost(t *testing.T) {
buffer.Write(targetAddressId.Bytes())
buffer.Write(targetValue.Bytes())

result, err := DecodeEvent[primitives.Ed25519PublicKey](moduleId, buffer)
result, err := DecodeEvent[testPublicKeyType](moduleId, buffer)
assert.Nil(t, err)

assert.Equal(t,
Expand All @@ -61,7 +60,7 @@ func Test_Balances_DecodeEvent_Transfer(t *testing.T) {
buffer.Write(toAddressAccountId.Bytes())
buffer.Write(targetValue.Bytes())

result, _ := DecodeEvent[primitives.Ed25519PublicKey](moduleId, buffer)
result, _ := DecodeEvent[testPublicKeyType](moduleId, buffer)

assert.Equal(t,
sc.NewVaryingData(sc.U8(moduleId), EventTransfer, fromAddressId, toAddressAccountId, targetValue),
Expand All @@ -80,7 +79,7 @@ func Test_Balances_DecodeEvent_BalanceSet(t *testing.T) {
buffer.Write(newFree.Bytes())
buffer.Write(newReserved.Bytes())

result, err := DecodeEvent[primitives.Ed25519PublicKey](moduleId, buffer)
result, err := DecodeEvent[testPublicKeyType](moduleId, buffer)
assert.Nil(t, err)

assert.Equal(t,
Expand All @@ -99,7 +98,7 @@ func Test_Balances_DecodeEvent_Reserved(t *testing.T) {
buffer.Write(targetAddressId.Bytes())
buffer.Write(targetValue.Bytes())

result, err := DecodeEvent[primitives.Ed25519PublicKey](moduleId, buffer)
result, err := DecodeEvent[testPublicKeyType](moduleId, buffer)
assert.Nil(t, err)

assert.Equal(t,
Expand All @@ -118,7 +117,7 @@ func Test_Balances_DecodeEvent_Unreserved(t *testing.T) {
buffer.Write(targetAddressId.Bytes())
buffer.Write(targetValue.Bytes())

result, err := DecodeEvent[primitives.Ed25519PublicKey](moduleId, buffer)
result, err := DecodeEvent[testPublicKeyType](moduleId, buffer)
assert.Nil(t, err)

assert.Equal(t,
Expand All @@ -140,7 +139,7 @@ func Test_Balances_DecodeEvent_ReserveRepatriated(t *testing.T) {
buffer.Write(targetValue.Bytes())
buffer.Write(types.BalanceStatusFree.Bytes())

result, err := DecodeEvent[primitives.Ed25519PublicKey](moduleId, buffer)
result, err := DecodeEvent[testPublicKeyType](moduleId, buffer)
assert.Nil(t, err)

assert.Equal(t,
Expand All @@ -164,7 +163,7 @@ func Test_Balances_DecodeEvent_Deposit(t *testing.T) {
buffer.Write(targetAddressId.Bytes())
buffer.Write(targetValue.Bytes())

result, err := DecodeEvent[primitives.Ed25519PublicKey](moduleId, buffer)
result, err := DecodeEvent[testPublicKeyType](moduleId, buffer)
assert.Nil(t, err)

assert.Equal(t,
Expand All @@ -183,7 +182,7 @@ func Test_Balances_DecodeEvent_Withdraw(t *testing.T) {
buffer.Write(targetAddressId.Bytes())
buffer.Write(targetValue.Bytes())

result, err := DecodeEvent[primitives.Ed25519PublicKey](moduleId, buffer)
result, err := DecodeEvent[testPublicKeyType](moduleId, buffer)
assert.Nil(t, err)

assert.Equal(t,
Expand All @@ -202,7 +201,7 @@ func Test_Balances_DecodeEvent_Slashed(t *testing.T) {
buffer.Write(targetAddressId.Bytes())
buffer.Write(targetValue.Bytes())

result, err := DecodeEvent[primitives.Ed25519PublicKey](moduleId, buffer)
result, err := DecodeEvent[testPublicKeyType](moduleId, buffer)
assert.Nil(t, err)

assert.Equal(t,
Expand All @@ -216,7 +215,7 @@ func Test_Balances_DecodeEvent_InvalidModule_Panics(t *testing.T) {
buffer.WriteByte(0)

assert.PanicsWithValue(t, errInvalidEventModule, func() {
DecodeEvent[primitives.Ed25519PublicKey](moduleId, buffer)
DecodeEvent[testPublicKeyType](moduleId, buffer)
})
}

Expand All @@ -226,6 +225,6 @@ func Test_Balances_DecodeEvent_InvalidType_Panics(t *testing.T) {
buffer.WriteByte(255)

assert.PanicsWithValue(t, errInvalidEventType, func() {
DecodeEvent[primitives.Ed25519PublicKey](moduleId, buffer)
DecodeEvent[testPublicKeyType](moduleId, buffer)
})
}
2 changes: 1 addition & 1 deletion frame/grandpa/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type GrandpaModule interface {
Authorities() (sc.Sequence[primitives.Authority], error)
}

type Module[S primitives.PublicKey] struct {
type Module[P primitives.PublicKey] struct {
primitives.DefaultInherentProvider
hooks.DefaultDispatchModule
Index sc.U8
Expand Down
4 changes: 2 additions & 2 deletions frame/grandpa/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ type storage struct {
Authorities support.StorageValue[primitives.VersionedAuthorityList]
}

func newStorage[S primitives.PublicKey]() *storage {
return &storage{Authorities: support.NewSimpleStorageValue(keyGrandpaAuthorities, primitives.DecodeVersionedAuthorityList[S])}
func newStorage[P primitives.PublicKey]() *storage {
return &storage{Authorities: support.NewSimpleStorageValue(keyGrandpaAuthorities, primitives.DecodeVersionedAuthorityList[P])}
}
Loading

0 comments on commit eeedc33

Please sign in to comment.