Cleanup

.github/workflows/voting-checks.yml → .github/workflows/contracts-checks.yml

@@ -1,4 +1,4 @@
-name: Voting Contract Checks
+name: Contracts Checks
 on:
   pull_request:
   push:

.github/workflows/neurons-rust-checks.yml → .github/workflows/neurons-checks.yml

@@ -1,4 +1,4 @@
-name: Neurons Rust Checks
+name: Neurons Checks
 on:
   pull_request:
   push:

contracts/Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["offchain"]
+members = ["governance"]
 
 [workspace.dependencies]
 soroban-sdk = "20.4.0"

contracts/offchain/Cargo.toml → contracts/governance/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "offchain"
+name = "governance"
 version = "0.1.0"
 edition = "2021"
 
@@ -8,7 +8,6 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 soroban-sdk = { workspace = true, features = ["alloc"] }
-soroban_decimal_numbers = "0.1.2"
 soroban-fixed-point-math.workspace = true
 
 [dev_dependencies]

contracts/offchain/README.md → contracts/governance/README.md

@@ -3,7 +3,7 @@
 This contract is a part of implementation of
 the [Neural Quorum Governance](https://stellarcommunityfund.gitbook.io/module-library) mechanism.
 
-![architecture](../voting_system/image.png)
+![architecture](image.png)
 
 Currently, because
 of [resource constraints](https://developers.stellar.org/docs/reference/resource-limits-fees#resource-limits) and to

contracts/offchain/src/lib.rs → contracts/governance/src/lib.rs

@@ -34,7 +34,7 @@ pub mod types;
 pub const DECIMALS: i128 = 1_000_000_000_000_000_000;
 
 #[contract]
-pub struct VotingSystemOffchain;
+pub struct VotingSystem;
 
 type ContractResult<T> = Result<T, VotingSystemError>;
 
@@ -66,7 +66,7 @@ pub enum DataKey {
 }
 
 #[contractimpl]
-impl VotingSystemOffchain {
+impl VotingSystem {
     /// Initialize the governance contract.
     pub fn initialize(env: Env, admin: Address, current_round: u32) {
         assert!(!is_set_admin(&env), "Admin already set");
@@ -186,7 +186,7 @@ impl VotingSystemOffchain {
 }
 
 #[contractimpl]
-impl Admin for VotingSystemOffchain {
+impl Admin for VotingSystem {
     fn transfer_admin(env: Env, new_admin: Address) {
         require_admin(&env);
         set_admin(&env, &new_admin);
@@ -200,7 +200,7 @@ impl Admin for VotingSystemOffchain {
 }
 
 #[contractimpl]
-impl Governance for VotingSystemOffchain {
+impl Governance for VotingSystem {
     fn add_layer(
         env: Env,
         raw_neurons: Vec<(String, I256)>,
@@ -332,7 +332,7 @@ impl Governance for VotingSystemOffchain {
         let neural_governance = read_neural_governance(&env).unwrap();
         let mut result: Map<String, I256> = Map::new(&env);
         for layer_id in neural_governance.layers {
-            let layer_result = VotingSystemOffchain::get_layer_result(env.clone(), layer_id)?;
+            let layer_result = VotingSystem::get_layer_result(env.clone(), layer_id)?;
             for (key, value) in layer_result {
                 result.set(
                     key.clone(),

contracts/offchain/tests/e2e/common/contract_utils.rs → contracts/governance/tests/e2e/common/contract_utils.rs

@@ -1,15 +1,15 @@
-use offchain::{VotingSystemOffchain, VotingSystemOffchainClient};
+use governance::{VotingSystem, VotingSystemClient};
 use soroban_sdk::testutils::Address as AddressTrait;
 use soroban_sdk::{Address, Env};
 
-pub fn deploy_contract_without_initialization(env: &Env) -> VotingSystemOffchainClient {
-    let contract_id = env.register_contract(None, VotingSystemOffchain);
-    let contract_client = VotingSystemOffchainClient::new(env, &contract_id);
+pub fn deploy_contract_without_initialization(env: &Env) -> VotingSystemClient {
+    let contract_id = env.register_contract(None, VotingSystem);
+    let contract_client = VotingSystemClient::new(env, &contract_id);
 
     contract_client
 }
 
-pub fn deploy_contract(env: &Env) -> VotingSystemOffchainClient {
+pub fn deploy_contract(env: &Env) -> VotingSystemClient {
     let contract_client = deploy_contract_without_initialization(env);
 
     env.mock_all_auths();

contracts/offchain/tests/e2e/governance.rs → contracts/governance/tests/e2e/governance.rs

@@ -1,7 +1,7 @@
 use soroban_sdk::{vec, Env, String, Vec, I256};
 
-use offchain::types::VotingSystemError;
-use offchain::LayerAggregator;
+use governance::types::VotingSystemError;
+use governance::LayerAggregator;
 
 use crate::e2e::common::contract_utils::deploy_contract;
 

contracts/offchain/tests/e2e/voting.rs → contracts/governance/tests/e2e/voting.rs

@@ -1,7 +1,7 @@
 use soroban_sdk::{vec, Env, Map, String, Vec, I256};
 
-use offchain::types::{Vote, VotingSystemError};
-use offchain::{LayerAggregator, DECIMALS};
+use governance::types::{Vote, VotingSystemError};
+use governance::{LayerAggregator, DECIMALS};
 
 use crate::e2e::common::contract_utils::deploy_contract;