Skip to content

Commit f187248

Browse files
shumkovshumkov
committed
revert: drive abci changes
1 parent d2a530b commit f187248

File tree

2 files changed

+91
-106
lines changed
  • packages/rs-drive-abci/src

2 files changed

+91
-106
lines changed

‎packages/rs-drive-abci/src/execution/platform_events/initialization/create_genesis_state/test/tokens.rs‎

Lines changed: 89 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
21
use crate::error::Error;
32
use crate::platform_types::platform::Platform;
43
use dpp::block::block_info::BlockInfo;
4+
use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters;
55
use dpp::data_contract::associated_token::token_configuration::v0::TokenConfigurationV0;
6+
use dpp::data_contract::associated_token::token_configuration_convention::accessors::v0::TokenConfigurationConventionV0Getters;
67
use dpp::data_contract::associated_token::token_configuration_convention::v0::TokenConfigurationConventionV0;
8+
use dpp::data_contract::associated_token::token_configuration_localization::v0::TokenConfigurationLocalizationV0;
9+
use dpp::data_contract::associated_token::token_configuration_localization::TokenConfigurationLocalization;
710
use dpp::data_contract::associated_token::token_distribution_rules::v0::TokenDistributionRulesV0;
811
use dpp::data_contract::associated_token::token_keeps_history_rules::v0::TokenKeepsHistoryRulesV0;
912
use dpp::data_contract::change_control_rules::authorized_action_takers::AuthorizedActionTakers;
@@ -25,10 +28,6 @@ use dpp::tokens::calculate_token_id;
2528
use dpp::tokens::status::v0::TokenStatusV0;
2629
use dpp::tokens::status::TokenStatus;
2730
use dpp::tokens::token_event::TokenEvent;
28-
use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters;
29-
use dpp::data_contract::associated_token::token_configuration_convention::accessors::v0::TokenConfigurationConventionV0Getters;
30-
use dpp::data_contract::associated_token::token_configuration_localization::v0::TokenConfigurationLocalizationV0;
31-
use dpp::data_contract::associated_token::token_configuration_localization::TokenConfigurationLocalization;
3231
use dpp::tokens::token_pricing_schedule::TokenPricingSchedule;
3332
use dpp::version::PlatformVersion;
3433
use drive::grovedb::TransactionArg;
@@ -54,59 +53,59 @@ static TOKEN_ID_2: LazyLock<Identifier> =
5453
impl<C> Platform<C> {
5554
/// This data is used for testing token and group queries in RS SDK tests.
5655
pub(super) fn create_data_for_group_token_queries(
57-
&self,
58-
block_info: &BlockInfo,
59-
transaction: TransactionArg,
60-
platform_version: &PlatformVersion,
61-
) -> Result<(), Error> {
62-
self.register_identities(block_info, transaction, platform_version)?;
63-
64-
self.create_data_contract(block_info, transaction, platform_version)?;
65-
66-
self.mint_tokens(block_info, transaction, platform_version)?;
67-
68-
// Freeze tokens for identity 2
69-
self.drive.token_freeze(
70-
*TOKEN_ID_0,
71-
IDENTITY_ID_2,
72-
block_info,
73-
true,
74-
transaction,
75-
platform_version,
76-
)?;
77-
78-
// Pause token 2
79-
let status = TokenStatus::V0(TokenStatusV0 { paused: true });
80-
self.drive.token_apply_status(
81-
TOKEN_ID_1.to_buffer(),
82-
status,
83-
block_info,
84-
true,
85-
transaction,
86-
platform_version,
87-
)?;
88-
89-
// Add burn token group action
90-
let action_id = Identifier::new([32; 32]);
91-
let group_action = GroupAction::V0(GroupActionV0 {
92-
event: GroupActionEvent::TokenEvent(TokenEvent::Burn(10, Some("world on fire".into()))),
93-
});
94-
95-
self.drive.add_group_action(
96-
DATA_CONTRACT_ID,
97-
2,
98-
Some(group_action),
99-
action_id,
100-
IDENTITY_ID_1,
101-
1,
102-
block_info,
103-
true,
104-
transaction,
105-
platform_version,
106-
)?;
107-
108-
Ok(())
109-
}
56+
&self,
57+
block_info: &BlockInfo,
58+
transaction: TransactionArg,
59+
platform_version: &PlatformVersion,
60+
) -> Result<(), Error> {
61+
self.register_identities(block_info, transaction, platform_version)?;
62+
63+
self.create_data_contract(block_info, transaction, platform_version)?;
64+
65+
self.mint_tokens(block_info, transaction, platform_version)?;
66+
67+
// Freeze tokens for identity 2
68+
self.drive.token_freeze(
69+
*TOKEN_ID_0,
70+
IDENTITY_ID_2,
71+
block_info,
72+
true,
73+
transaction,
74+
platform_version,
75+
)?;
76+
77+
// Pause token 2
78+
let status = TokenStatus::V0(TokenStatusV0 { paused: true });
79+
self.drive.token_apply_status(
80+
TOKEN_ID_1.to_buffer(),
81+
status,
82+
block_info,
83+
true,
84+
transaction,
85+
platform_version,
86+
)?;
87+
88+
// Add burn token group action
89+
let action_id = Identifier::new([32; 32]);
90+
let group_action = GroupAction::V0(GroupActionV0 {
91+
event: GroupActionEvent::TokenEvent(TokenEvent::Burn(10, Some("world on fire".into()))),
92+
});
93+
94+
self.drive.add_group_action(
95+
DATA_CONTRACT_ID,
96+
2,
97+
Some(group_action),
98+
action_id,
99+
IDENTITY_ID_1,
100+
1,
101+
block_info,
102+
true,
103+
transaction,
104+
platform_version,
105+
)?;
106+
107+
Ok(())
108+
}
110109

