Skip to content

Commit

Permalink
use cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Solana Maintainers authored and mvines committed May 4, 2021
1 parent d9fd11a commit 512497a
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 39 deletions.
14 changes: 8 additions & 6 deletions name-service/program/src/entrypoint.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
use crate::error::NameServiceError;
use crate::processor::Processor;
use num_traits::FromPrimitive;
use solana_program::{
account_info::AccountInfo, decode_error::DecodeError, entrypoint, entrypoint::ProgramResult,
msg, program_error::PrintProgramError, pubkey::Pubkey,
use {
crate::error::NameServiceError,
crate::processor::Processor,
num_traits::FromPrimitive,
solana_program::{
account_info::AccountInfo, decode_error::DecodeError, entrypoint,
entrypoint::ProgramResult, msg, program_error::PrintProgramError, pubkey::Pubkey,
},
};

entrypoint!(process_instruction);
Expand Down
10 changes: 6 additions & 4 deletions name-service/program/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
use num_derive::FromPrimitive;
use solana_program::{decode_error::DecodeError, program_error::ProgramError};
use thiserror::Error;
use {
num_derive::FromPrimitive,
solana_program::{decode_error::DecodeError, program_error::ProgramError},
thiserror::Error,
};

#[derive(Clone, Debug, Eq, Error, FromPrimitive, PartialEq)]
pub enum NameServiceError {
#[error("Out of space.")]
#[error("Out of space")]
OutOfSpace,
}

Expand Down
16 changes: 9 additions & 7 deletions name-service/program/src/instruction.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
use borsh::{BorshDeserialize, BorshSerialize};
use solana_program::{
instruction::{AccountMeta, Instruction},
program_error::ProgramError,
pubkey::Pubkey,
system_program,
use {
borsh::{BorshDeserialize, BorshSerialize},
solana_program::{
instruction::{AccountMeta, Instruction},
program_error::ProgramError,
pubkey::Pubkey,
system_program,
},
};

/// Instructions supported by the generic Name Registry program
Expand All @@ -26,7 +28,7 @@ pub enum NameRegistryInstruction {
/// 3. `[]` Account owner (written into `NameRecordHeader::owner`)
/// 4. `[signer]` Account class (written into `NameRecordHeader::class`).
/// If `Pubkey::default()` then the `signer` bit is not required
/// 5. `[]` Parent name record (written into `NameRecordHeader::parent_name). `Pubkey::default()` is equivalent to no existing parent.
/// 5. `[]` Parent name record (written into `NameRecordHeader::parent_name). `Pubkey::default()` is equivalent to no existing parent.
/// 6. `[signer]` Owner of the parent name record. Optional but needed if parent name different than default.
///
Create {
Expand Down
32 changes: 17 additions & 15 deletions name-service/program/src/processor.rs
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
use crate::{
instruction::NameRegistryInstruction,
state::get_seeds_and_key,
state::{write_data, NameRecordHeader},
};
use borsh::BorshDeserialize;
use solana_program::{
account_info::{next_account_info, AccountInfo},
entrypoint::ProgramResult,
msg,
program::{invoke, invoke_signed},
program_error::ProgramError,
program_pack::Pack,
pubkey::Pubkey,
system_instruction,
use {
crate::{
instruction::NameRegistryInstruction,
state::get_seeds_and_key,
state::{write_data, NameRecordHeader},
},
borsh::BorshDeserialize,
solana_program::{
account_info::{next_account_info, AccountInfo},
entrypoint::ProgramResult,
msg,
program::{invoke, invoke_signed},
program_error::ProgramError,
program_pack::Pack,
pubkey::Pubkey,
system_instruction,
},
};

pub struct Processor {}
Expand Down
16 changes: 9 additions & 7 deletions name-service/program/src/state.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
use borsh::{BorshDeserialize, BorshSerialize};
use solana_program::{
account_info::AccountInfo,
msg,
program_error::ProgramError,
program_pack::{IsInitialized, Pack, Sealed},
pubkey::Pubkey,
use {
borsh::{BorshDeserialize, BorshSerialize},
solana_program::{
account_info::AccountInfo,
msg,
program_error::ProgramError,
program_pack::{IsInitialized, Pack, Sealed},
pubkey::Pubkey,
},
};

/// The data for a Name Registry account is always prefixed a `NameRecordHeader` structure.
Expand Down

0 comments on commit 512497a

Please sign in to comment.