dstepanov-yadro/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

rpcclient: refactor waiter package naming

Browse source 
Adjust names of all used structures, no need to duplicate `Waiter` everywhere,
we already in the `waiter` package. Also, adjust comments to Actor so that links
to Waiter are properly described in docs.

Ref. #3265.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
This commit is contained in:
Anna Shaleva 2023-12-29 15:15:18 +03:00
parent 1ca7b0bbeb
commit 7c9b1d05d2
4 changed files with 65 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkg/rpcclient/actor/actor.go
View file

@ -59,18 +59,18 @@ type SignerAccount struct {
// transactions in various ways, while "Send" prefix is used by methods that // transactions in various ways, while "Send" prefix is used by methods that
// directly transmit created transactions to the RPC server. // directly transmit created transactions to the RPC server.
// //
// Actor also provides a Waiter interface to wait until transaction will be // Actor also provides a [waiter.Waiter] interface to wait until transaction will be
// accepted to the chain. Depending on the underlying RPCActor functionality, // accepted to the chain. Depending on the underlying RPCActor functionality,
// transaction awaiting can be performed via web-socket using RPC notifications // transaction awaiting can be performed via web-socket using RPC notifications
// subsystem with EventWaiter, via regular RPC requests using a poll-based // subsystem with [waiter.EventBased], via regular RPC requests using a poll-based
// algorithm with PollingWaiter or can not be performed if RPCActor doesn't // algorithm with [waiter.PollingBased] or can not be performed if RPCActor doesn't
// implement none of RPCEventWaiter and RPCPollingWaiter interfaces with // implement none of [waiter.RPCEventBased] and [waiter.RPCPollingBased] interfaces with
// NullWaiter. ErrAwaitingNotSupported will be returned on attempt to await the // [waiter.Null]. [waiter.ErrAwaitingNotSupported] will be returned on attempt to await the
// transaction in the latter case. Waiter uses context of the underlying RPCActor // transaction in the latter case. [waiter.Waiter] uses context of the underlying RPCActor
// and interrupts transaction awaiting process if the context is done. // and interrupts transaction awaiting process if the context is done.
// ErrContextDone wrapped with the context's error will be returned in this case. // [waiter.ErrContextDone] wrapped with the context's error will be returned in this case.
// Otherwise, transaction awaiting process is ended with ValidUntilBlock acceptance // Otherwise, transaction awaiting process is ended with ValidUntilBlock acceptance
// and ErrTxNotAccepted is returned if transaction wasn't accepted by this moment. // and [waiter.ErrTxNotAccepted] is returned if transaction wasn't accepted by this moment.
type Actor struct { type Actor struct {
invoker.Invoker invoker.Invoker
waiter.Waiter waiter.Waiter

2
pkg/rpcclient/notary/actor_test.go
View file

@ -79,7 +79,7 @@ func (r *RPCClient) GetApplicationLog(hash util.Uint256, trig *trigger.Type) (*r
return r.applog, nil return r.applog, nil
} }
var _ = waiter.RPCPollingWaiter(&RPCClient{}) var _ = waiter.RPCPollingBased(&RPCClient{})
func TestNewActor(t *testing.T) { func TestNewActor(t *testing.T) {
rc := &RPCClient{ rc := &RPCClient{

96
pkg/rpcclient/waiter/waiter.go
View file

@ -15,11 +15,11 @@ import (
"github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/util"
) )
// PollingWaiterRetryCount is a threshold for a number of subsequent failed // PollingBasedRetryCount is a threshold for a number of subsequent failed
// attempts to get block count from the RPC server for PollingWaiter. If it fails // attempts to get block count from the RPC server for PollingBased. If it fails
// to retrieve block count PollingWaiterRetryCount times in a raw then transaction // to retrieve block count PollingBasedRetryCount times in a raw then transaction
// awaiting attempt considered to be failed and an error is returned. // awaiting attempt considered to be failed and an error is returned.
const PollingWaiterRetryCount = 3 const PollingBasedRetryCount = 3
var ( var (
// ErrTxNotAccepted is returned when transaction wasn't accepted to the chain // ErrTxNotAccepted is returned when transaction wasn't accepted to the chain
@ -31,13 +31,13 @@ var (
// ErrAwaitingNotSupported is returned from Wait method if Waiter instance // ErrAwaitingNotSupported is returned from Wait method if Waiter instance
// doesn't support transaction awaiting. // doesn't support transaction awaiting.
ErrAwaitingNotSupported = errors.New("awaiting not supported") ErrAwaitingNotSupported = errors.New("awaiting not supported")
// ErrMissedEvent is returned when RPCEventWaiter closes receiver channel // ErrMissedEvent is returned when RPCEventBased closes receiver channel
// which happens if missed event was received from the RPC server. // which happens if missed event was received from the RPC server.
ErrMissedEvent = errors.New("some event was missed") ErrMissedEvent = errors.New("some event was missed")
) )
type ( type (
// Waiter is an interface providing transaction awaiting functionality to Actor. // Waiter is an interface providing transaction awaiting functionality.
Waiter interface { Waiter interface {
// Wait allows to wait until transaction will be accepted to the chain. It can be // Wait allows to wait until transaction will be accepted to the chain. It can be
// used as a wrapper for Send or SignAndSend and accepts transaction hash, // used as a wrapper for Send or SignAndSend and accepts transaction hash,
@ -51,14 +51,14 @@ type (
// WaitAny waits until at least one of the specified transactions will be accepted // WaitAny waits until at least one of the specified transactions will be accepted
// to the chain until vub (including). It returns execution result of this // to the chain until vub (including). It returns execution result of this
// transaction or an error if none of the transactions was accepted to the chain. // transaction or an error if none of the transactions was accepted to the chain.
// It uses underlying RPCPollingWaiter or RPCEventWaiter context to interrupt // It uses underlying RPCPollingBased or RPCEventBased context to interrupt
// awaiting process, but additional ctx can be passed as an argument for the same // awaiting process, but additional ctx can be passed as an argument for the same
// purpose. // purpose.
WaitAny(ctx context.Context, vub uint32, hashes ...util.Uint256) (*state.AppExecResult, error) WaitAny(ctx context.Context, vub uint32, hashes ...util.Uint256) (*state.AppExecResult, error)
} }
// RPCPollingWaiter is an interface that enables transaction awaiting functionality // RPCPollingBased is an interface that enables transaction awaiting functionality
// for Actor instance based on periodical BlockCount and ApplicationLog polls. // based on periodical BlockCount and ApplicationLog polls.
RPCPollingWaiter interface { RPCPollingBased interface {
// Context should return the RPC client context to be able to gracefully // Context should return the RPC client context to be able to gracefully
// shut down all running processes (if so). // shut down all running processes (if so).
Context() context.Context Context() context.Context
@ -66,12 +66,12 @@ type (
GetBlockCount() (uint32, error) GetBlockCount() (uint32, error)
GetApplicationLog(hash util.Uint256, trig *trigger.Type) (*result.ApplicationLog, error) GetApplicationLog(hash util.Uint256, trig *trigger.Type) (*result.ApplicationLog, error)
} }
// RPCEventWaiter is an interface that enables improved transaction awaiting functionality // RPCEventBased is an interface that enables improved transaction awaiting functionality
// for Actor instance based on web-socket Block and ApplicationLog notifications. RPCEventWaiter // based on web-socket Block and ApplicationLog notifications. RPCEventBased
// contains RPCPollingWaiter under the hood and falls back to polling when subscription-based // contains RPCPollingBased under the hood and falls back to polling when subscription-based
// awaiting fails. // awaiting fails.
RPCEventWaiter interface { RPCEventBased interface {
RPCPollingWaiter RPCPollingBased
ReceiveBlocks(flt *neorpc.BlockFilter, rcvr chan<- *block.Block) (string, error) ReceiveBlocks(flt *neorpc.BlockFilter, rcvr chan<- *block.Block) (string, error)
ReceiveExecutions(flt *neorpc.ExecutionFilter, rcvr chan<- *state.AppExecResult) (string, error) ReceiveExecutions(flt *neorpc.ExecutionFilter, rcvr chan<- *state.AppExecResult) (string, error)
@ -79,18 +79,18 @@ type (
} }
) )
// NullWaiter is a Waiter stub that doesn't support transaction awaiting functionality. // Null is a Waiter stub that doesn't support transaction awaiting functionality.
type NullWaiter struct{} type Null struct{}
// PollingWaiter is a polling-based Waiter. // PollingBased is a polling-based Waiter.
type PollingWaiter struct { type PollingBased struct {
polling RPCPollingWaiter polling RPCPollingBased
version *result.Version version *result.Version
} }
// EventWaiter is a websocket-based Waiter. // EventBased is a websocket-based Waiter.
type EventWaiter struct { type EventBased struct {
ws RPCEventWaiter ws RPCEventBased
polling Waiter polling Waiter
} }
@ -102,57 +102,57 @@ func errIsAlreadyExists(err error) bool {
// New creates Waiter instance. It can be either websocket-based or // New creates Waiter instance. It can be either websocket-based or
// polling-base, otherwise Waiter stub is returned. As a first argument // polling-base, otherwise Waiter stub is returned. As a first argument
// it accepts RPCEventWaiter implementation, RPCPollingWaiter implementation // it accepts RPCEventBased implementation, RPCPollingBased implementation
// or not an implementation of these two interfaces. It returns websocket-based // or not an implementation of these two interfaces. It returns websocket-based
// waiter, polling-based waiter or a stub correspondingly. // waiter, polling-based waiter or a stub correspondingly.
func New(base any, v *result.Version) Waiter { func New(base any, v *result.Version) Waiter {
if eventW, ok := base.(RPCEventWaiter); ok { if eventW, ok := base.(RPCEventBased); ok {
return &EventWaiter{ return &EventBased{
ws: eventW, ws: eventW,
polling: &PollingWaiter{ polling: &PollingBased{
polling: eventW, polling: eventW,
version: v, version: v,
}, },
} }
} }
if pollW, ok := base.(RPCPollingWaiter); ok { if pollW, ok := base.(RPCPollingBased); ok {
return &PollingWaiter{ return &PollingBased{
polling: pollW, polling: pollW,
version: v, version: v,
} }
} }
return NewNullWaiter() return NewNull()
} }
// NewNullWaiter creates an instance of Waiter stub. // NewNull creates an instance of Waiter stub.
func NewNullWaiter() NullWaiter { func NewNull() Null {
return NullWaiter{} return Null{}
} }
// Wait implements Waiter interface. // Wait implements Waiter interface.
func (NullWaiter) Wait(h util.Uint256, vub uint32, err error) (*state.AppExecResult, error) { func (Null) Wait(h util.Uint256, vub uint32, err error) (*state.AppExecResult, error) {
return nil, ErrAwaitingNotSupported return nil, ErrAwaitingNotSupported
} }
// WaitAny implements Waiter interface. // WaitAny implements Waiter interface.
func (NullWaiter) WaitAny(ctx context.Context, vub uint32, hashes ...util.Uint256) (*state.AppExecResult, error) { func (Null) WaitAny(ctx context.Context, vub uint32, hashes ...util.Uint256) (*state.AppExecResult, error) {
return nil, ErrAwaitingNotSupported return nil, ErrAwaitingNotSupported
} }
// NewPollingWaiter creates an instance of Waiter supporting poll-based transaction awaiting. // NewPollingBased creates an instance of Waiter supporting poll-based transaction awaiting.
func NewPollingWaiter(waiter RPCPollingWaiter) (*PollingWaiter, error) { func NewPollingBased(waiter RPCPollingBased) (*PollingBased, error) {
v, err := waiter.GetVersion() v, err := waiter.GetVersion()
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &PollingWaiter{ return &PollingBased{
polling: waiter, polling: waiter,
version: v, version: v,
}, nil }, nil
} }
// Wait implements Waiter interface. // Wait implements Waiter interface.
func (w *PollingWaiter) Wait(h util.Uint256, vub uint32, err error) (*state.AppExecResult, error) { func (w *PollingBased) Wait(h util.Uint256, vub uint32, err error) (*state.AppExecResult, error) {
if err != nil && !errIsAlreadyExists(err) { if err != nil && !errIsAlreadyExists(err) {
return nil, err return nil, err
} }
@ -160,7 +160,7 @@ func (w *PollingWaiter) Wait(h util.Uint256, vub uint32, err error) (*state.AppE
} }
// WaitAny implements Waiter interface. // WaitAny implements Waiter interface.
func (w *PollingWaiter) WaitAny(ctx context.Context, vub uint32, hashes ...util.Uint256) (*state.AppExecResult, error) { func (w *PollingBased) WaitAny(ctx context.Context, vub uint32, hashes ...util.Uint256) (*state.AppExecResult, error) {
var ( var (
currentHeight uint32 currentHeight uint32
failedAttempt int failedAttempt int
@ -177,7 +177,7 @@ func (w *PollingWaiter) WaitAny(ctx context.Context, vub uint32, hashes ...util.
blockCount, err := w.polling.GetBlockCount() blockCount, err := w.polling.GetBlockCount()
if err != nil { if err != nil {
failedAttempt++ failedAttempt++
if failedAttempt > PollingWaiterRetryCount { if failedAttempt > PollingBasedRetryCount {
return nil, fmt.Errorf("failed to retrieve block count: %w", err) return nil, fmt.Errorf("failed to retrieve block count: %w", err)
} }
continue continue
@ -207,22 +207,22 @@ func (w *PollingWaiter) WaitAny(ctx context.Context, vub uint32, hashes ...util.
} }
} }
// NewEventWaiter creates an instance of Waiter supporting websocket event-based transaction awaiting. // NewEventBased creates an instance of Waiter supporting websocket event-based transaction awaiting.
// EventWaiter contains PollingWaiter under the hood and falls back to polling when subscription-based // EventBased contains PollingBased under the hood and falls back to polling when subscription-based
// awaiting fails. // awaiting fails.
func NewEventWaiter(waiter RPCEventWaiter) (*EventWaiter, error) { func NewEventBased(waiter RPCEventBased) (*EventBased, error) {
polling, err := NewPollingWaiter(waiter) polling, err := NewPollingBased(waiter)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &EventWaiter{ return &EventBased{
ws: waiter, ws: waiter,
polling: polling, polling: polling,
}, nil }, nil
} }
// Wait implements Waiter interface. // Wait implements Waiter interface.
func (w *EventWaiter) Wait(h util.Uint256, vub uint32, err error) (res *state.AppExecResult, waitErr error) { func (w *EventBased) Wait(h util.Uint256, vub uint32, err error) (res *state.AppExecResult, waitErr error) {
if err != nil && !errIsAlreadyExists(err) { if err != nil && !errIsAlreadyExists(err) {
return nil, err return nil, err
} }
@ -230,7 +230,7 @@ func (w *EventWaiter) Wait(h util.Uint256, vub uint32, err error) (res *state.Ap
} }
// WaitAny implements Waiter interface. // WaitAny implements Waiter interface.
func (w *EventWaiter) WaitAny(ctx context.Context, vub uint32, hashes ...util.Uint256) (res *state.AppExecResult, waitErr error) { func (w *EventBased) WaitAny(ctx context.Context, vub uint32, hashes ...util.Uint256) (res *state.AppExecResult, waitErr error) {
var ( var (
wsWaitErr error wsWaitErr error
waitersActive int waitersActive int

16
pkg/rpcclient/waiter/waiter_test.go
View file

@ -101,15 +101,15 @@ func (c *AwaitableRPCClient) Unsubscribe(id string) error { return nil }
func TestNewWaiter(t *testing.T) { func TestNewWaiter(t *testing.T) {
w := waiter.New((actor.RPCActor)(nil), nil) w := waiter.New((actor.RPCActor)(nil), nil)
_, ok := w.(waiter.NullWaiter) _, ok := w.(waiter.Null)
require.True(t, ok) require.True(t, ok)
w = waiter.New(&RPCClient{}, &result.Version{}) w = waiter.New(&RPCClient{}, &result.Version{})
_, ok = w.(*waiter.PollingWaiter) _, ok = w.(*waiter.PollingBased)
require.True(t, ok) require.True(t, ok)
w = waiter.New(&AwaitableRPCClient{RPCClient: RPCClient{}}, &result.Version{}) w = waiter.New(&AwaitableRPCClient{RPCClient: RPCClient{}}, &result.Version{})
_, ok = w.(*waiter.EventWaiter) _, ok = w.(*waiter.EventBased)
require.True(t, ok) require.True(t, ok)
} }
@ -121,7 +121,7 @@ func TestPollingWaiter_Wait(t *testing.T) {
c := &RPCClient{appLog: appLog} c := &RPCClient{appLog: appLog}
c.bCount.Store(bCount) c.bCount.Store(bCount)
w := waiter.New(c, &result.Version{Protocol: result.Protocol{MillisecondsPerBlock: 1}}) // reduce testing time. w := waiter.New(c, &result.Version{Protocol: result.Protocol{MillisecondsPerBlock: 1}}) // reduce testing time.
_, ok := w.(*waiter.PollingWaiter) _, ok := w.(*waiter.PollingBased)
require.True(t, ok) require.True(t, ok)
// Wait with error. // Wait with error.
@ -186,7 +186,7 @@ func TestWSWaiter_Wait(t *testing.T) {
c := &AwaitableRPCClient{RPCClient: RPCClient{appLog: appLog}} c := &AwaitableRPCClient{RPCClient: RPCClient{appLog: appLog}}
c.bCount.Store(bCount) c.bCount.Store(bCount)
w := waiter.New(c, &result.Version{Protocol: result.Protocol{MillisecondsPerBlock: 1}}) // reduce testing time. w := waiter.New(c, &result.Version{Protocol: result.Protocol{MillisecondsPerBlock: 1}}) // reduce testing time.
_, ok := w.(*waiter.EventWaiter) _, ok := w.(*waiter.EventBased)
require.True(t, ok) require.True(t, ok)
// Wait with error. // Wait with error.
@ -249,7 +249,7 @@ func TestWSWaiter_Wait(t *testing.T) {
} }
func TestRPCWaiterRPCClientCompat(t *testing.T) { func TestRPCWaiterRPCClientCompat(t *testing.T) {
_ = waiter.RPCPollingWaiter(&rpcclient.Client{}) _ = waiter.RPCPollingBased(&rpcclient.Client{})
_ = waiter.RPCPollingWaiter(&rpcclient.WSClient{}) _ = waiter.RPCPollingBased(&rpcclient.WSClient{})
_ = waiter.RPCEventWaiter(&rpcclient.WSClient{}) _ = waiter.RPCEventBased(&rpcclient.WSClient{})
} }