Skip to content

implement toString() for AccountId #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kalaninja merged 1 commit into from
Feb 3, 2022
Merged

implement toString() for AccountId #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions rpc/rpc-types/src/main/java/com/strategyobject/substrateclient/rpc/types/AccountId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,36 @@
package com.strategyobject.substrateclient.rpc.types;

import com.strategyobject.substrateclient.crypto.ss58.SS58Codec;
import com.strategyobject.substrateclient.rpc.core.MetadataRegistry;
import com.strategyobject.substrateclient.scale.ScaleSelfWritable;
import com.strategyobject.substrateclient.types.FixedBytes;
import com.strategyobject.substrateclient.types.Size;
import lombok.NonNull;
import lombok.var;

import java.util.concurrent.atomic.AtomicReference;

public class AccountId
extends FixedBytes<Size.Of32>
implements ScaleSelfWritable<AccountId> {

private final AtomicReference<String> encoded = new AtomicReference<>(null);

protected AccountId(byte[] data) {
super(data, Size.of32);
}

@Override
public String toString() {
var result = encoded.get();
if (result != null) {
return result;
}

result = SS58Codec.encode(getData(), MetadataRegistry.getInstance().getSS58AddressFormat());
return encoded.compareAndSet(null, result) ? result : encoded.get();
}

public static AccountId fromBytes(byte @NonNull [] data) {
return new AccountId(data);
}
Expand Down
4 changes: 1 addition & 3 deletions ...pc-types/src/main/java/com/strategyobject/substrateclient/rpc/types/AccountIdEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.strategyobject.substrateclient.rpc.types;

import com.google.common.base.Preconditions;
import com.strategyobject.substrateclient.crypto.ss58.SS58Codec;
import com.strategyobject.substrateclient.rpc.core.EncoderPair;
import com.strategyobject.substrateclient.rpc.core.MetadataRegistry;
import com.strategyobject.substrateclient.rpc.core.RpcEncoder;
import com.strategyobject.substrateclient.rpc.core.annotations.AutoRegister;

Expand All @@ -13,6 +11,6 @@ public class AccountIdEncoder implements RpcEncoder<AccountId> {
public Object encode(AccountId source, EncoderPair<?>... encoders) {
Preconditions.checkArgument(encoders == null || encoders.length == 0);

return SS58Codec.encode(source.getData(), MetadataRegistry.getInstance().getSS58AddressFormat());
return source.toString();
}
}