Skip to content

Rename Sul to SUL in all PSF uses #136

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
kostis merged 1 commit into from
Mar 23, 2026
Merged

Rename Sul to SUL in all PSF uses #136

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
2 changes: 1 addition & 1 deletion scripts/setup_fuzzer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ readonly BASE_DIR
setup_psf() {
# setup protocol-state-fuzzer library

CHECKOUT="83bcc0e1b8d6e093a656d41cc1fb59f2c600e86a"
CHECKOUT="658a49d8b73ffca644ef3b05bf254177ed37d18b"

set -e
cd "${BASE_DIR}"
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/protocolfuzzing/edhocfuzzer/EdhocDotProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static void beautify(LearnerResult<?> learnerResult) {

if (stateFuzzerEnabler.isFuzzingClient()) {
// SUL is a client implementation
MapperConfig mapperConfig = stateFuzzerEnabler.getSulConfig().getMapperConfig();
MapperConfig mapperConfig = stateFuzzerEnabler.getSULConfig().getMapperConfig();

if (!(mapperConfig instanceof EdhocMapperConfig edhocMapperConfig)) {
LOGGER.error("MapperConfig of StateFuzzerEnabler is not EdhocMapperConfig");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/github/protocolfuzzing/edhocfuzzer/MultiBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.alphabet.xml.AlphabetSerializerXml;
import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.config.LearnerConfigStandard;
import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.statistics.MealyMachineWrapper;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulBuilder;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULBuilder;
import com.github.protocolfuzzing.protocolstatefuzzer.statefuzzer.core.StateFuzzer;
import com.github.protocolfuzzing.protocolstatefuzzer.statefuzzer.core.StateFuzzerBuilder;
import com.github.protocolfuzzing.protocolstatefuzzer.statefuzzer.core.StateFuzzerComposerStandard;
Expand Down Expand Up @@ -45,7 +45,7 @@ public class MultiBuilder implements
new AlphabetSerializerXml<EdhocInput, EdhocAlphabetPojoXml>(EdhocInput.class, EdhocAlphabetPojoXml.class)
);

protected SulBuilder<EdhocInput, EdhocOutput, EdhocExecutionContext> sulBuilder = new EdhocSulBuilder();
protected SULBuilder<EdhocInput, EdhocOutput, EdhocExecutionContext> sulBuilder = new EdhocSulBuilder();

@Override
public StateFuzzerClientConfig buildClientConfig() {
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/EdhocSul.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.symbols.outputs.EdhocOutputBuilder;
import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.symbols.outputs.EdhocOutputChecker;
import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.symbols.outputs.MessageOutputType;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.AbstractSul;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulAdapter;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulConfig;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.AbstractSUL;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULAdapter;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULConfig;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.sulwrappers.DynamicPortProvider;
import com.github.protocolfuzzing.protocolstatefuzzer.utils.CleanupTasks;
import org.apache.logging.log4j.LogManager;
Expand All @@ -30,10 +30,10 @@
import java.io.IOException;
import java.util.concurrent.TimeUnit;

public class EdhocSul implements AbstractSul<EdhocInput, EdhocOutput, EdhocExecutionContext> {
public class EdhocSul implements AbstractSUL<EdhocInput, EdhocOutput, EdhocExecutionContext> {
private static final Logger LOGGER = LogManager.getLogger();

protected SulConfig sulConfig;
protected SULConfig sulConfig;
protected CleanupTasks cleanupTasks;
protected EdhocMapperConfig edhocMapperConfig;
protected EdhocMapperComposer edhocMapperComposer;
Expand All @@ -43,7 +43,7 @@ public class EdhocSul implements AbstractSul<EdhocInput, EdhocOutput, EdhocExecu
protected EdhocMapperConnector edhocMapperConnector;
protected boolean serverWaitForInitialMessageDone;

public EdhocSul(SulConfig sulConfig, CleanupTasks cleanupTasks) {
public EdhocSul(SULConfig sulConfig, CleanupTasks cleanupTasks) {
this.sulConfig = sulConfig;
this.cleanupTasks = cleanupTasks;
this.edhocMapperConfig = (EdhocMapperConfig) sulConfig.getMapperConfig();
Expand Down Expand Up @@ -91,7 +91,7 @@ public EdhocSul initialize() {
}

@Override
public SulConfig getSulConfig() {
public SULConfig getSULConfig() {
return sulConfig;
}

Expand All @@ -116,7 +116,7 @@ public DynamicPortProvider getDynamicPortProvider() {
}

@Override
public SulAdapter getSulAdapter() {
public SULAdapter getSULAdapter() {
throw new RuntimeException("No sul adapter available");
}

Expand Down
20 changes: 10 additions & 10 deletions ...main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/EdhocSulBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.context.EdhocExecutionContext;
import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.symbols.inputs.EdhocInput;
import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.symbols.outputs.EdhocOutput;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.AbstractSul;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulBuilder;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulWrapper;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulWrapperStandard;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulConfig;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.AbstractSUL;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULBuilder;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULWrapper;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULWrapperStandard;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULConfig;
import com.github.protocolfuzzing.protocolstatefuzzer.utils.CleanupTasks;

public class EdhocSulBuilder implements SulBuilder<EdhocInput, EdhocOutput, EdhocExecutionContext>{
public class EdhocSulBuilder implements SULBuilder<EdhocInput, EdhocOutput, EdhocExecutionContext>{
@Override
public AbstractSul<EdhocInput, EdhocOutput, EdhocExecutionContext>
buildSul(SulConfig sulConfig, CleanupTasks cleanupTasks) {
public AbstractSUL<EdhocInput, EdhocOutput, EdhocExecutionContext>
buildSUL(SULConfig sulConfig, CleanupTasks cleanupTasks) {
return new EdhocSul(sulConfig, cleanupTasks).initialize();
}

@Override
public SulWrapper<EdhocInput, EdhocOutput, EdhocExecutionContext> buildWrapper() {
return new SulWrapperStandard<>();
public SULWrapper<EdhocInput, EdhocOutput, EdhocExecutionContext> buildWrapper() {
return new SULWrapperStandard<>();
}
}
8 changes: 4 additions & 4 deletions ...m/github/protocolfuzzing/edhocfuzzer/components/sul/core/config/EdhocSulClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.config.EdhocMapperConfig;
import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.config.EdhocMapperConnectionConfig;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulAdapterConfig;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulClientConfigStandard;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULAdapterConfig;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULClientConfigStandard;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.config.MapperConfig;
import org.eclipse.californium.elements.config.Configuration;

public class EdhocSulClientConfig extends SulClientConfigStandard {
public class EdhocSulClientConfig extends SULClientConfigStandard {
public EdhocSulClientConfig(EdhocMapperConfig edhocMapperConfig) {
super(edhocMapperConfig, new SulAdapterConfig(){});
super(edhocMapperConfig, new SULAdapterConfig(){});
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions ...m/github/protocolfuzzing/edhocfuzzer/components/sul/core/config/EdhocSulServerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.config.EdhocMapperConfig;
import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.config.EdhocMapperConnectionConfig;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulAdapterConfig;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulServerConfigStandard;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULAdapterConfig;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULServerConfigStandard;
import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.config.MapperConfig;
import org.eclipse.californium.elements.config.Configuration;

public class EdhocSulServerConfig extends SulServerConfigStandard {
public class EdhocSulServerConfig extends SULServerConfigStandard {
public EdhocSulServerConfig(EdhocMapperConfig edhocMapperConfig) {
super(edhocMapperConfig, new SulAdapterConfig(){});
super(edhocMapperConfig, new SULAdapterConfig(){});
}

@Override
Expand Down
Loading