Merge pull request #1163 from Artemkaaas/bugfix/is-504

IS-504 TGB role was removed

cli/src/commands/ledger.rs

@@ -42,7 +42,7 @@ pub mod nym_command {
     command!(CommandMetadata::build("nym", "Send NYM transaction to the Ledger.")
                 .add_required_param("did", "DID of new identity")
                 .add_optional_param("verkey", "Verification key of new identity")
-                .add_optional_param("role", "Role of identity. One of: STEWARD, TRUSTEE, TRUST_ANCHOR, TGB or empty in case of blacklisting NYM")
+                .add_optional_param("role", "Role of identity. One of: STEWARD, TRUSTEE, TRUST_ANCHOR or empty in case of blacklisting NYM")
                 .add_optional_param("fees_inputs","The list of source inputs")
                 .add_optional_param("fees_outputs","The list of outputs in the following format: (recipient, amount)")
                 .add_optional_param("extra","Optional information for fees payment operation")
@@ -1430,7 +1430,6 @@ fn get_role_title(role: &serde_json::Value) -> serde_json::Value {
     serde_json::Value::String(match role.as_str() {
         Some("0") => "TRUSTEE",
         Some("2") => "STEWARD",
-        Some("100") => "TGB",
         Some("101") => "TRUST_ANCHOR",
         _ => "-"
     }.to_string())

libindy/src/domain/ledger/constants.rs

@@ -22,5 +22,4 @@ pub const GET_DDO: &'static str = "120";//TODO change number
 pub const STEWARD: &str = "2";
 pub const TRUSTEE: &str = "0";
 pub const TRUST_ANCHOR: &str = "101";
-pub const TGB: &str = "100";
 pub const ROLE_REMOVE: &str = "";

libindy/src/services/ledger/mod.rs

@@ -2,7 +2,7 @@ pub mod merkletree;
 
 use errors::common::CommonError;
 use errors::ledger::LedgerError;
-use domain::ledger::constants::{NYM, ROLE_REMOVE, STEWARD, TRUSTEE, TRUST_ANCHOR, TGB, POOL_RESTART, GET_VALIDATOR_INFO};
+use domain::ledger::constants::{NYM, ROLE_REMOVE, STEWARD, TRUSTEE, TRUST_ANCHOR, POOL_RESTART, GET_VALIDATOR_INFO};
 use domain::ledger::request::Request;
 use domain::ledger::nym::GetNymOperation;
 use domain::ledger::attrib::{AttribOperation, GetAttribOperation};
@@ -65,7 +65,6 @@ impl LedgerService {
                     "STEWARD" => STEWARD,
                     "TRUSTEE" => TRUSTEE,
                     "TRUST_ANCHOR" => TRUST_ANCHOR,
-                    "TGB" => TGB,
                     role @ _ => return Err(CommonError::InvalidStructure(format!("Invalid role: {}", role)))
                 }.to_string())
             }