111110
/// Create some test data for token direct prices.
112111
///
@@ -115,38 +114,38 @@ impl<C> Platform<C> {
115114
///
116115
/// Tokens must be already created.
117116
pub(crate) fn create_data_for_token_direct_prices(
118-
&self,
119-
block_info: &BlockInfo,
120-
transaction: TransactionArg,
121-
platform_version: &PlatformVersion,
122-
) -> Result<(), Error> {
123-
self.drive.token_set_direct_purchase_price(
124-
TOKEN_ID_1.to_buffer(),
125-
Some(TokenPricingSchedule::SinglePrice(25)),
126-
block_info,
127-
true,
128-
transaction,
129-
platform_version,
130-
)?;
131-
132-
let pricing = TokenPricingSchedule::SetPrices(
133-
(0..=900)
134-
.step_by(100)
135-
.map(|amount| (amount, 1000 - amount))
136-
.collect(),
137-
);
138-
139-
self.drive.token_set_direct_purchase_price(
140-
TOKEN_ID_2.to_buffer(),
141-
Some(pricing),
142-
block_info,
143-
true,
144-
transaction,
145-
platform_version,
146-
)?;
147-
148-
Ok(())
149-
}
117+
&self,
118+
block_info: &BlockInfo,
119+
transaction: TransactionArg,
120+
platform_version: &PlatformVersion,
121+
) -> Result<(), Error> {
122+
self.drive.token_set_direct_purchase_price(
123+
TOKEN_ID_1.to_buffer(),
124+
Some(TokenPricingSchedule::SinglePrice(25)),
125+
block_info,
126+
true,
127+
transaction,
128+
platform_version,
129+
)?;
130+
131+
let pricing = TokenPricingSchedule::SetPrices(
132+
(0..=900)
133+
.step_by(100)
134+
.map(|amount| (amount, 1000 - amount))
135+
.collect(),
136+
);
137+
138+
self.drive.token_set_direct_purchase_price(
139+
TOKEN_ID_2.to_buffer(),
140+
Some(pricing),
141+
block_info,
142+
true,
143+
transaction,
144+
platform_version,
145+
)?;
146+
147+
Ok(())
148+
}
150149

151150
fn register_identities(
152151
&self,

‎packages/rs-drive-abci/src/query/service.rs‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ use dapi_grpc::platform::v0::{
4040
GetPrefundedSpecializedBalanceResponse, GetProtocolVersionUpgradeStateRequest,
4141
GetProtocolVersionUpgradeStateResponse, GetProtocolVersionUpgradeVoteStatusRequest,
4242
GetProtocolVersionUpgradeVoteStatusResponse, GetStatusRequest, GetStatusResponse,
43-
GetTokenDirectPurchasePricesRequest, GetTokenDirectPurchasePricesResponse, GetTokenPreProgrammedDistributionsRequest, GetTokenPreProgrammedDistributionsResponse,
43+
GetTokenDirectPurchasePricesRequest, GetTokenDirectPurchasePricesResponse,
44+
GetTokenPreProgrammedDistributionsRequest, GetTokenPreProgrammedDistributionsResponse,
4445
GetTokenStatusesRequest, GetTokenStatusesResponse, GetTokenTotalSupplyRequest,
4546
GetTokenTotalSupplyResponse, GetTotalCreditsInPlatformRequest,
4647
GetTotalCreditsInPlatformResponse, GetVotePollsByEndDateRequest, GetVotePollsByEndDateResponse,
@@ -780,21 +781,6 @@ impl DriveInternal for QueryService {
780781
}
781782
}
782783

783-
#[async_trait]
784-
impl DriveInternal for QueryService {
785-
async fn get_proofs(
786-
&self,
787-
request: Request<GetProofsRequest>,
788-
) -> Result<Response<GetProofsResponse>, Status> {
789-
self.handle_blocking_query(
790-
request,
791-
Platform::<DefaultCoreRPC>::query_proofs,
792-
"get_proofs",
793-
)
794-
.await
795-
}
796-
}
797-
798784
fn query_error_into_status(error: QueryError) -> Status {
799785
match error {
800786
QueryError::NotFound(message) => Status::not_found(message),

0 commit comments

Comments
 (0)