[#1687] *: Perform go fmt using go v1.19

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2022-08-15 19:20:20 +03:00 committed by Pavel Karpy
parent 37ab26bfa9
commit 30341f2192
25 changed files with 89 additions and 87 deletions

View file

@ -70,9 +70,9 @@ func (c *cleanupTable) update(snapshot netmap.NetMap, now uint64) {
// updates last access time of the netmap node by string public key. // updates last access time of the netmap node by string public key.
// //
// Returns true if at least one condition is met: // Returns true if at least one condition is met:
// * node hasn't been accessed yet; // - node hasn't been accessed yet;
// * remove flag is set; // - remove flag is set;
// * binary node info has changed. // - binary node info has changed.
func (c *cleanupTable) touch(keyString string, now uint64, binNodeInfo []byte) bool { func (c *cleanupTable) touch(keyString string, now uint64, binNodeInfo []byte) bool {
c.Lock() c.Lock()
defer c.Unlock() defer c.Unlock()

View file

@ -21,12 +21,12 @@ var errMissingRequiredAttr = errors.New("missing required attribute in DB record
// //
// New attributes are formed from the record of DB instance (Prm). // New attributes are formed from the record of DB instance (Prm).
// If DB entry R was found w/o errors, new attributes are: // If DB entry R was found w/o errors, new attributes are:
// * CountryCode: R.CountryCode().String(); // - CountryCode: R.CountryCode().String();
// * Country: R.CountryName(); // - Country: R.CountryName();
// * Location: Record.LocationName(); // - Location: Record.LocationName();
// * SubDivCode: R.SubDivCode(); // - SubDivCode: R.SubDivCode();
// * SubDiv: R.SubDivName(); // - SubDiv: R.SubDivName();
// * Continent: R.Continent().String(). // - Continent: R.Continent().String().
// //
// UN-LOCODE attribute remains untouched. // UN-LOCODE attribute remains untouched.
func (v *Validator) VerifyAndUpdate(n *netmap.NodeInfo) error { func (v *Validator) VerifyAndUpdate(n *netmap.NodeInfo) error {

View file

@ -37,9 +37,9 @@ var errDiffID = errors.New("diff subnet IDs")
// All read errors of Put are forwarded. // All read errors of Put are forwarded.
// //
// It returns an error on: // It returns an error on:
// * zero subnet creation; // - zero subnet creation;
// * empty ID or different from the one wired into info; // - empty ID or different from the one wired into info;
// * empty owner ID or different from the one wired into info. // - empty owner ID or different from the one wired into info.
func (x PutValidator) Assert(event Put) error { func (x PutValidator) Assert(event Put) error {
var err error var err error

View file

@ -101,12 +101,12 @@ const (
// All handlers are executed only if the local node is an alphabet one. // All handlers are executed only if the local node is an alphabet one.
// //
// Events (notary): // Events (notary):
// * put (parser: subnetevents.ParseNotaryPut, handler: catchSubnetCreation); // - put (parser: subnetevents.ParseNotaryPut, handler: catchSubnetCreation);
// * Delete (parser: subnetevents.ParseDelete, handler: catchSubnetCreation). // - Delete (parser: subnetevents.ParseDelete, handler: catchSubnetCreation).
// //
// Events (non-notary): // Events (non-notary):
// * Put (parser: subnetevents.ParsePut, handler: catchSubnetCreation); // - Put (parser: subnetevents.ParsePut, handler: catchSubnetCreation);
// * Delete (parser: subnetevents.ParseDelete, handler: catchSubnetCreation). // - Delete (parser: subnetevents.ParseDelete, handler: catchSubnetCreation).
func (s *Server) listenSubnet() { func (s *Server) listenSubnet() {
if s.sideNotaryConfig.disabled { if s.sideNotaryConfig.disabled {
s.listenSubnetWithoutNotary() s.listenSubnetWithoutNotary()

View file

@ -141,9 +141,9 @@ func (e *StorageEngine) execIfNotBlocked(op func() error) error {
} }
// sets the flag of blocking execution of all data operations according to err: // sets the flag of blocking execution of all data operations according to err:
// * err != nil, then blocks the execution. If exec wasn't blocked, calls close method // - err != nil, then blocks the execution. If exec wasn't blocked, calls close method
// (if err == errClosed => additionally releases pools and does not allow to resume executions). // (if err == errClosed => additionally releases pools and does not allow to resume executions).
// * otherwise, resumes execution. If exec was blocked, calls open method. // - otherwise, resumes execution. If exec was blocked, calls open method.
// //
// Can be called concurrently with exec. In this case it waits for all executions to complete. // Can be called concurrently with exec. In this case it waits for all executions to complete.
func (e *StorageEngine) setBlockExecErr(err error) error { func (e *StorageEngine) setBlockExecErr(err error) error {

View file

@ -110,10 +110,10 @@ func (e *StorageEngine) inhume(prm InhumePrm) (InhumeRes, error) {
} }
// Returns: // Returns:
// 0 - fail // - 0: fail
// 1 - object locked // - 1: object locked
// 2 - lock object removal // - 2: lock object removal
// 3 - ok // - 3: ok
func (e *StorageEngine) inhumeAddr(addr oid.Address, prm shard.InhumePrm, checkExists bool) (status uint8) { func (e *StorageEngine) inhumeAddr(addr oid.Address, prm shard.InhumePrm, checkExists bool) (status uint8) {
root := false root := false
var errLocked apistatus.ObjectLocked var errLocked apistatus.ObjectLocked

View file

@ -43,9 +43,9 @@ func (e *StorageEngine) lock(idCnr cid.ID, locker oid.ID, locked []oid.ID) error
} }
// Returns: // Returns:
// 0 - fail // - 0: fail
// 1 - locking irregular object // - 1: locking irregular object
// 2 - ok // - 2: ok
func (e *StorageEngine) lockSingle(idCnr cid.ID, locker, locked oid.ID, checkExists bool) (status uint8) { func (e *StorageEngine) lockSingle(idCnr cid.ID, locker, locked oid.ID, checkExists bool) (status uint8) {
// code is pretty similar to inhumeAddr, maybe unify? // code is pretty similar to inhumeAddr, maybe unify?
root := false root := false

View file

@ -95,10 +95,10 @@ func (db *DB) exists(tx *bbolt.Tx, addr oid.Address, currEpoch uint64) (exists b
} }
// objectStatus returns: // objectStatus returns:
// * 0 if object is available; // - 0 if object is available;
// * 1 if object with GC mark; // - 1 if object with GC mark;
// * 2 if object is covered with tombstone; // - 2 if object is covered with tombstone;
// * 3 if object is expired. // - 3 if object is expired.
func objectStatus(tx *bbolt.Tx, addr oid.Address, currEpoch uint64) uint8 { func objectStatus(tx *bbolt.Tx, addr oid.Address, currEpoch uint64) uint8 {
// we check only if the object is expired in the current // we check only if the object is expired in the current
// epoch since it is considered the only corner case: the // epoch since it is considered the only corner case: the

View file

@ -67,12 +67,12 @@ func defaultConfig() *cfg {
// If private key is nil, it panics. // If private key is nil, it panics.
// //
// Other values are set according to provided options, or by default: // Other values are set according to provided options, or by default:
// * client context: Background; // - client context: Background;
// * dial timeout: 5s; // - dial timeout: 5s;
// * blockchain network type: netmode.PrivNet; // - blockchain network type: netmode.PrivNet;
// * signer with the global scope; // - signer with the global scope;
// * wait interval: 500ms; // - wait interval: 500ms;
// * logger: zap.L(). // - logger: zap.L().
// //
// If desired option satisfies the default value, it can be omitted. // If desired option satisfies the default value, it can be omitted.
// If multiple options of the same config value are supplied, // If multiple options of the same config value are supplied,

View file

@ -820,11 +820,13 @@ func alreadyOnChainError(err error) bool {
// CalculateNotaryDepositAmount calculates notary deposit amount // CalculateNotaryDepositAmount calculates notary deposit amount
// using the rule: // using the rule:
//
// IF notaryBalance < gasBalance * gasMul { // IF notaryBalance < gasBalance * gasMul {
// DEPOSIT gasBalance / gasDiv // DEPOSIT gasBalance / gasDiv
// } ELSE { // } ELSE {
// DEPOSIT 1 // DEPOSIT 1
// } // }
//
// gasMul and gasDiv must be positive. // gasMul and gasDiv must be positive.
func CalculateNotaryDepositAmount(c *Client, gasMul, gasDiv int64) (fixedn.Fixed8, error) { func CalculateNotaryDepositAmount(c *Client, gasMul, gasDiv int64) (fixedn.Fixed8, error) {
notaryBalance, err := c.GetNotaryDeposit() notaryBalance, err := c.GetNotaryDeposit()

View file

@ -52,11 +52,9 @@ func (x NodeEndpointsIterator) NumberOfAddresses() int {
// //
// Correct composition(and order from low to high level) // Correct composition(and order from low to high level)
// of protocols: // of protocols:
//
// 1. dns4/ip4/ip6 // 1. dns4/ip4/ip6
// 2. tcp // 2. tcp
// 3. tls(optional, may be absent) // 3. tls(optional, may be absent)
//
func VerifyMultiAddress(ni netmap.NodeInfo) error { func VerifyMultiAddress(ni netmap.NodeInfo) error {
return iterateParsedAddresses(NodeEndpointsIterator(ni), checkProtocols) return iterateParsedAddresses(NodeEndpointsIterator(ni), checkProtocols)
} }

Binary file not shown.

View file

@ -129,8 +129,8 @@ func (x GetObjectRes) Object() *object.Object {
// //
// Returns any error which prevented the operation from completing correctly in error return. // Returns any error which prevented the operation from completing correctly in error return.
// Returns: // Returns:
// error of type *object.SplitInfoError if object raw flag is set and requested object is virtual; // - error of type *object.SplitInfoError if object raw flag is set and requested object is virtual;
// error of type *apistatus.ObjectAlreadyRemoved if the requested object is marked to be removed. // - error of type *apistatus.ObjectAlreadyRemoved if the requested object is marked to be removed.
func GetObject(prm GetObjectPrm) (*GetObjectRes, error) { func GetObject(prm GetObjectPrm) (*GetObjectRes, error) {
if prm.tokenSession != nil { if prm.tokenSession != nil {
prm.cliPrm.WithinSession(*prm.tokenSession) prm.cliPrm.WithinSession(*prm.tokenSession)
@ -219,6 +219,7 @@ func (x HeadObjectRes) Header() *object.Object {
// //
// Returns any error which prevented the operation from completing correctly in error return. // Returns any error which prevented the operation from completing correctly in error return.
// Returns: // Returns:
//
// error of type *object.SplitInfoError if object raw flag is set and requested object is virtual; // error of type *object.SplitInfoError if object raw flag is set and requested object is virtual;
// error of type *apistatus.ObjectAlreadyRemoved if the requested object is marked to be removed. // error of type *apistatus.ObjectAlreadyRemoved if the requested object is marked to be removed.
func HeadObject(prm HeadObjectPrm) (*HeadObjectRes, error) { func HeadObject(prm HeadObjectPrm) (*HeadObjectRes, error) {
@ -305,6 +306,7 @@ func (x PayloadRangeRes) PayloadRange() []byte {
// //
// Returns any error which prevented the operation from completing correctly in error return. // Returns any error which prevented the operation from completing correctly in error return.
// Returns: // Returns:
//
// error of type *object.SplitInfoError if object raw flag is set and requested object is virtual; // error of type *object.SplitInfoError if object raw flag is set and requested object is virtual;
// error of type *apistatus.ObjectAlreadyRemoved if the requested object is marked to be removed. // error of type *apistatus.ObjectAlreadyRemoved if the requested object is marked to be removed.
func PayloadRange(prm PayloadRangePrm) (*PayloadRangeRes, error) { func PayloadRange(prm PayloadRangePrm) (*PayloadRangeRes, error) {

View file

@ -39,8 +39,8 @@ type ExpirationChecker struct {
// IsTombstoneAvailable checks the tombstone presence in the system in the // IsTombstoneAvailable checks the tombstone presence in the system in the
// following order: // following order:
// * 1. Local LRU cache; // - 1. Local LRU cache;
// * 2. Tombstone source. // - 2. Tombstone source.
// //
// If a tombstone was successfully fetched (regardless of its expiration) // If a tombstone was successfully fetched (regardless of its expiration)
// it is cached in the LRU cache. // it is cached in the LRU cache.

View file

@ -231,8 +231,8 @@ func setStatusV2(resp ResponseMessage, err error) {
// signs response with private key via signature.SignServiceMessage. // signs response with private key via signature.SignServiceMessage.
// The signature error affects the result depending on the protocol version: // The signature error affects the result depending on the protocol version:
// * if status return is supported, panics since we cannot return the failed status, because it will not be signed; // - if status return is supported, panics since we cannot return the failed status, because it will not be signed;
// * otherwise, returns error in order to transport it directly. // - otherwise, returns error in order to transport it directly.
func signResponse(key *ecdsa.PrivateKey, resp interface{}, statusSupported bool) error { func signResponse(key *ecdsa.PrivateKey, resp interface{}, statusSupported bool) error {
err := signature.SignServiceMessage(key, resp) err := signature.SignServiceMessage(key, resp)
if err != nil { if err != nil {

View file

@ -54,7 +54,7 @@ func panicOnValue(t, n string, v interface{}) {
// Panics if at least one value of the parameters is invalid. // Panics if at least one value of the parameters is invalid.
// //
// Panics if at least one of next optional parameters is invalid: // Panics if at least one of next optional parameters is invalid:
// * shutdown timeout is non-positive. // - shutdown timeout is non-positive.
// //
// The created Server does not require additional // The created Server does not require additional
// initialization and is completely ready for work. // initialization and is completely ready for work.

View file

@ -34,9 +34,9 @@ func (p *Prm) SetLevelString(s string) error {
// NewLogger constructs a new zap logger instance. // NewLogger constructs a new zap logger instance.
// //
// Logger is built from production logging configuration with: // Logger is built from production logging configuration with:
// * parameterized level; // - parameterized level;
// * console encoding; // - console encoding;
// * ISO8601 time encoding. // - ISO8601 time encoding.
// //
// Logger records a stack trace for all messages at or above fatal level. // Logger records a stack trace for all messages at or above fatal level.
func NewLogger(prm Prm) (*Logger, error) { func NewLogger(prm Prm) (*Logger, error) {